Changeset 30936 for branches/eam_branches/ipp-20110213/psphot/src/psphotImageLoop.c

Timestamp:

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

Author:

eugene

Message:

merge psphotImageLoop, psphotForcedImageLoop, and psphotMakePSFImageLoop

File:

• branches/eam_branches/ipp-20110213/psphot/src/psphotImageLoop.c (modified) (3 diffs)

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;
+                }
             }