Changeset 36146

Timestamp:

Sep 23, 2013, 12:57:22 PM (13 years ago)

Author:

eugene

Message:

creating new psphot version "psphotFullForce"

Location:

branches/eam_branches/ipp-20130904/psphot/src

Files:

• psphot.h (modified) (1 diff)
• psphotFullForce.c (added)
• psphotFullForceArguments.c (added)
• psphotFullForceImageLoop.c (added)
• psphotFullForceReadout.c (added)
• psphotGalaxyShape.c (added)
• psphotImageLoop.c (modified) (1 diff)
• psphotKronFlux.c (added)
• psphotLoadPSF.c (modified) (2 diffs)
• psphotMergeSources.c (modified) (1 diff)
• psphotPetroFlux.c (added)

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

@@ -18 +18 @@
     PSPHOT_SINGLE,
     PSPHOT_FORCED,
+    PSPHOT_FULL_FORCE,
     PSPHOT_MAKE_PSF,
     PSPHOT_MODEL_TEST,

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

@@ -132 +132 @@
                     }
                     break;
+                  case PSPHOT_FULL_FORCE:
+                    if (!psphotFullForceReadout (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")) {

branches/eam_branches/ipp-20130904/psphot/src/psphotLoadPSF.c

@@ -1 +1 @@
 # include "psphotInternal.h"
+
+// PSPHOT.PSF.LOAD vs input file -- see note at top
+bool psphotLoadPSF (pmConfig *config, const pmFPAview *view, const char *filerule) {
+
+    int num = psphotFileruleCount(config, filerule);
+
+    // loop over the available readouts
+    for (int i = 0; i < num; i++) {
+
+        // Generate the mask and weight images, including the user-defined analysis region of interest
+        if (!psphotLoadPSFReadout (config, view, filerule, "PSPHOT.PSF.LOAD", i)) {
+            psError (PSPHOT_ERR_CONFIG, false, "failed to load PSF model for PSPHOT.PSF.LOAD entry %d", i);
+            return false;
+        }
+    }
+    return true;
+}
 
 // NOTE : pmPSF_IO.c functions must load the psf model onto the chip->analysis metadata because
@@ -58 +75 @@
     return true;
 }
-
-// PSPHOT.PSF.LOAD vs input file -- see note at top
-bool psphotLoadPSF (pmConfig *config, const pmFPAview *view, const char *filerule) {
-
-    int num = psphotFileruleCount(config, filerule);
-
-    // loop over the available readouts
-    for (int i = 0; i < num; i++) {
-
-        // Generate the mask and weight images, including the user-defined analysis region of interest
-        if (!psphotLoadPSFReadout (config, view, filerule, "PSPHOT.PSF.LOAD", i)) {
-            psError (PSPHOT_ERR_CONFIG, false, "failed to load PSF model for PSPHOT.PSF.LOAD entry %d", i);
-            return false;
-        }
-    }
-    return true;
-}

branches/eam_branches/ipp-20130904/psphot/src/psphotMergeSources.c

@@ -65 +65 @@
 // Merge the externally supplied sources with the existing sources.  Mark them as having mode
 // PM_SOURCE_MODE_EXTERNAL.
+
+// XXX this function needs to be updated slightly for psphotFullForce:
+// * load the additional parameters to guide the new concepts
 
 // XXX This function needs to be updated to loop over set of input files.  At the moment, we