Changeset 36369

Timestamp:

Dec 10, 2013, 2:12:33 PM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130904

Files:

• Ohana (modified) (1 prop)
• Ohana/src/dvomerge (modified) (1 prop)
• Ohana/src/libohana/src (modified) (1 prop)
• Ohana/src/opihi (modified) (1 prop)
• Ohana/src/opihi/cmd.astro (modified) (1 prop)
• Ohana/src/opihi/cmd.data (modified) (1 prop)
• Ohana/src/relastro/src (modified) (1 prop)
• ppImage/src (modified) (1 prop)
• ppStack/src/ppStackLoop.c (modified) (2 diffs)
• ppStack/src/ppStackMatch.c (modified) (2 diffs)
• psLib/src/fits/psFits.c (modified) (1 diff)
• psLib/src/math/psMinimizePolyFit.c (modified) (1 prop)
• psLib/src/math/psMixtureModels.c (modified) (1 prop)
• psLib/src/math/psStats.c (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/objects/pmModelUtils.c (modified) (1 diff)
• psphot (modified) (1 prop)
• psphot/src (modified) (1 prop)
• psphot/src/psphotStackImageLoop.c (modified) (1 prop)
• psphot/src/psphotStackMatchPSFsUtils.c (modified) (1 diff)

branches/eam_branches/ipp-20130904/ppStack/src/ppStackLoop.c

@@ -87 +87 @@
         pmCellFreeData(options->cells->data[i]);
     }
-    //    psFree(stack);
+    //MEH -- must uncomment back out -- unclear is should be moved after pixel rejection
+    psFree(stack);
 
     // Pixel rejection
@@ -181 +182 @@
         return false;
     }
-    //    psFree(stack);
+    //MEH -- also must uncomment back out..
+    psFree(stack);
     psLogMsg("ppStack", PS_LOG_INFO, "Stage 7: Cleanup, WCS & JPEGS: %f sec", psTimerClear("PPSTACK_STEPS"));
     ppStackMemDump("cleanup");

branches/eam_branches/ipp-20130904/ppStack/src/ppStackMatch.c

@@ -6 +6 @@
 #define COVAR_FRAC 0.01                 // Truncation fraction for covariance matrix
 
-// #define TESTING                         // Enable debugging output
+// #define TESTING                      // Enable debugging output
 // #define TESTING_REUSE_CONV           // Enable debugging for re-using convolved outputs from previous run
-
 // #define TESTING_CZW 
 
@@ -156 +155 @@
     if (options->convolve) {
         pmReadout *conv = pmReadoutAlloc(NULL); // Conv readout, for holding results temporarily
+
+        // MEH -- earlier defn needed with new simple mode modifications to  use TESTING_REUSE_CONV...
+        //const char *typeStr = psMetadataLookupStr(NULL, ppsub, "KERNEL.TYPE"); // Kernel type
+        //pmSubtractionKernelsType type = pmSubtractionKernelsTypeFromString(typeStr); // Kernel type
+
 #ifdef TESTING_REUSE_CONV
         // This is a hack to use the temporary convolved images and kernel generated previously.

branches/eam_branches/ipp-20130904/psLib/src/fits/psFits.c

@@ -243 +243 @@
         (&fptr, name, iomode, &status);
         if (fptr == NULL || status != 0) {
-            psFitsDumpErrors(PS_ERR_IO, _("Could not open file,'%s'"), name);
+            // MEH -- if cfitsio error and have status, really want to know it as well and should be added where lacking elsewhere
+            psFitsDumpErrors(PS_ERR_IO, _("Could not open file,'%s %d'"), name,status);
             return NULL;
         }

branches/eam_branches/ipp-20130904/psModules/src/objects/pmModelUtils.c

@@ -198 +198 @@
 
     if (!isfinite(axes.major)) return false;
+    if (axes.major == 0) return false;
     if (!isfinite(axes.minor)) return false;
     if (!isfinite(axes.theta)) return false;

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

@@ -325 +325 @@
     if (deconv > deconvLimit) {
         rejectReadout = true;
-        psLogMsg("psphot", PS_LOG_WARN, "Maximum deconvolution fraction (%f) exceeds limit (%f) --- rejecting image for matched psf analysis%d\n", deconv, deconvLimit, index);
+        psLogMsg("psphot", PS_LOG_WARN, "Maximum deconvolution fraction (%f) exceeds limit (%f) --- rejecting input %d for matched psf analysis\n", deconv, deconvLimit, index);
     }