Changeset 27840 for branches/simtest_nebulous_branches/psphot/src/Makefile.am

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• psphot (modified) (1 prop)
• psphot/src (modified) (1 prop)
• psphot/src/Makefile.am (modified) (5 diffs)

branches/simtest_nebulous_branches/psphot/src

@@ -18 +18 @@
 psphotVersionDefinitions.h
 psphotMomentsStudy
+psphotPetrosianStudy
+psphotForced
+psphotMakePSF
+psphotStack

@@ -18 +18 @@
 psphotVersionDefinitions.h
 psphotMomentsStudy
+psphotPetrosianStudy
+psphotForced
+psphotMakePSF
+psphotStack

branches/simtest_nebulous_branches/psphot/src/Makefile.am

@@ -25 +25 @@
 libpsphot_la_LDFLAGS = $(PSPHOT_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
 
-bin_PROGRAMS = psphot psphotTest psphotMomentsStudy
+bin_PROGRAMS = psphot psphotForced psphotMakePSF psphotStack
+# bin_PROGRAMS = psphotPetrosianStudy psphotTest psphotMomentsStudy 
 
 psphot_CFLAGS = $(PSPHOT_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
@@ -31 +32 @@
 psphot_LDADD = libpsphot.la
 
-psphotTest_CFLAGS = $(PSPHOT_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
-psphotTest_LDFLAGS = $(PSPHOT_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
-psphotTest_LDADD = libpsphot.la
-
-psphotMomentsStudy_CFLAGS = $(PSPHOT_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
-psphotMomentsStudy_LDFLAGS = $(PSPHOT_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
-psphotMomentsStudy_LDADD = libpsphot.la
-
+psphotForced_CFLAGS = $(PSPHOT_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
+psphotForced_LDFLAGS = $(PSPHOT_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
+psphotForced_LDADD = libpsphot.la
+
+psphotMakePSF_CFLAGS = $(PSPHOT_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
+psphotMakePSF_LDFLAGS = $(PSPHOT_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
+psphotMakePSF_LDADD = libpsphot.la
+
+psphotStack_CFLAGS = $(PSPHOT_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
+psphotStack_LDFLAGS = $(PSPHOT_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
+psphotStack_LDADD = libpsphot.la
+
+# psphotMomentsStudy_CFLAGS = $(PSPHOT_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
+# psphotMomentsStudy_LDFLAGS = $(PSPHOT_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
+# psphotMomentsStudy_LDADD = libpsphot.la
+
+# psphotPetrosianStudy_CFLAGS = $(PSPHOT_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
+# psphotPetrosianStudy_LDFLAGS = $(PSPHOT_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
+# psphotPetrosianStudy_LDADD = libpsphot.la
+
+# psphotTest_CFLAGS = $(PSPHOT_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
+# psphotTest_LDFLAGS = $(PSPHOT_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
+# psphotTest_LDADD = libpsphot.la
+
+# standard psphot for generic photometry
 psphot_SOURCES = \
         psphot.c                \
         psphotArguments.c       \
-        psphotCleanup.c         \
+        psphotParseCamera.c     \
         psphotImageLoop.c       \
         psphotMosaicChip.c      \
-        psphotParseCamera.c
-
-psphotDetect_SOURCES =            \
-        psphotDetect.c            \
-        psphotDetectArguments.c   \
-        psphotDetectParseCamera.c \
-        psphotDetectImageLoop.c   \
-        psphotDetectReadout.c     \
-        psphotMosaicChip.c        \
-        psphotCleanup.c
-
-psphotTest_SOURCES = \
-        psphotTest.c
-
-psphotMomentsStudy_SOURCES = \
-        psphotMomentsStudy.c
+        psphotCleanup.c
+
+# forced photometry of specified positions given a specified psf
+psphotForced_SOURCES = \
+        psphotForced.c             \
+        psphotForcedArguments.c    \
+        psphotForcedImageLoop.c    \
+        psphotForcedReadout.c      \
+        psphotParseCamera.c        \
+        psphotMosaicChip.c         \
+        psphotCleanup.c
+
+# a psphot-variant that simply generates the PSF model
+psphotMakePSF_SOURCES = \
+        psphotMakePSF.c            \
+        psphotMakePSFArguments.c   \
+        psphotMakePSFImageLoop.c   \
+        psphotMakePSFReadout.c     \
+        psphotParseCamera.c        \
+        psphotMosaicChip.c         \
+        psphotCleanup.c
+
+# a psphot-variant for stack photometry
+psphotStack_SOURCES = \
+        psphotStack.c                 \
+        psphotStackArguments.c        \
+        psphotStackParseCamera.c      \
+        psphotStackImageLoop.c        \
+        psphotStackReadout.c          \
+        psphotStackChisqImage.c       \
+        psphotFitSourcesLinearStack.c \
+        psphotSourceMatch.c           \
+        psphotCleanup.c
+
+
+
+# # psphot analysis of the detectability of specified positions
+# psphotDetect_SOURCES =            \
+#         psphotDetect.c            \
+#       psphotDetectArguments.c   \
+#       psphotDetectParseCamera.c \
+#       psphotDetectImageLoop.c   \
+#       psphotDetectReadout.c     \
+#       psphotMosaicChip.c        \
+#       psphotCleanup.c
+
+# psphotTest_SOURCES = \
+#         psphotTest.c
+# 
+# psphotMomentsStudy_SOURCES = \
+#         psphotMomentsStudy.c
+# 
+# psphotPetrosianStudy_SOURCES = \
+#         psphotPetrosianStudy.c
 
 libpsphot_la_SOURCES = \
@@ -104 +160 @@
         psphotExtendedSourceAnalysis.c \
         psphotExtendedSourceFits.c     \
-        psphotRadialProfile.c          \
-        psphotPetrosian.c              \
-        psphotIsophotal.c              \
-        psphotAnnuli.c                 \
-        psphotKron.c                   \
         psphotKernelFromPSF.c          \
         psphotPSFConvModel.c           \
-        psphotModelTest.c              \
         psphotFitSet.c                 \
         psphotSourceFreePixels.c       \
@@ -117 +167 @@
         psphotMergeSources.c           \
         psphotLoadPSF.c                \
+        psphotLoadSRCTEXT.c            \
         psphotReadoutCleanup.c         \
         psphotSourcePlots.c            \
@@ -128 +179 @@
         psphotCheckStarDistribution.c  \
         psphotThreadTools.c            \
-        psphotAddNoise.c
-
-# dropped? psphotGrowthCurve.c
+        psphotAddNoise.c               \
+        psphotRadialProfile.c          \
+        psphotRadialProfileByAngles.c  \
+        psphotRadiiFromProfiles.c      \
+        psphotEllipticalContour.c      \
+        psphotEllipticalProfile.c      \
+        psphotRadialBins.c             \
+        psphotPetrosian.c              \
+        psphotPetrosianRadialBins.c    \
+        psphotPetrosianStats.c         \
+        psphotPetrosianVisual.c        \
+        psphotEfficiency.c
+
+# XXX need to fix this for the new apis
+#       psphotModelTest.c              
+
+# re-instate these
+#       psphotIsophotal.c              \
+#       psphotAnnuli.c                 \
+#       psphotKron.c                   \
+#
+
+# test versions
+#       psphotPetrosianProfile.c       \
+#       psphotPetrosianAnalysis.c      \
+#
 
 include_HEADERS = \

@@ -18 +18 @@
 psphotVersionDefinitions.h
 psphotMomentsStudy
+psphotPetrosianStudy
+psphotForced
+psphotMakePSF
+psphotStack