Changeset 36375 for trunk/psphot/src/psphotStackReadout.c

Timestamp:

Dec 10, 2013, 2:55:11 PM (13 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20130904

Location:

trunk

Files:

• . (modified) (1 prop)
• psphot (modified) (1 prop)
• psphot/src (modified) (2 props)
• psphot/src/psphotStackReadout.c (modified) (3 diffs)

trunk/psphot/src

@@ -24 +24 @@
 psphotModelTest
 psphotMinimal
+psphotFullForce
+psmakecff

@@ -24 +24 @@
 psphotModelTest
 psphotMinimal
+psphotFullForce
+psmakecff

trunk/psphot/src/psphotStackReadout.c

@@ -124 +124 @@
         return psphotReadoutCleanup (config, view, STACK_RAW);
     }
-
-// XXX TEST for background:
-    if (!psphotModelBackground (config, view, STACK_RAW)) {
-        return psphotReadoutCleanup (config, view, STACK_RAW);
-    }
-    if (!psphotSubtractBackground (config, view, STACK_RAW)) {
-        return psphotReadoutCleanup (config, view, STACK_RAW);
-    }
-    if (!psphotModelBackground (config, view, STACK_RAW)) {
-        return psphotReadoutCleanup (config, view, STACK_RAW);
-    }
-    if (!psphotSubtractBackground (config, view, STACK_RAW)) {
-        return psphotReadoutCleanup (config, view, STACK_RAW);
-    }
-// XXX TEST END 
 
 #ifdef MAKE_CHISQ_IMAGE
@@ -319 +304 @@
     psphotStackObjectsUnifyPosition (objects);
 
-    psphotStackObjectsSelectForAnalysis (config, view, STACK_RAW, objects);
+    // psphotStackObjectsSelectForAnalysis (config, view, STACK_RAW, objects);
 
     // final linear fit. NOTE: if splitLinearFit is true above, this pass will only fit
@@ -346 +331 @@
     // measure kron fluxes for the matched sources only
     psphotKronIterate(config, view, STACK_RAW, 3);
+
+    // decide which source(s) are to be fitted with the extended source analysis code.
+    psphotChooseAnalysisOptionsByObject (config, view, STACK_RAW, objects);
 
     // measure elliptical apertures, petrosians (objects sorted by S/N)

@@ -24 +24 @@
 psphotModelTest
 psphotMinimal
+psphotFullForce
+psmakecff