Changeset 42237

Timestamp:

Jul 4, 2022, 10:14:51 PM (4 years ago)

Author:

mhuber

Message:

merge in new gpc2 format config with SHMDOUTC, SHMDCUTC mid-focalplane open/close shutter times starting 20220616 when keywords added, adding SHMDOUTC,SHMDCUTC keywords to pass on to warp,diff and include in publishing (IPP-1667, IPP-1688)

Location:

tags/ipp-ops-20220705

Files:

• ippconfig/gpc2/Makefile.am (modified) (1 diff, 1 prop)
• ppTranslate/src/ppMops.h (modified) (1 diff, 1 prop)
• ppTranslate/src/ppMopsDetections.c (modified) (2 diffs, 1 prop)
• ppTranslate/src/ppMopsRead.c (modified) (1 diff, 1 prop)
• ppTranslate/src/ppMopsWrite.c (modified) (1 diff, 1 prop)
• psModules/src/concepts/pmConcepts.c (modified) (1 diff, 1 prop)

tags/ipp-ops-20220705/ippconfig/gpc2/Makefile.am

@@ -8 +8 @@
         format_mef.config \
         format_20180131.config \
+        format_20220616.config \
         ghost.model.mdc \
         ppImage.config \

tags/ipp-ops-20220705/ppTranslate/src/ppMops.h

@@ -67 +67 @@
   psString fpashutoutc;               // FPA shutoutc 
   psString fpashutcutc;               // FPA shutcutc 
+  psString fpashmdoutc;               // FPA shmdoutc 
+  psString fpashmdcutc;               // FPA shmdcutc 
   psString refcat;                    // Reference catalog used
 } ppMopsDetections;

tags/ipp-ops-20220705/ppTranslate/src/ppMopsDetections.c

@@ -22 +22 @@
     psFree(det->fpashutoutc);
     psFree(det->fpashutcutc);
+    psFree(det->fpashmdoutc);
+    psFree(det->fpashmdcutc);
     return;
 }
@@ -52 +54 @@
     det->fpashutoutc = NULL;
     det->fpashutcutc = NULL;
+    det->fpashmdoutc = NULL;
+    det->fpashmdcutc = NULL;
     return det;
 }

tags/ipp-ops-20220705/ppTranslate/src/ppMopsRead.c

@@ -107 +107 @@
     det->fpashutoutc = psMemIncrRefCounter(psMetadataLookupStr(NULL, header, "FPA.SHUTOUTC"));
     det->fpashutcutc = psMemIncrRefCounter(psMetadataLookupStr(NULL, header, "FPA.SHUTCUTC"));
+    det->fpashmdoutc = psMemIncrRefCounter(psMetadataLookupStr(NULL, header, "FPA.SHMDOUTC"));
+    det->fpashmdcutc = psMemIncrRefCounter(psMetadataLookupStr(NULL, header, "FPA.SHMDCUTC"));
     det->refcat = psMemIncrRefCounter(psMetadataLookupStr(NULL, header, "PSREFCAT"));
     psFree(header);

tags/ipp-ops-20220705/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 open (CHIP mod)", det->fpashutoutc);
-  psMetadataAddStr(header, PS_LIST_TAIL, "FPA.SHUTCUTC", 0, "Time of exposure close (RAW)", det->fpashutcutc);
+  psMetadataAddStr(header, PS_LIST_TAIL, "FPA.SHUTOUTC", 0, "Time shutter open", det->fpashutoutc);
+  psMetadataAddStr(header, PS_LIST_TAIL, "FPA.SHUTCUTC", 0, "Time shutter close", det->fpashutcutc);
+  psMetadataAddStr(header, PS_LIST_TAIL, "FPA.SHMDOUTC", 0, "Time shutter open mid-fp", det->fpashmdoutc);
+  psMetadataAddStr(header, PS_LIST_TAIL, "FPA.SHMDCUTC", 0, "Time shutter close mid-fp", det->fpashmdcutc);
   psMetadataAddStr(header, PS_LIST_TAIL, "PSREFCAT", 0, "Reference catalog used", det->refcat);
 

tags/ipp-ops-20220705/psModules/src/concepts/pmConcepts.c

@@ -315 +315 @@
         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);
+        conceptRegisterStr("FPA.SHMDOUTC", "Time of exposure open mid-focalplane", NULL,NULL,NULL,false, PM_FPA_LEVEL_FPA);
+        conceptRegisterStr("FPA.SHMDCUTC", "Time of exposure close mid-focalplane", NULL,NULL,NULL,false, PM_FPA_LEVEL_FPA);
 
         conceptRegisterF32("FPA.TEMP", "Temperature of focal plane", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA);