Index: /branches/eam_branches/20091201/ppSim/src/Makefile.am
===================================================================
--- /branches/eam_branches/20091201/ppSim/src/Makefile.am	(revision 26782)
+++ /branches/eam_branches/20091201/ppSim/src/Makefile.am	(revision 26783)
@@ -48,6 +48,4 @@
 	ppSimLoadSpots.c	  \
 	ppSimPhotom.c		  \
-	ppSimPhotomReadoutFake.c  \
-	ppSimPhotomReadoutForce.c \
 	ppSimPhotomFiles.c	  \
 	ppSimLoadForceSources.c	  \
@@ -60,4 +58,8 @@
 	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)
Index: /branches/eam_branches/20091201/ppSim/src/ppSimPhotom.c
===================================================================
--- /branches/eam_branches/20091201/ppSim/src/ppSimPhotom.c	(revision 26782)
+++ /branches/eam_branches/20091201/ppSim/src/ppSimPhotom.c	(revision 26783)
@@ -46,4 +46,6 @@
             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,4 +58,5 @@
             }
 	    // ppSimDetectionLimits (config, view);
+#endif
         }
     }
Index: /branches/eam_branches/20091201/ppSim/src/ppSimPhotomReadoutFake.c
===================================================================
--- /branches/eam_branches/20091201/ppSim/src/ppSimPhotomReadoutFake.c	(revision 26782)
+++ /branches/eam_branches/20091201/ppSim/src/ppSimPhotomReadoutFake.c	(revision 26783)
@@ -1,4 +1,6 @@
 # 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,12 +13,4 @@
         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,5 +30,5 @@
 
     // 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,6 +52,5 @@
     // 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,5 +61,5 @@
         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);
     }