Changeset 41696

Timestamp:

Jul 7, 2021, 4:54:56 PM (5 years ago)

Author:

eugene

Message:

check in changes from trunk: allow dvoMakeCorr to operate on camera with missing chips

Location:

tags/ipp-ps1-20210510/dvoTools/src

Files:

• dvoMakeCorrArguments.c (modified) (1 diff)
• dvoMakeCorrLoop.c (modified) (4 diffs)
• dvoMakeCorrUnbin.c (modified) (1 diff)

tags/ipp-ps1-20210510/dvoTools/src/dvoMakeCorrArguments.c

@@ -36 +36 @@
     // these options override the DVOCORR recipe values loaded from recipe files
     // psMetadata *options = pmConfigRecipeOptions (config, RECIPE_NAME);
+    // EAM 20210607 : no dvocorr recipe values are actually defined
 
     // XXX add options from command-line here

tags/ipp-ps1-20210510/dvoTools/src/dvoMakeCorrLoop.c

@@ -32 +32 @@
     pmFPAview *view = pmFPAviewAlloc(0);// View for level of interest
 
-    // load data at FPA leve
-    if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
-        psError(PS_ERR_UNKNOWN, false, "failed IO for fpa in psphot\n");
-        psFree(view);
-        return false;
-    }
-
     // XXX for now, do not use the I/O system to read this file; do it manually
     if (!pmFPAfileOpen (input, view, config)) {
@@ -46 +39 @@
     }
     input->state = PM_FPA_STATE_INACTIVE;  
+
+    // load data at FPA leve
+    if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
+        psError(PS_ERR_UNKNOWN, false, "failed IO for fpa in psphot\n");
+        psFree(view);
+        return false;
+    }
 
     // process each chip in the FPA
@@ -61 +61 @@
         assert (inChip->hdu);
         assert (inChip->hdu->extname);
-        psFitsMoveExtName (input->fits, inChip->hdu->extname);
+
+        // not all extensions are required to exist.  skip if not found
+        if (!psFitsMoveExtName (input->fits, inChip->hdu->extname)) {
+          continue;
+        }
         psImage *inImage = psFitsReadImage (input->fits, fullImage, 0);
         assert (inImage);
@@ -98 +102 @@
     }
 
+    input->state = PM_FPA_STATE_OPEN;  
     pmFPAfileClose (input, view);
     psFree (view);

tags/ipp-ps1-20210510/dvoTools/src/dvoMakeCorrUnbin.c

@@ -48 +48 @@
 
         outData = pmReadoutAlloc (outCell);
+        psFree (outData); // free the extra reference
         assert (outData != NULL);
     }