Changeset 41331 for trunk/ppSim/src/ppSimMakeSky.c

Timestamp:

Apr 9, 2020, 11:51:42 AM (6 years ago)

Author:

eugene

Message:

consolidate sky flux calculation and report in output cmf

File:

• trunk/ppSim/src/ppSimMakeSky.c (modified) (1 diff)

trunk/ppSim/src/ppSimMakeSky.c

@@ -26 +26 @@
     float shutterTime  = psMetadataLookupF32(&status, recipe, "SHUTTER.TIME"); // Shutter time
     float scatterFrac  = psMetadataLookupF32(&status, recipe, "SCATTER.FRAC"); // scattered light fraction (max)
-    float skyRate      = psMetadataLookupF32(&status, recipe, "SKY.RATE"); // Sky rate
-    float skyMags      = psMetadataLookupF32(&status, recipe, "SKY.MAGS");  assert (status);
-    if (!isnan(skyMags)) {
-        float zp       = psMetadataLookupF32(&status, recipe, "ZEROPOINT"); assert (status);
-        float scale    = psMetadataLookupF32(&status, recipe, "PIXEL.SCALE"); assert (status);
-        skyRate = scale * scale * ppSimMagToFlux (skyMags, zp);
-    }
-    if (type == PPSIM_TYPE_FLAT) {
-      skyRate = flatRate;
-    }
+
+    float skyRate      = (type == PPSIM_TYPE_FLAT) ? flatRate : ppSimGetSkyRate (recipe);
 
     int x0Chip        = psMetadataLookupS32(&status, chip->concepts, "CHIP.X0");