Changeset 26783

Timestamp:

Feb 5, 2010, 1:31:21 PM (16 years ago)

Author:

eugene

Message:

updates to psphot APIs to enable stack photometry

Location:

branches/eam_branches/20091201/ppSim/src

Files:

• Makefile.am (modified) (2 diffs)
• ppSimPhotom.c (modified) (2 diffs)
• ppSimPhotomReadoutFake.c (modified) (5 diffs)

branches/eam_branches/20091201/ppSim/src/Makefile.am

@@ -48 +48 @@
         ppSimLoadSpots.c          \
         ppSimPhotom.c             \
-        ppSimPhotomReadoutFake.c  \
-        ppSimPhotomReadoutForce.c \
         ppSimPhotomFiles.c        \
         ppSimLoadForceSources.c   \
@@ -60 +58 @@
         ppSimBadCTE.c             \
         ppSimVersion.c
+
+# these functions have been broken by the API change in psphot (Jan 2010)
+#       ppSimPhotomReadoutFake.c  
+#       ppSimPhotomReadoutForce.c 
 
 ppSimSequence_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSASTRO_CFLAGS) $(ppSim_CFLAGS)

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

@@ -46 +46 @@
             if (! readout->data_exists) { continue; }
 
+// these are broken by the Jan 2010 API changes to psphot
+#if 0
             // run the actual photometry analysis
             if (!ppSimPhotomReadoutFake (config, view)) {
@@ -56 +58 @@
             }
             // ppSimDetectionLimits (config, view);
+#endif
         }
     }

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

@@ -1 +1 @@
 # include "ppSim.h"
 
+// XXX this function is currently disabled -- need to update code below to distinguish the fake
+// and force positions, etc
 bool ppSimPhotomReadoutFake(pmConfig *config, const pmFPAview *view) {
 
@@ -11 +13 @@
         return false;
     }
-
-# if 0
-    // set the photcode for this image
-    if (!psphotAddPhotcodeReadout (recipe, config, view, "PPSIM.FAKE.CHIP", 0)) {
-        psError (PSPHOT_ERR_CONFIG, false, "trouble defining the photcode");
-        return false;
-    }
-# endif
 
     // *** in this section, perform the photometry for real + fake sources on PPSIM.FAKE.CHIP ***
@@ -36 +30 @@
 
     // Generate the mask and variance images, including the user-defined analysis region of interest
-    psphotSetMaskAndVariance (config, view, recipe);
+    psphotSetMaskAndVariance (config, view);
 
     // XXX need to define the source pixels
@@ -58 +52 @@
     // 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
-    pmPSF *psf = psphotLoadPSF (config, view, recipe);
-    assert (psf);
+    psphotLoadPSF (config, view);
 
     // remove all sources
@@ -68 +61 @@
         return psphotReadoutCleanup (config, readout, recipe, NULL, NULL, NULL);
     }
-    if (!psphotSubtractBackgroundReadout (config, view, "PPSIM.FAKE.CHIP", 0)) {
+    if (!psphotSubtractBackgroundReadout (config, view, "PPSIM.FAKE.CHIP", 0, recipe)) {
         return psphotReadoutCleanup (config, readout, recipe, NULL, NULL, NULL);
     }