Changeset 14404

Timestamp:

Aug 6, 2007, 9:32:53 AM (19 years ago)

Author:

eugene

Message:

adding calls to psphotReadout, related options

Location:

trunk

Files:

• ppStack/configure.ac (modified) (1 diff)
• ppStack/src/Makefile.am (modified) (1 diff)
• ppStack/src/ppStackArguments.c (modified) (2 diffs)
• ppStack/src/ppStackCamera.c (modified) (1 diff)
• ppStack/src/ppStackLoop.c (modified) (3 diffs)
• ppSub/src/Makefile.am (modified) (1 diff)
• ppSub/src/ppSubLoop.c (modified) (3 diffs)

trunk/ppStack/configure.ac

@@ -17 +17 @@
 AC_SYS_LARGEFILE 
 
-PKG_CHECK_MODULES([PSLIB], [pslib >= 1.0.0])
+PKG_CHECK_MODULES([PSLIB],    [pslib >= 1.0.0])
 PKG_CHECK_MODULES([PSMODULE], [psmodules >= 1.0.0])
-PKG_CHECK_MODULES([PPSTATS], [ppStats >= 1.0.0]) 
+PKG_CHECK_MODULES([PSPHOT],   [psphot >= 0.8.0]) 
+PKG_CHECK_MODULES([PPSTATS],  [ppStats >= 1.0.0]) 
 
 IPP_STDOPTS

trunk/ppStack/src/Makefile.am

@@ -1 +1 @@
 bin_PROGRAMS = ppStack
 
-ppStack_CFLAGS  = $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) $(PPSTATS_CFLAGS)$(PPSTACK_CFLAGS)
-ppStack_LDFLAGS = $(PSMODULE_LIBS) $(PSLIB_LIBS) $(PPSTATS_LIBS) $(PPSTACK_LIBS)
+ppStack_CFLAGS  = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSPHOT_CFLAGS) $(PPSTATS_CFLAGS) $(PPSTACK_CFLAGS)
+ppStack_LDFLAGS = $(PSLIB_LIBS)   $(PSMODULE_LIBS)   $(PSPHOT_LIBS)   $(PPSTATS_LIBS)   $(PPSTACK_LIBS)
 
 ppStack_SOURCES =               \

trunk/ppStack/src/ppStackArguments.c

@@ -9 +9 @@
 
 #include "ppStack.h"
+
+// XXX add in the version info as in ppImage
 
 // Print usage information and die
@@ -109 +111 @@
     psMetadataAddU8(arguments,  PS_LIST_TAIL, "-mask-blank", 0, "Mask value for blank region", 0);
 
+    // XXX I want to get this from the recipe as well.  (same for everything else...)
+    psMetadataAddBool(arguments, PS_LIST_TAIL, "-photom", 0, "Mask value for blank region", FALSE);
+
     if (argc == 1 || !psArgumentParse(arguments, &argc, argv) || argc != 3) {
         usage(argv[0], arguments, config);

trunk/ppStack/src/ppStackCamera.c

@@ -223 +223 @@
     }
 
+    // For photometry, we operate on the chip-mosaicked image
+    // we create a copy of the mosaicked image for psphot so we can write out a clean image
+    bool mdok = false;
+    bool doPhotom = psMetadataLookupBool(&mdok, config->arguments, "PHOTOM"); // perform photometry
+    if (doPhotom) {
+        // this file is just used as a carrier; output files (eg, PSPHOT.RESID) are defined by
+        // psphotDefineFiles
+        pmFPAfile *psphotInput = pmFPAfileDefineFromFPA (config, output->fpa, 1, 1, "PSPHOT.INPUT");
+        PS_ASSERT (psphotInput, false);
+
+        // define associated psphot input/output files
+        if (!psphotDefineFiles (config, psphotInput)) {
+            psError(PSPHOT_ERR_CONFIG, false, "Trouble defining the additional input/output files for psphot");
+            return false;
+        }
+    }
+
     return true;
 }

trunk/ppStack/src/ppStackLoop.c

@@ -8 +8 @@
 #include <psmodules.h>
 #include <ppStats.h>
+#include <psphot.h>
 
 #include "ppStack.h"
@@ -37 +38 @@
         return false;
     }
+
+    bool doPhotom = psMetadataLookupBool(&mdok, config->arguments, "PHOTOM"); // perform photometry
 
     pmFPAview *view = pmFPAviewAlloc(0); // Pointer into FPA hierarchy
@@ -80 +83 @@
                 }
 
+                if (doPhotom) {
+                  if (!psphotReadout (config, view)) {
+                    psError(psErrorCodeLast(), false, "failure in psphotReadout for stacked image\n");
+                    return false;
+                  }
+                }
+
                 if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
                     return false;

trunk/ppSub/src/Makefile.am

@@ -1 +1 @@
 bin_PROGRAMS = ppSub
 ppSub_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PPSTATS_CFLAGS) $(PSPHOT_CFLAGS) $(PPSUB_CFLAGS)
-ppSub_LDFLAGS = $(PSLIB_LIBS) $(PSMODULE_LIBS) $(PPSTATS_LIBS) $(PSPHOT_LIBS) $(PPSUB_LIBS)
+ppSub_LDFLAGS  = $(PSLIB_LIBS)   $(PSMODULE_LIBS)   $(PPSTATS_LIBS)   $(PSPHOT_LIBS)   $(PPSUB_LIBS)
 
 ppSub_SOURCES =                 \

trunk/ppSub/src/ppSubLoop.c

@@ -8 +8 @@
 #include <psmodules.h>
 #include <ppStats.h>
+#include <psphot.h>
 
 #include "ppSub.h"
@@ -53 +54 @@
     }
 
+    bool doPhotom = false;
+    if (psMetadataLookup(config->arguments, "PSPHOT.PSF")) {
+        doPhotom = true;
+    }
+    
     pmFPAview *view = pmFPAviewAlloc(0); // Pointer into FPA hierarchy
     pmHDU *lastHDU = NULL;              // Last HDU that was updated
@@ -129 +135 @@
                 }
 
+                if (doPhotom) {
+                  if (!psphotReadout (config, view)) {
+                    psError(psErrorCodeLast(), false, "failure in psphotReadout for stacked image\n");
+                    return false;
+                  }
+                }
+
                 if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
                     return false;