Changeset 30631 for branches/czw_branch/20101203/ppSim/src/Makefile.am

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/Makefile.am (modified) (2 diffs)

branches/czw_branch/20101203/ppSim/src/Makefile.am

@@ -47 +47 @@
         ppSimUtils.c              \
         ppSimLoop.c               \
-        ppSimLoadSpots.c          \
-        ppSimPhotom.c             \
-        ppSimPhotomFiles.c        \
-        ppSimLoadForceSources.c   \
         ppSimMergeReadouts.c      \
         ppSimDetections.c         \
@@ -59 +55 @@
         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)