Changeset 17958 for branches/eam_branch_20080511/ppSim/src/ppSimPhotom.c

Timestamp:

Jun 5, 2008, 5:16:44 PM (18 years ago)

Author:

eugene

Message:

split fake and force photometry into separate functions and separate mosaicked images

File:

• branches/eam_branch_20080511/ppSim/src/ppSimPhotom.c (modified) (2 diffs)

branches/eam_branch_20080511/ppSim/src/ppSimPhotom.c

@@ -16 +16 @@
 
     int blankMask = 0;          // XXX not sure what this should be set to...
-    ppSimMosaicChip(config, blankMask, view, "PPSIM.CHIP", "PPSIM.OUTPUT");
+    ppSimMosaicChip(config, blankMask, view, "PPSIM.FORCE.CHIP", "PPSIM.INPUT");
+    ppSimMosaicChip(config, blankMask, view, "PPSIM.FAKE.CHIP", "PPSIM.OUTPUT");
 
-    // XXX have ppSimMosaicChip return the pointer?
-    pmFPAfile *input = psMetadataLookupPtr (&status, config->files, "PPSIM.CHIP");
+    // use PPSIM.FAKE.CHIP as the base since it is guaranteed to exist (derived from PPSIM.OUTPUT)
+    pmFPAfile *input = psMetadataLookupPtr (&status, config->files, "PPSIM.FAKE.CHIP");
     if (!status) {
-        psError(PSPHOT_ERR_CONFIG, false, "PPSIM.CHIP I/O file is not defined");
+        psError(PSPHOT_ERR_CONFIG, false, "PPSIM.FAKE.CHIP I/O file is not defined");
         return false;
     }
@@ -46 +47 @@
 
             // run the actual photometry analysis
-            if (!ppSimPhotomReadout (config, view)) {
+            if (!ppSimPhotomReadoutFake (config, view)) {
+                psError(psErrorCodeLast(), false, "failure in psphotReadout for chip %d, cell %d, readout %d\n", view->chip, view->cell, view->readout);
+                return false;
+            }
+            if (!ppSimPhotomReadoutForce (config, view)) {
                 psError(psErrorCodeLast(), false, "failure in psphotReadout for chip %d, cell %d, readout %d\n", view->chip, view->cell, view->readout);
                 return false;