Changeset 20180 for trunk/dvoTools/src/dvoMakeCorrLoop.c

Timestamp:

Oct 15, 2008, 5:51:49 PM (18 years ago)

Author:

eugene

Message:

extensive fixes to make these two programs actually work

File:

• trunk/dvoTools/src/dvoMakeCorrLoop.c (modified) (7 diffs)

trunk/dvoTools/src/dvoMakeCorrLoop.c

@@ -5 +5 @@
 #include "dvoMakeCorr.h"
 
+// XXX currently, the input image (the grid map generated by relphot) does not supply enough
+// header information so the camera and format can be identified.
+
 bool dvoMakeCorrLoop (pmConfig *config, dvoMakeCorrOptions *options) {
 
@@ -10 +13 @@
     pmChip *chip;
     pmCell *cell;
-    pmReadout *readout;
+    psRegion fullImage = {0, 0, 0, 0};
 
     // psMetadata *recipe = psMetadataLookupMetadata(&status, config->recipes, RECIPE_NAME);
+
+    // use the reference image to identify the desired extension from DVOCORR.INPUT
+    pmFPAfile *refhead = psMetadataLookupPtr(&status, config->files, "DVOCORR.REFHEAD");
+    if (!status) {
+        psErrorStackPrint(stderr, "Can't find reference image\n");
+        exit(EXIT_FAILURE);
+    }
 
     pmFPAfile *input = psMetadataLookupPtr(&status, config->files, "DVOCORR.INPUT");
@@ -29 +39 @@
     }
 
+    // XXX for now, do not use the I/O system to read this file; do it manually
+    if (!pmFPAfileOpen (input, view, config)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to open grid file\n");
+        psFree (view);
+        return false;
+    }
+    input->state = PM_FPA_STATE_INACTIVE;  
+
     // process each chip in the FPA
-    while ((chip = pmFPAviewNextChip(view, input->fpa, 1)) != NULL) {
+    while ((chip = pmFPAviewNextChip(view, refhead->fpa, 1)) != NULL) {
         psLogMsg ("dvoMakeCorrLoop", 4, "Chip %d: %x %x\n", view->chip, chip->file_exists, chip->process);
         if (!chip->process || !chip->file_exists) continue;
@@ -39 +57 @@
         }
 
+        // load the input data for this extension
+        pmChip *inChip = pmFPAviewThisChip (view, input->fpa);
+        char *inName = psMetadataLookupStr (&status, inChip->concepts, "CHIP.NAME");
+        psFitsMoveExtName (input->fits, inName);
+        psImage *inImage = psFitsReadImage (input->fits, fullImage, 0);
+        assert (inImage);
+
         // process each cell in the Chip
-        while ((cell = pmFPAviewNextCell(view, input->fpa, 1)) != NULL) {
+        while ((cell = pmFPAviewNextCell(view, refhead->fpa, 1)) != NULL) {
             psLogMsg ("dvoMakeCorrLoop", 4, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
             if (!cell->process || !cell->file_exists) continue;
@@ -49 +74 @@
             }
 
-            // process each of the readouts
-            while ((readout = pmFPAviewNextReadout (view, input->fpa, 1)) != NULL) {
-                if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
-                    psError(PS_ERR_UNKNOWN, false, "failed IO for chip %d, cell %d, readout %d in dvoMakeCorr\n", view->chip, view->cell, view->readout);
-                    psFree (view);
-                    return false;
-                }
-                if (!readout->data_exists) continue;
+            // XXX put the function here which unbins the input image
+            dvoMakeCorrUnbin (config, view, "DVOCORR.OUTPUT", inImage, inChip, "DVOCORR.REFHEAD");
 
-                // XXX put the function here which unbins the input image
-                dvoMakeCorrUnbin (config, view, "DVOCORR.OUTPUT", "DVOCORR.INPUT", "DVOCORR.REFHEAD");
-
-                if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) {
-                    psError(PS_ERR_UNKNOWN, false, "failed IO for chip %d, cell %d, readout %d in dvoMakeCorr\n", view->chip, view->cell, view->readout);
-                    psFree (view);
-                    return false;
-                }
-            }
             if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) {
                 psError(PS_ERR_UNKNOWN, false, "failed IO for chip %d, cell %d in dvoMakeCorr\n", view->chip, view->cell);
@@ -73 +83 @@
             }
         }
+        psFree (inImage);
+
         if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) {
             psError(PS_ERR_UNKNOWN, false, "failed IO for chip %d in dvoMakeCorr\n", view->chip);
@@ -85 +97 @@
     }
 
+    pmFPAfileClose (input, view);
     psFree (view);