Changeset 33415 for branches/meh_branches/ppstack_test/psphot/src/Makefile.am

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• psphot (modified) (1 prop)
• psphot/src (modified) (2 props)
• psphot/src/Makefile.am (modified) (9 diffs)

branches/meh_branches/ppstack_test/psphot/src

@@ -22 +22 @@
 psphotMakePSF
 psphotStack
+psphotModelTest

@@ -22 +22 @@
 psphotMakePSF
 psphotStack
+psphotModelTest

branches/meh_branches/ppstack_test/psphot/src/Makefile.am

@@ -25 +25 @@
 libpsphot_la_LDFLAGS = $(PSPHOT_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
 
-bin_PROGRAMS = psphot psphotForced psphotMakePSF psphotStack
+bin_PROGRAMS = psphot psphotForced psphotMakePSF psphotStack psphotModelTest
 # bin_PROGRAMS = psphotPetrosianStudy psphotTest psphotMomentsStudy 
 
@@ -43 +43 @@
 psphotStack_LDFLAGS = $(PSPHOT_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
 psphotStack_LDADD = libpsphot.la
+
+psphotModelTest_CFLAGS = $(PSPHOT_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
+psphotModelTest_LDFLAGS = $(PSPHOT_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
+psphotModelTest_LDADD = libpsphot.la
 
 # psphotMomentsStudy_CFLAGS = $(PSPHOT_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
@@ -102 +106 @@
         psphotCleanup.c
 
+# a psphot-variant that simply generates the PSF model
+psphotModelTest_SOURCES = \
+        psphotModelTest.c            \
+        psphotModelTestArguments.c   \
+        psphotParseCamera.c        \
+        psphotImageLoop.c   \
+        psphotMosaicChip.c         \
+        psphotCleanup.c
+
 # psphotTest_SOURCES = \
 #         psphotTest.c
@@ -117 +130 @@
         psphotVisual.c                 \
         psphotCullPeaks.c              \
+        psphotFootprintSaddles.c       \
         psphotVersion.c                \
         psphotModelGroupInit.c         \
@@ -129 +143 @@
         psphotMakePSFReadout.c         \
         psphotModelBackground.c        \
+        psphotModelTestReadout.c       \
         psphotMaskBackground.c         \
         psphotSubtractBackground.c     \
@@ -157 +172 @@
         psphotExtendedSourceAnalysisByObject.c \
         psphotExtendedSourceFits.c     \
+        psphotSersicModelClass.c       \
         psphotKernelFromPSF.c          \
         psphotFitSet.c                 \
@@ -168 +184 @@
         psphotRadialPlot.c             \
         psphotKronMasked.c             \
+        psphotKronIterate.c            \
+        psphotRadialProfileWings.c     \
         psphotDeblendSatstars.c        \
         psphotMosaicSubimage.c         \
@@ -184 +202 @@
         psphotRadialBins.c             \
         psphotRadialApertures.c        \
-        psphotRadialAperturesByObject.c \
         psphotPetrosian.c              \
         psphotPetrosianRadialBins.c    \
@@ -190 +207 @@
         psphotPetrosianVisual.c        \
         psphotEfficiency.c
-
-# XXX need to fix this for the new apis
-#       psphotModelTest.c              
 
 # re-instate these

@@ -22 +22 @@
 psphotMakePSF
 psphotStack
+psphotModelTest