Changeset 27840 for branches/simtest_nebulous_branches/psModules/src/concepts/pmConceptsAverage.c

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/concepts/pmConceptsAverage.c (modified) (7 diffs)

branches/simtest_nebulous_branches/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
@@ -278 +284 @@
 
     float temp = 0.0;                   // Temperature
+    float seeing = 0.0;                 // Seeing FWHM
     int x0 = 0, y0 = 0;                 // Offset
     int xParity = 0, yParity = 0;       // Parity
@@ -291 +298 @@
         }
         temp += psMetadataLookupF32(NULL, chip->concepts, "CHIP.TEMP");
+        seeing += psMetadataLookupF32(NULL, chip->concepts, "CHIP.SEEING");
         if (nChips == 0) {
             xSize = psMetadataLookupS32(NULL, chip->concepts, "CHIP.XSIZE");
@@ -335 +343 @@
 
     temp /= (float)nChips;
+    seeing /= (float)nChips;
 
     MD_UPDATE(target->concepts, "CHIP.TEMP", F32, temp);
+    MD_UPDATE(target->concepts, "CHIP.SEEING", F32, seeing);
     if (same) {
         MD_UPDATE(target->concepts, "CHIP.X0", S32, x0);