Changeset 17672 for branches/eam_branch_20080511/ppSim/src/ppSimMakeSky.c

Timestamp:

May 13, 2008, 4:56:38 PM (18 years ago)

Author:

eugene

Message:

substantial work on argument handling to support externally supplied images

File:

• branches/eam_branch_20080511/ppSim/src/ppSimMakeSky.c (modified) (3 diffs)

branches/eam_branch_20080511/ppSim/src/ppSimMakeSky.c

@@ -15 +15 @@
     psMetadata *recipe = psMetadataLookupMetadata(&status, config->recipes, PPSIM_RECIPE); // Recipe
 
+    bool sky = psMetadataLookupBool(&status, recipe, "SKY"); // Generate a SKY flux?
+    if (!sky) return true;
+ 
     float expTime     = psMetadataLookupF32(&status, recipe, "EXPTIME"); // Exposure time
     float flatSigma   = psMetadataLookupF32(&status, recipe, "FLAT.SIGMA"); // Flat-field coefficient
@@ -22 +25 @@
     if (isnan(skyRate)) {
         float zp      = psMetadataLookupF32(&status, recipe, "ZEROPOINT"); assert (status);
-        float scale   = psMetadataLookupF32(&status, recipe, "SCALE");     assert (status);
+        float scale   = psMetadataLookupF32(&status, recipe, "PIXEL.SCALE"); assert (status);
         float skyMags = psMetadataLookupF32(&status, recipe, "SKY.MAGS");  assert (status);
         skyRate = scale * scale * ppSimMagToFlux (skyMags, zp);
@@ -37 +40 @@
     int yParityCell   = psMetadataLookupS32(&status, cell->concepts, "CELL.YPARITY");
 
-    int binning = psMetadataLookupS32(NULL, config->arguments, "BINNING"); // Binning in x and y
+    int binning = psMetadataLookupS32(NULL, recipe, "BINNING"); // Binning in x and y
 
     // Size of FPA