Changeset 21365 for trunk/ppSim/src/ppSimPhotomReadoutForce.c

Timestamp:

Feb 5, 2009, 4:47:00 PM (17 years ago)

Author:

Paul Price

Message:

Merging pap_branch_20090128. Resolved a small number of conflicts. Compiles, but not tested in detail.

File:

• trunk/ppSim/src/ppSimPhotomReadoutForce.c (modified) (7 diffs)

trunk/ppSim/src/ppSimPhotomReadoutForce.c

@@ -12 +12 @@
     }
 
-# if 0    
+# if 0
     // set the photcode for this image
     if (!psphotAddPhotcode (recipe, config, view, "PPSIM.FAKE.CHIP")) {
@@ -22 +22 @@
     // *** in this section, perform the photometry for real + force sources on PPSIM.FORCE.CHIP ***
 
-    // find the currently selected readout. 
+    // find the currently selected readout.
     // we always perform photometry on the mosaiced chip
     pmReadout  *readout = pmFPAfileThisReadout (config->files, view, "PPSIM.FORCE.CHIP");
@@ -35 +35 @@
     psAssert (forceSources, "failed to load force photometry sources");
 
-    // Generate the mask and weight images, including the user-defined analysis region of interest
-    psphotSetMaskAndWeight (config, readout, recipe);
+    // Generate the mask and variance images, including the user-defined analysis region of interest
+    psphotSetMaskAndVariance (config, readout, recipe);
 
     // XXX need to define the source pixels
@@ -46 +46 @@
     psArray *realSources = psArrayAlloc (realMeasuredSources->n);
     for (int i = 0; i < realMeasuredSources->n; i++) {
-        realSources->data[i] = pmSourceCopy (realMeasuredSources->data[i]);
+        realSources->data[i] = pmSourceCopy (realMeasuredSources->data[i]);
     }
 
     // load the psf model, if suppled.  FWHM_X,FWHM_Y,etc are saved in the recipe
-    // this function uses PSPHOT.PSF.LOAD as the pmFPAfile 
+    // this function uses PSPHOT.PSF.LOAD as the pmFPAfile
     pmPSF *psf = psphotLoadPSF (config, view, recipe);
     assert (psf);
 
-    // remove all sources 
+    // remove all sources
     psphotRemoveAllSources (realSources, recipe);
 
@@ -69 +69 @@
 
     // XXX fake sources should measure peak->x,y, force sources should not
-    psImageMaskType maskVal = 0xff; 
+    psImageMaskType maskVal = 0xff;
     psImage *significance = psphotSignificanceImage (readout, recipe, 1, maskVal);
     ppSimDetections (significance, recipe, forceSources);
@@ -83 +83 @@
     psphotGuessModels (config, readout, realSources, psf);
     psphotGuessModels (config, readout, forceSources, psf);
-    
+
     // linear fit to real + force sources
     psArray *sources = ppSimMergeSources (realSources, forceSources);
@@ -106 +106 @@
     pmReadout *forceReadout = pmFPAfileThisReadout (config->files, view, "PPSIM.FORCE.SOURCES");
     if (!forceReadout) {
-        forceReadout = pmReadoutAlloc (forceCell);
-        psFree (forceReadout); // there is a copy on 'cell' as well
+        forceReadout = pmReadoutAlloc (forceCell);
+        psFree (forceReadout); // there is a copy on 'cell' as well
     }
     psAssert (forceReadout, "no forceReadout?");