Changeset 37375

Timestamp:

Sep 8, 2014, 8:08:53 AM (12 years ago)

Author:

mhuber

Message:

specifically pass SHUTOUTC as FPA keyword through warp-diff-ppMops stages

Location:

trunk

Files:

• ippconfig/gpc1/format_20100723.config (modified) (1 diff)
• ppTranslate/src/ppMops.h (modified) (1 diff)
• ppTranslate/src/ppMopsDetections.c (modified) (2 diffs)
• ppTranslate/src/ppMopsRead.c (modified) (1 diff)
• ppTranslate/src/ppMopsWrite.c (modified) (1 diff)
• psModules/src/concepts/pmConcepts.c (modified) (1 diff)

trunk/ippconfig/gpc1/format_20100723.config

@@ -210 +210 @@
         FPA.BURNTOOL.APPLIED STR BTOOLAPP
         CHIP.VIDEOCELL  STR     CELLMODE
+
+        FPA.SHUTOUTC    STR     SHUTOUTC
 
         FPA.PON.TIME    STR     PONTIME

trunk/ppTranslate/src/ppMops.h

@@ -59 +59 @@
   psVector *raExtErr, *decExtErr;     // Error in sky coordinates for RA_EXT and DEC_EXT
   psVector *mask;                     // Mask for detections
-    float platescale; //Plate scale at centroid
+  float platescale;                   // Plate scale at centroid
+  psString fpashutoutc;               // FPA shutoutc 
 } ppMopsDetections;
 

trunk/ppTranslate/src/ppMopsDetections.c

@@ -20 +20 @@
     psFree(det->decErr);
     psFree(det->mask);
+    psFree(det->fpashutoutc);
     return;
 }
@@ -48 +49 @@
     det->mask = NULL;
     det->diffSkyfileId = 0;
+    det->fpashutoutc = NULL;
     return det;
 }

trunk/ppTranslate/src/ppMopsRead.c

@@ -105 +105 @@
     det->naxis1 = psMetadataLookupS32(NULL, header, "IMNAXIS1"); // Number of columns
     det->naxis2 = psMetadataLookupS32(NULL, header, "IMNAXIS2"); // Number of rows
+    det->fpashutoutc = psMemIncrRefCounter(psMetadataLookupStr(NULL, header, "FPA.SHUTOUTC"));
     psFree(header);
 

trunk/ppTranslate/src/ppMopsWrite.c

@@ -102 +102 @@
   psMetadataAddF32(header, PS_LIST_TAIL, "PLTSCALE_EXT", 0, "Plate scale at centroid", det->platescale);
   psMetadataAddF32(header, PS_LIST_TAIL, "PLTSCALE", 0, "Plate scale at centroid", det->platescale);
+  psMetadataAddStr(header, PS_LIST_TAIL, "FPA.SHUTOUTC", 0, "Time of exposure", det->fpashutoutc);
 
   //field in header that tells about the CMF version

trunk/psModules/src/concepts/pmConcepts.c

@@ -312 +312 @@
         conceptRegisterEnum("FPA.TIMESYS", "Time system", p_pmConceptParse_TIMESYS, p_pmConceptFormat_TIMESYS, p_pmConceptCopy_TIMESYS, false, PM_FPA_LEVEL_FPA);
         conceptRegisterTime("FPA.TIME", "Time of exposure", false, PM_FPA_LEVEL_FPA);
+
+        conceptRegisterTime("FPA.SHUTOUTC", "Time of exposure", false, PM_FPA_LEVEL_FPA);
+
         conceptRegisterF32("FPA.TEMP", "Temperature of focal plane", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);
         conceptRegisterF32("FPA.M1X", "Primary Mirror X Position", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);