Changeset 37383 for tags/ipp-20130712

Timestamp:

Sep 9, 2014, 4:19:28 PM (12 years ago)

Author:

mhuber

Message:

merge specifically pass SHUTOUTC as FPA keyword through warp-diff-ppMops stages (additionally astrom to accomodate conflicting mods in the trunk)

Location:

tags/ipp-20130712

Files:

• ippconfig/gpc1/format_20100723.config (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/astrom/pmAstrometryModel.c (modified) (2 diffs, 1 prop)
• psModules/src/concepts/pmConcepts.c (modified) (2 diffs, 1 prop)
• psModules/src/concepts/pmConcepts.h (modified) (1 diff, 1 prop)

tags/ipp-20130712/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

tags/ipp-20130712/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;
 

tags/ipp-20130712/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;
 }

tags/ipp-20130712/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);
 

tags/ipp-20130712/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

tags/ipp-20130712/psModules/src/astrom/pmAstrometryModel.c

@@ -39 +39 @@
 #include "pmFPAExtent.h"
 #include "pmFPAfileFitsIO.h"
+#include "pmConcepts.h"
 #include "pmAstrometryWCS.h"
 #include "pmAstrometryUtils.h"
@@ -452 +453 @@
 }
 
-int pmConceptsChipNumberFromName (pmFPA *fpa, char *name) {
-
-    for (int i = 0; i < fpa->chips->n; i++) {
-        pmChip *chip = fpa->chips->data[i];
-        if (!chip) continue;
-        char *thisone = psMetadataLookupStr (NULL, chip->concepts, "CHIP.NAME");
-        if (!thisone) continue;
-        if (!strcmp (name, thisone)) return (i);
-    }
-    return -1;
-}
-
-pmChip *pmConceptsChipFromName (pmFPA *fpa, char *name) {
-
-    for (int i = 0; i < fpa->chips->n; i++) {
-        pmChip *chip = fpa->chips->data[i];
-        if (!chip) continue;
-        char *thisone = psMetadataLookupStr (NULL, chip->concepts, "CHIP.NAME");
-        if (!thisone) continue;
-        if (!strcmp (name, thisone)) return (chip);
-    }
-    return NULL;
-}
-
 // first layer converts Chip to Focal Plane
 bool pmAstromModelReadChips (pmFPAfile *file) {

tags/ipp-20130712/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);
@@ -578 +581 @@
 }
 
+int pmConceptsChipNumberFromName (pmFPA *fpa, char *name) {
+
+    for (int i = 0; i < fpa->chips->n; i++) {
+        pmChip *chip = fpa->chips->data[i];
+        if (!chip) continue;
+        char *thisone = psMetadataLookupStr (NULL, chip->concepts, "CHIP.NAME");
+        if (!thisone) continue;
+        if (!strcmp (name, thisone)) return (i);
+    }
+    return -1;
+}
+
+pmChip *pmConceptsChipFromName (pmFPA *fpa, char *name) {
+
+    for (int i = 0; i < fpa->chips->n; i++) {
+        pmChip *chip = fpa->chips->data[i];
+        if (!chip) continue;
+        char *thisone = psMetadataLookupStr (NULL, chip->concepts, "CHIP.NAME");
+        if (!thisone) continue;
+        if (!strcmp (name, thisone)) return (chip);
+    }
+    return NULL;
+}
+

tags/ipp-20130712/psModules/src/concepts/pmConcepts.h

@@ -161 +161 @@
     );
 
+// some utility functions:
+int pmConceptsChipNumberFromName (pmFPA *fpa, char *name);
+pmChip *pmConceptsChipFromName (pmFPA *fpa, char *name);
+
 /// @}
 #endif