Changeset 30631 for branches/czw_branch/20101203/ppSim/src/ppSimLoop.c

Timestamp:

Feb 14, 2011, 1:05:28 PM (15 years ago)

Author:

watersc1

Message:

Merge of trunk back into branch.

Location:

branches/czw_branch/20101203

Files:

• . (modified) (1 prop)
• ppSim/src/ppSimLoop.c (modified) (3 diffs)

branches/czw_branch/20101203/ppSim/src/ppSimLoop.c

@@ -42 +42 @@
     if (type == PPSIM_TYPE_OBJECT) {
         // Load forced-photometry positions (these are placed on fpa->analysis for use in ppSimPhotomReadout)
-        if (!ppSimLoadSpots (fpa, config)) ESCAPE (PS_ERR_UNKNOWN, "failed to load forced-photometry spots");
+        // if (!ppSimLoadSpots (fpa, config)) ESCAPE (PS_ERR_UNKNOWN, "failed to load forced-photometry spots");
 
         // Load catalogue stars
@@ -58 +58 @@
 
     pmFPAview *view = pmFPAviewAlloc(0);// View for iterating over FPA
-
-    // XXX if we include the psphot analysis, we will need to activate the correct pmFPAfiles
-    // at the correct times.  ppSim operates on PPSIM.OUTPUT and PPSIM.SOURCES
 
     // load any needed files (eg, input image, PSF)
@@ -209 +206 @@
 
         // we perform photometry on the readouts of this chip in the output
-        if (!ppSimPhotom (config, view)) ESCAPE (PS_ERR_UNKNOWN, "problem performing photometry");
+        // if (!ppSimPhotom (config, view)) ESCAPE (PS_ERR_UNKNOWN, "problem performing photometry");
 
         if (!pmFPAfileIOChecks(config, view, PM_FPA_AFTER)) {