Changeset 30936

Timestamp:

Mar 16, 2011, 3:42:31 PM (15 years ago)

Author:

eugene

Message:

merge psphotImageLoop, psphotForcedImageLoop, and psphotMakePSFImageLoop

Location:

branches/eam_branches/ipp-20110213/psphot/src

Files:

• Makefile.am (modified) (3 diffs)
• psphot.c (modified) (2 diffs)
• psphot.h (modified) (3 diffs)
• psphotForced.c (modified) (2 diffs)
• psphotForcedImageLoop.c (modified) (5 diffs)
• psphotImageLoop.c (modified) (3 diffs)
• psphotMakePSF.c (modified) (1 diff)
• psphotStandAlone.h (modified) (1 diff)

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

@@ -69 +69 @@
         psphotForced.c             \
         psphotForcedArguments.c    \
-        psphotForcedImageLoop.c    \
-        psphotForcedReadout.c      \
         psphotParseCamera.c        \
+        psphotImageLoop.c          \
         psphotMosaicChip.c         \
         psphotCleanup.c
@@ -79 +78 @@
         psphotMakePSF.c            \
         psphotMakePSFArguments.c   \
-        psphotMakePSFImageLoop.c   \
-        psphotMakePSFReadout.c     \
         psphotParseCamera.c        \
+        psphotImageLoop.c   \
         psphotMosaicChip.c         \
         psphotCleanup.c
@@ -128 +126 @@
         psphotReadoutForcedKnownSources.c    \
         psphotReadoutMinimal.c         \
+        psphotForcedReadout.c          \
+        psphotMakePSFReadout.c         \
         psphotModelBackground.c        \
         psphotMaskBackground.c         \

branches/eam_branches/ipp-20110213/psphot/src/psphot.c

@@ -1 +1 @@
 # include "psphotStandAlone.h"
