Changeset 38729

Timestamp:

Sep 12, 2015, 10:27:17 AM (11 years ago)

Author:

mhuber

Message:

specifically add and pass SHUTCUTC as FPA keyword through chip-cam-warp-diff-publish stages

Location:

trunk

Files:

• ippconfig/gpc1/format_20100723.config (modified) (1 diff)
• ppTranslate/src/ppMops.h (modified) (2 diffs)
• 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

@@ -212 +212 @@
 
         FPA.SHUTOUTC    STR     SHUTOUTC
+        FPA.SHUTCUTC    STR     SHUTCUTC
 
         FPA.PON.TIME    STR     PONTIME

trunk/ppTranslate/src/ppMops.h

@@ -34 +34 @@
   psString difftype;                  // WW (Warp-Warp Diff) or WS (Warp-Stack Diff) or SW (Stack-Warp Diff)
   float sky;                          // Exposure avg sky background
-  psString shutoutc;                  // Camera exposure shutter open (UTC)
+  psString shutoutc;                  // Camera exposure shutter open (UTC) from DB 
 } ppMopsArguments;
 
@@ -63 +63 @@
   float platescale;                   // Plate scale at centroid
   psString fpashutoutc;               // FPA shutoutc 
+  psString fpashutcutc;               // FPA shutcutc 
 } ppMopsDetections;
 

trunk/ppTranslate/src/ppMopsDetections.c

@@ -21 +21 @@
     psFree(det->mask);
     psFree(det->fpashutoutc);
+    psFree(det->fpashutcutc);
     return;
 }
@@ -50 +51 @@
     det->diffSkyfileId = 0;
     det->fpashutoutc = NULL;
+    det->fpashutcutc = NULL;
     return det;
 }

trunk/ppTranslate/src/ppMopsRead.c

@@ -106 +106 @@
     det->naxis2 = psMetadataLookupS32(NULL, header, "IMNAXIS2"); // Number of rows
     det->fpashutoutc = psMemIncrRefCounter(psMetadataLookupStr(NULL, header, "FPA.SHUTOUTC"));
+    det->fpashutcutc = psMemIncrRefCounter(psMetadataLookupStr(NULL, header, "FPA.SHUTCUTC"));
     psFree(header);
 

trunk/ppTranslate/src/ppMopsWrite.c

@@ -99 +99 @@
   psMetadataAddStr(header, PS_LIST_TAIL, "DIFFTYPE", 0, "WW: Warp-Warp diff / WS: Warp-Stack diff / SW: Stack-Warp diff", args->difftype);
   psMetadataAddF32(header, PS_LIST_TAIL, "SKY", 0, "Exposure avg sky background", args->sky);
-  psMetadataAddStr(header, PS_LIST_TAIL, "SHUTOUTC", 0, "Camera exposure shutter open (UTC)", args->shutoutc);
+  psMetadataAddStr(header, PS_LIST_TAIL, "SHUTOUTC", 0, "Camera exposure shutter open (UTC, DB arg)", args->shutoutc);
   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);
+  psMetadataAddStr(header, PS_LIST_TAIL, "FPA.SHUTOUTC", 0, "Time of exposure open (CHIP mod)", det->fpashutoutc);
+  psMetadataAddStr(header, PS_LIST_TAIL, "FPA.SHUTCUTC", 0, "Time of exposure close (RAW)", det->fpashutcutc);
 
   //field in header that tells about the CMF version

trunk/psModules/src/concepts/pmConcepts.c

@@ -313 +313 @@
         conceptRegisterTime("FPA.TIME", "Time of exposure", false, PM_FPA_LEVEL_FPA);
 
-        conceptRegisterStr("FPA.SHUTOUTC", "Time of exposure", NULL,NULL,NULL,false, PM_FPA_LEVEL_FPA);
+        conceptRegisterStr("FPA.SHUTOUTC", "Time of exposure open", NULL,NULL,NULL,false, PM_FPA_LEVEL_FPA);
+        conceptRegisterStr("FPA.SHUTCUTC", "Time of exposure close", NULL,NULL,NULL,false, PM_FPA_LEVEL_FPA);
 
         conceptRegisterF32("FPA.TEMP", "Temperature of focal plane", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);