Merge branch 'dev' into import

sirocco-rt · Feb 8, 2018 · 0f383de · 0f383de
2 parents cac8d94 + 38f0d85
commit 0f383de
Show file tree

Hide file tree

Showing 11 changed files with 6 additions and 74 deletions.
diff --git a/docs/parameters/cont.file.yaml b/docs/parameters/cont.file.yaml
diff --git a/docs/parameters/delta.lambda.yaml b/docs/parameters/delta.lambda.yaml
diff --git a/docs/parameters/flux.rescale.yaml b/docs/parameters/flux.rescale.yaml
diff --git a/docs/parameters/instrument.fwhm.yaml b/docs/parameters/instrument.fwhm.yaml
diff --git a/docs/parameters/lambda.max.yaml b/docs/parameters/lambda.max.yaml
diff --git a/docs/parameters/lambda.min.yaml b/docs/parameters/lambda.min.yaml
diff --git a/docs/parameters/lambda.rescale.yaml b/docs/parameters/lambda.rescale.yaml
diff --git a/docs/parameters/out.file.yaml b/docs/parameters/out.file.yaml
diff --git a/source/bands.c b/source/bands.c
@@ -252,7 +252,7 @@ bands_init (imode, band)
 
     for (nband = 0; nband < band->nbands; nband++)
     {
-      rddoub ("Photon_sampling,band_min_frac)", &band->min_fraction[nband]);
+      rddoub ("Photon_sampling.band_min_frac)", &band->min_fraction[nband]);
     }
     for (nband = 0; nband < band->nbands; nband++)
     {
@@ -269,15 +269,15 @@ bands_init (imode, band)
       Error ("Trying to use a broken power law banding without setting spectype to broken power law - must set spectype to 4\n");
       exit (0);
     }
-    rddoub ("Lowest_energy_to_be_considered(eV)", &xx);
+    rddoub ("Photon_sampling.low_energy_limit(eV)", &xx);
 
     if (xx > geo.agn_cltab_low)
     {
       xx = geo.agn_cltab_low / 10.0;
       Log ("Lowest  frequency reset to 1/10 of low frequency break\n");
     }
     f1 = xx / HEV;
-    rddoub ("Highest_energy_to_be_considered(eV)", &xx);
+    rddoub ("Photon_sampling.high_energy_limit(eV)", &xx);
 
     if (xx < geo.agn_cltab_hi)
     {

diff --git a/source/setup_star_bh.c b/source/setup_star_bh.c
@@ -218,7 +218,7 @@ get_bl_and_agn_params (lstar)
 	  || geo.agn_ion_spectype == SPECTYPE_CL_TAB)
 	{
 	  geo.alpha_agn = (-1.5);
-	  rddoub ("agn_power_law_index", &geo.alpha_agn);
+	  rddoub ("AGN.power_law_index", &geo.alpha_agn);
 
 	  if (geo.alpha_agn == -1.0)	//deal with the pathological case
 	    {
@@ -264,7 +264,7 @@ get_bl_and_agn_params (lstar)
          default is zero which is checked before we call photo_gen_agn */
       geo.pl_low_cutoff = 0.0;
       if (modes.iadvanced && (geo.agn_ion_spectype == SPECTYPE_POW))
-	rddoub ("@agn_power_law_cutoff", &geo.pl_low_cutoff);
+	rddoub ("@AGN.power_law_cutoff", &geo.pl_low_cutoff);
 
       rdint ("AGN.geometry_for_pl_source(0=sphere,1=lamp_post)",
 	     &geo.pl_geometry);

diff --git a/source/synonyms.c b/source/synonyms.c
@@ -107,7 +107,7 @@ char *new_names[] = { "Central.object.mass", "Central.object.radius",
     "Boundary_layer.luminosity","homologous.boundary_mdot","Binary.mass_sec",
     "Binary.period","shell.wind_mdot","Photon_sampling.approach","Photon_sampling.nbands",
     "Photon_sampling.low_energy_limit","Photon_sampling.high_energy_limit","Photon_sampling.band_boundary",
-    "Photon_sampling,band_min_frac",
+    "Photon_sampling.band_min_frac",
     "AGN.bremsstrahlung_temp","AGN.bremsstrahlung_alpha","AGN.blackbody_temp",
     "AGN.power_law_cutoff","AGN.geometry_for_pl_source","AGN.lamp_post_height",
     "Spectrum.select_specific_no_of_scatters_in_spectra","Spectrum.select_scatters","Spectrum.select_photons_by_position",