Changeset 28013 for trunk/psphot/src/psphotMakePSFReadout.c

Timestamp:

May 18, 2010, 4:11:53 PM (16 years ago)

Author:

eugene

Message:

merge changes from branches/eam_branches/psphot,psModules.20100506 (finish basic psphotStack)

Location:

trunk/psphot

Files:

• . (modified) (1 prop)
• src/psphotMakePSFReadout.c (modified) (3 diffs)

trunk/psphot/src/psphotMakePSFReadout.c

@@ -19 +19 @@
 
     // set the photcode for this image
-    if (!psphotAddPhotcode (config, view)) {
+    if (!psphotAddPhotcode (config, view, "PSPHOT.INPUT")) {
         psError (PSPHOT_ERR_CONFIG, false, "trouble defining the photcode");
         return false;
@@ -29 +29 @@
 
     // Generate the mask and weight images, including the user-defined analysis region of interest
-    psphotSetMaskAndVariance (config, view);
+    psphotSetMaskAndVariance (config, view, "PSPHOT.INPUT");
     if (!strcasecmp (breakPt, "NOTHING")) {
-        return psphotReadoutCleanup(config, view);
+        return psphotReadoutCleanup (config, view, "PSPHOT.INPUT");
     }
 
     // generate a background model (median, smoothed image)
-    if (!psphotModelBackground (config, view)) {
-        return psphotReadoutCleanup (config, view);
+    if (!psphotModelBackground (config, view, "PSPHOT.INPUT")) {
+        return psphotReadoutCleanup (config, view, "PSPHOT.INPUT");
     }
-    if (!psphotSubtractBackground (config, view)) {
-        return psphotReadoutCleanup (config, view);
+    if (!psphotSubtractBackground (config, view, "PSPHOT.INPUT")) {
+        return psphotReadoutCleanup (config, view, "PSPHOT.INPUT");
     }
     if (!strcasecmp (breakPt, "BACKMDL")) {
-        return psphotReadoutCleanup (config, view);
+        return psphotReadoutCleanup (config, view, "PSPHOT.INPUT");
     }
 
-    psphotLoadExtSources (config, view);
+    psphotLoadExtSources (config, view, "PSPHOT.INPUT");
 
     // If sources have been supplied, then these should be used to measure the PSF include
@@ -53 +53 @@
     // a text file have no valid SN values, but psphotChoosePSF needs to select the top
     // PSF_MAX_NSTARS to generate the PSF.
-    if (!psphotCheckExtSources (config, view)) {
+    if (!psphotCheckExtSources (config, view, "PSPHOT.INPUT")) {
         psLogMsg ("psphot", 3, "failure to select possible PSF sources (external or internal)");
-        return psphotReadoutCleanup (config, view);
+        return psphotReadoutCleanup (config, view, "PSPHOT.INPUT");
     }
 
     // Use bright stellar objects to measure PSF. If we do not have enough stars to generate
     // the PSF, build one from the SEEING guess and model class
-    if (!psphotChoosePSF (config, view)) {
+    if (!psphotChoosePSF (config, view, "PSPHOT.INPUT")) {
         psLogMsg ("psphot", 3, "failure to construct a psf model");
-        return psphotReadoutCleanup (config, view);
+        return psphotReadoutCleanup (config, view, "PSPHOT.INPUT");
     }
 
     // measure aperture photometry corrections
 # if 0
-    if (!psphotApResid (config, view)) {
+    if (!psphotApResid (config, view, "PSPHOT.INPUT")) {
         psLogMsg ("psphot", 3, "failed on psphotApResid");
-        return psphotReadoutCleanup (config, view);
+        return psphotReadoutCleanup (config, view, "PSPHOT.INPUT");
     }
 # endif
 
-    return psphotReadoutCleanup (config, view);
+    return psphotReadoutCleanup (config, view, "PSPHOT.INPUT");
 }