Changeset 2036 for trunk/source/grid_xspec.cpp

Timestamp:

05/10/08 11:14:00 (8 months ago)

Author:

rporter

Message:

Add option to limit energy range in XSPEC option. Add line emission to diffuse atable option. In two comments, punch_line.c -> punch_line.cpp. Modify ism_grid to include the new range option on XSPEC output.

Files:

• trunk/source/grid_xspec.cpp (modified) (7 diffs)

trunk/source/grid_xspec.cpp

@@ -9 +9 @@
 #include "optimize.h"
 #include "cddrive.h"
+#include "continuum.h"
 #include "rfield.h"
 #include "grid.h"
+#include "ipoint.h"
 #include "called.h"
+#include "physconst.h"
 #include "prt.h"
 
@@ -17 +20 @@
 void gridXspec(realnum xc[], long int nInterpVars)
 {
-        long int i, j, k;
-        double averageChi2;
+        long int i;
 
         DEBUG_ENTRY( "gridXspec()" );
@@ -79 +81 @@
                 grid.paramRange[i][5] = xc[i]+grid.paramIncrements[i]*(grid.numParamValues[i]-1.f)+grid.paramIncrements[i]/10.f;
 
-                for( j=0; j<grid.numParamValues[i]; j++ )
+                for( long j=0; j<grid.numParamValues[i]; j++ )
                 {
                         grid.paramData[i][j] = xc[i]+grid.paramIncrements[i]*j;
@@ -90 +92 @@
         }
 
-        /* >>chng 06 aug 23, this logic now allows non-square parameter spaces.  */
         for( i=0; i< grid.totNumModels; i++ )
         {
+                long j;
+                double averageChi2;
                 realnum variableVector[LIMPAR];
 
@@ -105 +108 @@
                          * second "volume" is product of grid.numParamValues[2]*grid.numParamValues[3]*....grid.numParamValues[n]
                          * last "volume" is unity.  */
-                        for( k=j+1; k<nInterpVars; k++ )
+                        for( long k=j+1; k<nInterpVars; k++ )
                         {
                                 volumeOtherDimensions *= grid.numParamValues[k];
@@ -210 +213 @@
         {
                 long i1, i2;
-                grid.numEnergies = rfield.nupper-2;
+
+                if( grid.LoEnergy_keV == 0. )
+                        grid.ipLoEnergy = 0;
+                else
+                        grid.ipLoEnergy = ipoint( grid.LoEnergy_keV * 1000. / EVRYD );
+
+                if( grid.HiEnergy_keV == 0. || grid.HiEnergy_keV >= continuum.filbnd[continuum.nrange] )
+                        grid.ipHiEnergy = rfield.nflux - 1;
+                else
+                        grid.ipHiEnergy = ipoint( grid.HiEnergy_keV * 1000. / EVRYD );
+
+                grid.numEnergies = grid.ipHiEnergy - grid.ipLoEnergy + 1;
                 grid.Energies = (realnum*)MALLOC(sizeof(realnum)*(unsigned)(grid.numEnergies) );
                 grid.Spectra = (realnum***)MALLOC(sizeof(realnum**)*(unsigned)(NUM_OUTPUT_TYPES) );
@@ -241 +255 @@
                  * at this point nOptimiz has already been incremented for first model */
                 if( grid.lgOutputTypeOn[i] )
-                        cdSPEC2( i, grid.numEnergies, grid.Spectra[i][optimize.nOptimiz]);
+                        cdSPEC2( i, grid.numEnergies, grid.ipLoEnergy, grid.ipHiEnergy, grid.Spectra[i][optimize.nOptimiz]);
         }
         return;