Changeset 20180 for trunk/dvoTools/src/dvoApplyCorrLoop.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/dvoApplyCorrLoop.c (modified) (4 diffs)

trunk/dvoTools/src/dvoApplyCorrLoop.c

@@ -10 +10 @@
     pmChip *chip;
     pmCell *cell;
-    pmReadout *readout;
 
     // psMetadata *recipe = psMetadataLookupMetadata(&status, config->recipes, RECIPE_NAME);
@@ -17 +16 @@
     pmFPAfile *input = psMetadataLookupPtr(&status, config->files, "DVOFLAT.INPUT");
     if (!status) {
-        psErrorStackPrint(stderr, "Can't find input data!\n");
+        psErrorStackPrint(stderr, "Can't find input flat-field image\n");
+        exit(EXIT_FAILURE);
+    }
+
+    // select the input image
+    pmFPAfile *corr = psMetadataLookupPtr(&status, config->files, "DVOFLAT.CORR");
+    if (!status) {
+        psErrorStackPrint(stderr, "Can't find correction image\n");
         exit(EXIT_FAILURE);
     }
@@ -40 +46 @@
         }
 
+        pmChip *corrChip = pmFPAviewThisChip(view, corr->fpa);
+
         // process each cell in the Chip
         while ((cell = pmFPAviewNextCell(view, input->fpa, 1)) != NULL) {
@@ -50 +58 @@
             }
 
-            // 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 dvoApplyCorr\n", view->chip, view->cell, view->readout);
-                    psFree (view);
-                    return false;
-                }
-                if (!readout->data_exists) continue;
-
-                // XXX put the function here which multiplies the input image and the correction image
-                dvoApplyCorrReadout (config, view, "DVOFLAT.INPUT", "DVOFLAT.CORR");
-
-                if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) {
-                    psError(PS_ERR_UNKNOWN, false, "failed IO for chip %d, cell %d, readout %d in dvoApplyCorr\n", view->chip, view->cell, view->readout);
-                    psFree (view);
-                    return false;
-                }
+            // multiply the input image and the correction image
+            if (!dvoApplyCorrReadout (cell, corrChip)) {
+                psError(PS_ERR_UNKNOWN, false, "failed to apply correction to chip %d, cell %d dvoApplyCorr\n", view->chip, view->cell);
+                psFree (view);
+                return false;
             }
             if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) {