Changeset 26964 for trunk/psModules/src/objects/pmSourceIO_CMF_PS1_V2.c

Timestamp:

Feb 16, 2010, 3:36:17 PM (16 years ago)

Author:

Paul Price

Message:

Make zero point a 'concept' so that it is easily passed from stage to stage. Checked that this results in calibrated magnitudes out of ppSub.

File:

• trunk/psModules/src/objects/pmSourceIO_CMF_PS1_V2.c (modified) (1 diff)

trunk/psModules/src/objects/pmSourceIO_CMF_PS1_V2.c

@@ -69 +69 @@
     float magOffset = NAN;
     float exptime   = psMetadataLookupF32 (&status1, fpa->concepts, "FPA.EXPOSURE");
-    float zeropt    = psMetadataLookupF32 (&status2, imageHeader, "ZPT_OBS");
-    float zeroptErr = psMetadataLookupF32 (&status2, imageHeader, "ZPT_ERR");
+    float zeropt    = psMetadataLookupF32(&status2, fpa->concepts, "FPA.ZP");
+    if (!isfinite(zeropt)) {
+        zeropt    = psMetadataLookupF32 (&status2, imageHeader, "ZPT_OBS");
+    }
     if (status1 && status2 && (exptime > 0.0)) {
         magOffset = zeropt + 2.5*log10(exptime);
     }
+    float zeroptErr = psMetadataLookupF32 (&status2, imageHeader, "ZPT_ERR");
 
     // if the sequence is defined, write these in seq order; otherwise