Changeset 26971 for trunk/psModules

Timestamp:

Feb 16, 2010, 10:03:48 PM (16 years ago)

Author:

Paul Price

Message:

Add concept CHIP.SEEING (seeing FWHM in pixels) for easy transport of this value. It's used in ppSub for the parameter scaling.

Location:

trunk/psModules/src/concepts

Files:

• pmConcepts.c (modified) (2 diffs)
• pmConceptsAverage.c (modified) (3 diffs)

trunk/psModules/src/concepts/pmConcepts.c

@@ -335 +335 @@
         conceptRegisterF32("FPA.PON.TIME", "Power On Time", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);
         conceptRegisterS32("FPA.BURNTOOL.APPLIED", "[T=applied] Burn streaks applied to image data", p_pmConceptParse_BTOOLAPP,p_pmConceptFormat_BTOOLAPP,NULL,false,PM_FPA_LEVEL_FPA);
-        //      conceptRegisterBool("FPA.BURNTOOL.APPLIED", "Status of burntool processing", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);
         conceptRegisterF32("FPA.EXPOSURE", "Exposure time (sec)", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);
         conceptRegisterF32("FPA.ZP", "Magnitude zero point", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);
@@ -352 +351 @@
         conceptRegisterF32("CHIP.TEMP", "Temperature of chip", NULL, NULL, NULL, false, PM_FPA_LEVEL_CHIP);
         conceptRegisterStr("CHIP.ID", "Chip identifier", NULL, NULL, NULL, false, PM_FPA_LEVEL_CHIP);
-
+        conceptRegisterF32("CHIP.SEEING", "Seeing FWHM (pixels)", NULL, NULL, NULL, false, PM_FPA_LEVEL_CHIP);
     }
 

trunk/psModules/src/concepts/pmConceptsAverage.c

@@ -284 +284 @@
 
     float temp = 0.0;                   // Temperature
+    float seeing = 0.0;                 // Seeing FWHM
     int x0 = 0, y0 = 0;                 // Offset
     int xParity = 0, yParity = 0;       // Parity
@@ -297 +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");
@@ -341 +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);