+# define FORCED_PHOTOMETRY 0
 
 int main (int argc, char **argv) {
@@ -20 +21 @@
 
     // call psphot for each readout
-    if (!psphotImageLoop (config)) {
+    if (!psphotImageLoop (config, PSPHOT_SINGLE)) {
         psErrorStackPrint(stderr, "Error in the psphot image loop\n");
         exit (psphotGetExitStatus());

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

@@ -14 +14 @@
 
 # define READOUT_OR_INTERNAL(VIEW,FILE)((FILE)->mode == PM_FPA_MODE_INTERNAL) ? (FILE)->readout : pmFPAviewThisReadout((VIEW), (FILE)->fpa)
+
+typedef enum {
+    PSPHOT_SINGLE,
+    PSPHOT_FORCED,
+    PSPHOT_MAKE_PSF,
+} psphotImageLoopMode;
 
 // top-level psphot functions
@@ -23 +29 @@
 bool            psphotVersionHeaderFull(psMetadata *header);
 void            psphotVersionPrint(void);
+
+bool            psphotImageLoop (pmConfig *config, psphotImageLoopMode mode);
 
 bool            psphotModelTest (pmConfig *config, const pmFPAview *view, psMetadata *recipe);
@@ -311 +319 @@
 
 pmConfig *psphotForcedArguments(int argc, char **argv);
-bool psphotForcedImageLoop (pmConfig *config);
 bool psphotForcedReadout(pmConfig *config, const pmFPAview *view, const char *filerule);
 
 pmConfig *psphotMakePSFArguments(int argc, char **argv);
-bool psphotMakePSFImageLoop (pmConfig *config);
 bool psphotMakePSFReadout(pmConfig *config, const pmFPAview *view, const char *filerule);
 

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

@@ -1 +1 @@
 # include "psphotStandAlone.h"
+# define FORCED_PHOTOMETRY 1
 
 int main (int argc, char **argv) {
@@ -20 +21 @@
 
     // call psphot for each readout
-    if (!psphotForcedImageLoop (config)) {
+    if (!psphotImageLoop (config, PSPHOT_FORCED)) {
         psErrorStackPrint(stderr, "Error in the psphot image loop\n");
         exit (psphotGetExitStatus());

branches/eam_branches/ipp-20110213/psphot/src/psphotForcedImageLoop.c

@@ -1 +1 @@
 # include "psphotStandAlone.h"
 
-# define ESCAPE(MESSAGE) { \
-  psError(PSPHOT_ERR_DATA, false, MESSAGE); \
-  psFree (view); \
-  return false; \
-}
+# define ESCAPE(MESSAGE) {                              \
+        psError(PSPHOT_ERR_DATA, false, MESSAGE);       \
+        psFree (view);                                  \
+        return false;                                   \
+    }
 
 bool psphotForcedImageLoop (pmConfig *config) {
@@ -31 +31 @@
     if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE)) ESCAPE ("failed input for fpa in psphot.");
 
+    // select the appropriate recipe information
+    psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, PSPHOT_RECIPE);
+    psAssert (recipe, "missing recipe?");
+
+    psImageMaskType maskTest = psMetadataLookupImageMask(&status, recipe, "MASK.PSPHOT");
+
     // for psphot, we force data to be read at the chip level
     while ((chip = pmFPAviewNextChip (view, load->fpa, 1)) != NULL) {
@@ -45 +51 @@
         // mosaic the cells of a chip into a single contiguous (trimmed) chip
         if (!psphotMosaicChip(config, view, "PSPHOT.INPUT", "PSPHOT.LOAD")) ESCAPE ("Unable to mosaic chip.");
+
+        // Read WCS if easy.
+        // XXX Since we're mosaicking cells, we ignore the case where the WCS is defined for a cell.
+        {
+            pmChip *inChip = pmFPAviewThisChip(view, input->fpa); // Mosaicked chip
+            pmHDU *hduLow = pmHDUGetLowest(input->fpa, inChip, NULL);
+            if (hduLow && !pmAstromReadWCS(input->fpa, inChip, hduLow->header, 1.0)) {
+                psWarning("Unable to read WCS astrometry from header.");
+                psErrorClear();
+                pmHDU *hduHigh = pmHDUGetHighest(input->fpa, inChip, NULL);
+                if (hduHigh && hduHigh != hduLow &&
+                    !pmAstromReadWCS(input->fpa, chip, hduHigh->header, 1.0)) {
+                    psWarning("Unable to read WCS astrometry from primary header.");
+                    psErrorClear();
+                }
+            }
+        }
 
         // try to load other supporting data (PSF, SRC, etc).
@@ -76 +99 @@
                 if (readout->mask) {
                     psImageMaskType maskSat = pmConfigMaskGet("SAT", config); // Mask value for saturated pixels
-                    if (!pmReadoutMaskNonfinite(readout, maskSat)) {
+                    if (!pmReadoutMaskInvalid(readout, maskTest, maskSat)) {
                         psError(psErrorCodeLast(), false, "Unable to mask non-finite pixels.");
                         psFree(view);
@@ -91 +114 @@
             }
 
+            // drop all versions of the internal files
             status = true;
             status &= pmFPAfileDropInternal (config->files, "PSPHOT.BACKMDL");

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

@@ -1 +1 @@
 # include "psphotStandAlone.h"
 
-# define ESCAPE(MESSAGE) { \
-  psError(PSPHOT_ERR_DATA, false, MESSAGE); \
-  psFree (view); \
-  return false; \
-}
+# define ESCAPE(MESSAGE) {                              \
+        psError(PSPHOT_ERR_DATA, false, MESSAGE);       \
+        psFree (view);                                  \
+        return false;                                   \
+    }
 
-bool psphotImageLoop (pmConfig *config) {
+bool psphotImageLoop (pmConfig *config, psphotImageLoopMode mode) {
 
     bool status;
@@ -90 +90 @@
 
                 // Update the header
-                {
-                    pmHDU *hdu = pmHDUGetHighest(input->fpa, chip, cell);
-                    if (hdu && hdu != lastHDU) {
-                        psphotVersionHeaderFull(hdu->header);
-                        lastHDU = hdu;
-                    }
+                pmHDU *hdu = pmHDUGetHighest(input->fpa, chip, cell);
+                if (hdu && hdu != lastHDU) {
+                    psphotVersionHeaderFull(hdu->header);
+                    lastHDU = hdu;
                 }
 
@@ -109 +107 @@
 
                 // run the actual photometry analysis on this chip/cell/readout
-                if (!psphotReadout (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;
-                }
+                switch (mode) {
+                  case PSPHOT_SINGLE:
+                    if (!psphotReadout (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")) {
+                        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_MAKE_PSF:
+                    if (!psphotMakePSFReadout (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;
+                }
             }
 

branches/eam_branches/ipp-20110213/psphot/src/psphotMakePSF.c

@@ -20 +20 @@
 
     // call psphot for each readout
-    if (!psphotMakePSFImageLoop (config)) {
+    if (!psphotImageLoop (config, PSPHOT_MAKE_PSF)) {
         psErrorStackPrint(stderr, "Error in the psphot image loop\n");
         exit (psphotGetExitStatus());

branches/eam_branches/ipp-20110213/psphot/src/psphotStandAlone.h

@@ -14 +14 @@
 pmConfig       *psphotArguments (int argc, char **argv);
 bool            psphotParseCamera (pmConfig *config);
-bool            psphotImageLoop (pmConfig *config);
 bool            psphotMosaicChip(pmConfig *config, const pmFPAview *view, char *outFile, char *inFile);
 void            psphotCleanup (pmConfig *config);