Changeset 6311 for trunk/psphot/src/psphotImageLoop.c

Timestamp:

Feb 2, 2006, 1:30:35 PM (20 years ago)

Author:

eugene

Message:

updated to use new image/subimage/region coordinate consistency

File:

• trunk/psphot/src/psphotImageLoop.c (modified) (4 diffs)

trunk/psphot/src/psphotImageLoop.c

@@ -5 +5 @@
     bool status;
     ppImageLoadDepth imageLoadDepth;
-    char filename[1024];
 
     // determine the load depth
@@ -27 +26 @@
     }
 
-    char *outputRoot = psMetadataLookupPtr (&status, config->arguments, "-output");
-    if (!status) psAbort ("psphot", "output file not specified");
-
-    int Nout = 0;
     for (int i = 0; i < file->fpa->chips->n; i++) {
         pmChip *chip = file->fpa->chips->data[i]; // Chip of interest in input image
@@ -53 +48 @@
             }
 
+            // XXX optional mask and weight input image should be loaded here?
+            // this sets the weight map and basic mask applying CELL.BAD and CELL.SATURATION
             pmCellSetWeights(cell);
 
@@ -58 +55 @@
             pmCellSetMask (cell, config->recipe); 
 
-
             // process each of the readouts
             for (int k = 0; k < cell->readouts->n; k++) {
                 pmReadout *readout = cell->readouts->data[k]; // Readout of interest in input image
 
-                // psphotSaveImage (NULL, readout->image, "image.fits");
-                // psphotSaveImage (NULL, readout->weight, "weight.fits");
-                // psphotSaveImage (NULL, readout->mask, "mask.fits");
+                // run a single-model test if desired
+                psphotModelTest (readout, config->arguments, config->recipe);
 
                 psphotReadout (readout, config->recipe);
-
-                // XXX EAM : temporarily write out only CMF with fixed extension
-                sprintf (filename, "%s.%02d.cmf", outputRoot, Nout);
-                psMetadata *header = pmReadoutGetHeader (readout);
-
-                psArray *sources = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.SOURCES");
-
-                pmSourcesWriteCMF (sources, filename, header);
-                Nout++;
+                psphotOutput (readout, config->arguments);
             }
         }