Changeset 26543 for branches/eam_branches/20091201/ppSim/src/ppSimPhotomReadout.c

Timestamp:

Jan 7, 2010, 5:37:07 PM (17 years ago)

Author:

eugene

Message:

update to use new PSPHOT.INPUT handling code which allows multiple images

File:

• branches/eam_branches/20091201/ppSim/src/ppSimPhotomReadout.c (modified) (3 diffs)

branches/eam_branches/20091201/ppSim/src/ppSimPhotomReadout.c

@@ -39 +39 @@
 # if 0    
     // set the photcode for this image
-    if (!psphotAddPhotcode (recipe, config, view, "PPSIM.CHIP")) {
+    if (!psphotAddPhotcodeReadout (recipe, config, view, "PPSIM.CHIP", 0)) {
         psError (PSPHOT_ERR_CONFIG, false, "trouble defining the photcode");
         return false;
@@ -74 +74 @@
 
     // Generate the mask and weight images, including the user-defined analysis region of interest
-    psphotSetMaskAndWeight (config, readout, recipe);
+    psphotSetMaskAndWeight (config, view, recipe);
 
     // load the psf model, if suppled.  FWHM_X,FWHM_Y,etc are saved in the recipe
@@ -85 +85 @@
 
     // generate a background model (median, smoothed image)
-    if (!psphotModelBackground (config, view, "PPSIM.CHIP")) {
+    if (!psphotModelBackgroundReadoutFileIndex (config, view, "PPSIM.CHIP", 0)) {
         return psphotReadoutCleanup (config, readout, recipe, NULL, NULL, NULL);
     }
-    if (!psphotSubtractBackground (config, view, "PPSIM.CHIP")) {
+    if (!psphotSubtractBackgroundReadout (config, view, "PPSIM.CHIP", 0)) {
         return psphotReadoutCleanup (config, readout, recipe, NULL, NULL, NULL);
     }