Changeset 34172

Timestamp:

Jul 17, 2012, 1:25:52 PM (14 years ago)

Author:

eugene

Message:

adding new psphot version psphotMinimal (equivalent to call used by ppSub)

Location:

branches/eam_branches/ipp-20120627/psphot/src

Files:

• Makefile.am (modified) (3 diffs)
• psphot.h (modified) (2 diffs)
• psphotForced.c (modified) (1 diff)
• psphotImageLoop.c (modified) (1 diff)
• psphotMinimal.c (added)
• psphotMinimalArguments.c (added)
• psphotReadoutMinimal.c (modified) (1 diff)
• psphotSourceSize.c (modified) (1 diff)

branches/eam_branches/ipp-20120627/psphot/src/Makefile.am

@@ -25 +25 @@
 libpsphot_la_LDFLAGS = $(PSPHOT_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
 
-bin_PROGRAMS = psphot psphotForced psphotMakePSF psphotStack psphotModelTest
+bin_PROGRAMS = psphot psphotForced psphotMinimal psphotMakePSF psphotStack psphotModelTest
 # bin_PROGRAMS = psphotPetrosianStudy psphotTest psphotMomentsStudy 
 
@@ -35 +35 @@
 psphotForced_LDFLAGS = $(PSPHOT_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
 psphotForced_LDADD = libpsphot.la
+
+psphotMinimal_CFLAGS = $(PSPHOT_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
+psphotMinimal_LDFLAGS = $(PSPHOT_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
+psphotMinimal_LDADD = libpsphot.la
 
 psphotMakePSF_CFLAGS = $(PSPHOT_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
@@ -73 +77 @@
         psphotForced.c             \
         psphotForcedArguments.c    \
+        psphotParseCamera.c        \
+        psphotImageLoop.c          \
+        psphotMosaicChip.c         \
+        psphotCleanup.c
+
+# forced photometry of specified positions given a specified psf
+psphotMinimal_SOURCES = \
+        psphotMinimal.c            \
+        psphotMinimalArguments.c           \
         psphotParseCamera.c        \
         psphotImageLoop.c          \

branches/eam_branches/ipp-20120627/psphot/src/psphot.h

@@ -20 +20 @@
     PSPHOT_MAKE_PSF,
     PSPHOT_MODEL_TEST,
+    PSPHOT_MINIMAL,
 } psphotImageLoopMode;
 
@@ -331 +332 @@
 bool psphotForcedReadout(pmConfig *config, const pmFPAview *view, const char *filerule);
 
+pmConfig *psphotMinimalArguments(int argc, char **argv);
+bool psphotReadoutMinimal(pmConfig *config, const pmFPAview *view, const char *filerule);
+
 pmConfig *psphotMakePSFArguments(int argc, char **argv);
 bool psphotMakePSFReadout(pmConfig *config, const pmFPAview *view, const char *filerule);

branches/eam_branches/ipp-20120627/psphot/src/psphotForced.c

@@ -1 +1 @@
 # include "psphotStandAlone.h"
-# define FORCED_PHOTOMETRY 1
 
 int main (int argc, char **argv) {

branches/eam_branches/ipp-20120627/psphot/src/psphotImageLoop.c

@@ -118 +118 @@
                     }
                     break;
+                  case PSPHOT_MINIMAL:
+                    if (!psphotReadoutMinimal (config, view, "PSPHOT.INPUT")) {
+                        psError(psErrorCodeLast(), false, "failure in psphotReadout for chip %d, cell %d, readout %d\n", view->chip, view->cell, view->readout);
+                        psFree (view);
+                        return false;
+                    }
+                    break;
                   case PSPHOT_FORCED:
                     if (!psphotForcedReadout (config, view, "PSPHOT.INPUT")) {

branches/eam_branches/ipp-20120627/psphot/src/psphotReadoutMinimal.c

@@ -72 +72 @@
     psphotFitSourcesLinear (config, view, filerule, false);
 
-// XXX eventually, add the extended source fits here
-# if (0)
     // measure source size for the remaining sources
-    psphotSourceSize (config, view, filerule);
+    psphotSourceSize (config, view, filerule, false);
 
-    psphotExtendedSourceAnalysis (config, view, filerule);
+    // NOTE: Petrosian and Isophotal mags are not relevant at this time
+    // psphotExtendedSourceAnalysis (config, view, filerule);
 
+    // in ppSub context, this is used to fit TRAILs (and maybe EXP for comets)
     psphotExtendedSourceFits (config, view, filerule);
-# endif
 
     // calculate source magnitudes

branches/eam_branches/ipp-20120627/psphot/src/psphotSourceSize.c

@@ -520 +520 @@
             continue;
         }
+
+        // XXX in the ppSub context, do we get sensible values for ApResid?
 
         // set nSigmaMAG to include both systematic and poisson error terms.  we include a hard