Changeset 13901 for trunk/ppImage/src/ppImagePhotom.c

Timestamp:

Jun 19, 2007, 4:49:08 PM (19 years ago)

Author:

Paul Price

Message:

Adding chip and mask output for chip-mosaicked files. Was going to make this the default output, but we only have to have it selected in the recipe. Reduced the name of the filerule down, so that it's not excessively long (e.g., PPIMAGE.OUTPUT.CHIP.MASK --> PPIMAGE.CHIP.MASK).

File:

• trunk/ppImage/src/ppImagePhotom.c (modified) (2 diffs)

trunk/ppImage/src/ppImagePhotom.c

@@ -17 +17 @@
     pmFPAfile *input = psMetadataLookupPtr (&status, config->files, "PSPHOT.INPUT");
     if (!status) {
-        psError(PSPHOT_ERR_CONFIG, false, "PSPHOT.INPUT I/O file is not defined");
-        return false;
+        psError(PSPHOT_ERR_CONFIG, false, "PSPHOT.INPUT I/O file is not defined");
+        return false;
     }
 
@@ -28 +28 @@
     // iterate over the cells and readout for this chip
     while ((cell = pmFPAviewNextCell (view, input->fpa, 1)) != NULL) {
-        psLogMsg ("ppImagePhotom", 4, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
-        if (! cell->process || ! cell->file_exists) { continue; }
+        psLogMsg ("ppImagePhotom", 4, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
+        if (! cell->process || ! cell->file_exists) { continue; }
 
-        // process each of the readouts
-        while ((readout = pmFPAviewNextReadout (view, input->fpa, 1)) != NULL) {
-            if (! readout->data_exists) { continue; }
+        // process each of the readouts
+        while ((readout = pmFPAviewNextReadout (view, input->fpa, 1)) != NULL) {
+            if (! readout->data_exists) { continue; }
 
-            // run the actual photometry analysis
-            if (!psphotReadout (config, view)) {
-                psError(psErrorCodeLast(), false, "failure in psphotReadout for chip %d, cell %d, readout %d\n", view->chip, view->cell, view->readout);
-                return false;
-            }
-        }
+            // run the actual photometry analysis
+            if (!psphotReadout (config, view)) {
+                psError(psErrorCodeLast(), false, "failure in psphotReadout for chip %d, cell %d, readout %d\n", view->chip, view->cell, view->readout);
+                return false;
+            }
+        }
     }
 
-    // the PSPHOT.INPUT file is a temporary file used to carry PPIMAGE.OUTPUT.CHIP to psphotReadout
+    // the PSPHOT.INPUT file is a temporary file used to carry PPIMAGE.CHIP to psphotReadout
     // XXX not sure that this is needed...
     pmFPAfileActivate (config->files, false, "PSPHOT.INPUT");