Changeset 38552 for branches/eam_branches/ipp-20150616/psphot/src/psphotStackReadout.c

Timestamp:

Jun 25, 2015, 10:05:06 PM (11 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20150616

Files:

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

branches/eam_branches/ipp-20150616/psphot/src/psphotStackReadout.c

@@ -35 +35 @@
         psphotSaveImage (NULL, readout->mask, line);
     }
+    // psphotSaveImage leaves an error on the stack
+    psErrorClear();
     return true;
 }
@@ -348 +350 @@
     // XXX NOTE : if we use the pre-20130914 psphotStackReadout code, we need to use 'false' for the
     // sourcesSubtracted argument
-    psArray *objectsOut = psphotSourceChildrenByObject (config, view, STACK_OUT, objects, true);
+
+    // do this here so that the variance image is available to reset the models
+    psphotStackMatchPSFsetup (config, view, STACK_OUT, STACK_RAW);
+    psArray *objectsOut = psphotSourceChildrenByObject (config, view, STACK_OUT, STACK_RAW, objects, true);
     if (!objectsOut) {
         psFree(objects);
@@ -364 +369 @@
 
         // set up the FWHM vector
-        psphotStackMatchPSFsetup (config, view, STACK_OUT, STACK_RAW);
         psphotDumpImages (config, view, STACK_RAW, "raw.t0");
         psphotDumpImages (config, view, STACK_OUT, "out.t0");