Changeset 26964 for trunk/psModules/src/concepts/pmConceptsAverage.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/concepts/pmConceptsAverage.c (modified) (4 diffs)

trunk/psModules/src/concepts/pmConceptsAverage.c

@@ -36 +36 @@
 
     double time      = 0.0;             // Time of observation
+    double zp        = 0.0;             // Zero point
     psTimeType timeSys = 0;             // Time system
     char *filter     = NULL;            // Filter
@@ -63 +64 @@
         psTimeConvert(fpaTime, PS_TIME_TAI);
         time       += psTimeToMJD(fpaTime);
+
+        zp += psMetadataLookupF32(NULL, fpa->concepts, "FPA.ZP");
+
         if (num == 1) {
             timeSys = psMetadataLookupS32(NULL, fpa->concepts, "FPA.TIMESYS");
@@ -85 +89 @@
 
     time /= (double)num;
+    zp /= (double)num;
 
     MD_UPDATE(target->concepts, "FPA.TIMESYS", S32, timeSys);
@@ -92 +97 @@
     MD_UPDATE_STR(target->concepts, "FPA.INSTRUMENT", instrument);
     MD_UPDATE_STR(target->concepts, "FPA.DETECTOR", detector);
+    MD_UPDATE(target->concepts, "FPA.ZP", F32, zp);
 
     // FPA.TIME needs special care