Changeset 10393

Timestamp:

Dec 1, 2006, 12:34:18 PM (20 years ago)

Author:

eugene

Message:

added KAPA option and two summary plots; dropped old test code

Location:

trunk/psphot/src

Files:

• Makefile.am (modified) (2 diffs)
• growthTest.c (deleted)
• polyfitTest.c (deleted)
• psphot.h (modified) (1 diff)
• psphotParseCamera.c (modified) (1 diff)
• psphotReadout.c (modified) (3 diffs)
• psphotSummaryPlots.c (added)

trunk/psphot/src/Makefile.am

@@ -3 +3 @@
 libpsphot_la_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSPHOT_CFLAGS)
 
-# bin_PROGRAMS = psphot polyfitTest growthTest
 bin_PROGRAMS = psphot
 
 psphot_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSPHOT_CFLAGS)
-psphot_LDFLAGS = $(PSLIB_LIBS) $(PSMODULE_LIBS)
+psphot_LDFLAGS = $(PSLIB_LIBS) $(PSMODULE_LIBS) $(PSPHOT_LIBS)
 psphot_LDADD = libpsphot.la
 psphot_SOURCES = psphot.c               
-
-polyfitTest_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSPHOT_CFLAGS)
-polyfitTest_LDFLAGS = $(PSLIB_LIBS) $(PSMODULE_LIBS)
-polyfitTest_SOURCES = polyfitTest.c             
-
-growthTest_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSPHOT_CFLAGS)
-growthTest_LDFLAGS = $(PSLIB_LIBS) $(PSMODULE_LIBS)
-growthTest_SOURCES = growthTest.c psphotGrowthCurve.c           
 
 libpsphot_la_SOURCES = \
@@ -53 +44 @@
         psphotWeightBias.c      \
         psphotSourceFreePixels.c \
-        psphotTestPSF.c         \
+        psphotSummaryPlots.c     \
+        psphotTestPSF.c          \
         psphotCleanup.c         
 

trunk/psphot/src/psphot.h

@@ -92 +92 @@
 bool            psphotFitSet (pmSource *oneSrc, pmModel *oneModel, char *fitset, pmSourceFitMode mode);
 
+// plotting functions (available if libkapa is installed)
+bool psphotPlotMoments (pmConfig *config, pmFPAview *view, psArray *sources);
+bool psphotPlotPSFModel (pmConfig *config, pmFPAview *view, psArray *sources);
+
+// move to psLib or psModules
+int psphotKapaOpen ();
+bool psphotKapaClose ();

trunk/psphot/src/psphotParseCamera.c

@@ -66 +66 @@
     }
 
+    // optionally save the PSF Model
+    if (psMetadataLookupBool(NULL, recipe, "SAVE.PLOTS")) {
+        pmFPAfileDefineOutput (config, input->fpa, "PSPHOT.MOMENT.PLT");
+        pmFPAfileDefineOutput (config, input->fpa, "PSPHOT.PSFMODEL.PLT");
+    }
+
     // pmFPAfileConstruct (config->files, format, config->camera, "PSPHOT.PSF_SAMPLE");
 

trunk/psphot/src/psphotReadout.c

@@ -70 +70 @@
         return false;
     }
+    // XXX test the plotting function
+    psphotPlotMoments (config, view, sources);
+
     if (!strcasecmp (breakPt, "MOMENTS")) {
         if (!psphotReadoutCleanup (config, readout, recipe, NULL, sources)) return false;
@@ -117 +120 @@
     // linear PSF fit to remaining peaks
     psphotEnsemblePSF (readout, sources, recipe, psf, TRUE);
+
+    // XXX test the plotting function
+    psphotPlotPSFModel (config, view, sources);
 
 finish:
@@ -169 +175 @@
     pmFPAfileDropInternal (config->files, "PSPHOT.BACKGND");
 
+    psphotKapaClose ();
+
     psFree (psf);
     psFree (header);