Changeset 36878 for tags/ipp-pv3-cr-20140614

Timestamp:

Jun 16, 2014, 9:59:20 AM (12 years ago)

Author:

eugene

Message:

merge changes back from ipp-pv3-20140616: fix memory corruption when loading sources (PSF_CORE error)

Location:

tags/ipp-pv3-cr-20140614

Files:

• . (modified) (1 prop)
• ippScripts/scripts/queuestaticsky.pl (modified) (1 prop)
• ippconfig (modified) (1 prop)
• ippconfig/recipes/ppSub.config (modified) (1 prop)
• ippconfig/recipes/reductionClasses.mdc (modified) (1 prop)
• ppStack/src/ppStackLoop.c (modified) (4 diffs)
• ppStack/src/ppStackPrepare.c (modified) (3 diffs)
• ppStack/src/ppStackReadout.c (modified) (1 diff)
• psModules/src/objects/pmPSF_IO.c (modified) (1 diff)
• psModules/src/objects/pmSourceIO_CMF.c.in (modified) (1 diff)
• pstamp/scripts/pstamp_checkdependent.pl (modified) (1 prop)
• pstamp/scripts/pstamp_finish.pl (modified) (1 prop)
• pstamp/scripts/pstampparse.pl (modified) (1 prop)

tags/ipp-pv3-cr-20140614/ppStack/src/ppStackLoop.c

@@ -154 +154 @@
     }
     ppStackFileActivation(config,PPSTACK_FILES_BKG ,false);    
+
     // Photometry
     psTrace("ppStack", 1, "Photometering stacked image....\n");
@@ -169 +170 @@
         return false;
     }
+
     // Assemble Stats
     if (!ppStackStats(stack, options, config)) {
@@ -183 +185 @@
         return false;
     }
+
     //MEH -- also must uncomment back out..
     psFree(stack);
@@ -225 +228 @@
             return false;
         }
+
         // Clean up unconvolved stack
         psTrace("ppStack", 2, "Cleaning up after unconvolved stack....\n");

tags/ipp-pv3-cr-20140614/ppStack/src/ppStackPrepare.c

@@ -344 +344 @@
                clipFWHMnSig,maxFWHM,threshFWHM,asymmetryFWHM);
     }
+
     if (simpleClip) { // Do a sigma clip like the old rejection code.
       psStats *fwhmStats = psStatsAlloc(PS_STAT_CLIPPED_MEAN | PS_STAT_CLIPPED_STDEV);
@@ -426 +427 @@
       } // End mixture model case
     }
+
     // Perform rejection using the limit set
     for (int i = 0; i < num; i++) {
@@ -464 +466 @@
     // End old rejection sigma clip
 #endif
+
     // Generate target PSF
     if (options->convolve) {

tags/ipp-pv3-cr-20140614/ppStack/src/ppStackReadout.c

@@ -275 +275 @@
         //MEH -- apply bscale offset before norm   
         if (bscaleApplyOffset) {
-            psLogMsg("ppStack", PS_LOG_INFO, "bscaleApplyOffset: %d %f", i, bscaleApplyOffset->data.F32[i]);
+            psLogMsg("ppStack", PS_LOG_MINUTIA, "bscaleApplyOffset: %d %f", i, bscaleApplyOffset->data.F32[i]);
             psBinaryOp(ro->image, ro->image, "-", psScalarAlloc(bscaleApplyOffset->data.F32[i], PS_TYPE_F32));
         }

tags/ipp-pv3-cr-20140614/psModules/src/objects/pmPSF_IO.c

@@ -511 +511 @@
         psMetadataAddF32 (header, PS_LIST_TAIL, "SKY_BIAS", PS_DATA_F32, "sky bias level", psf->skyBias);
 
-        float PSF_APERTURE =  psMetadataLookupF32(&status, roAnalysis, "PSF_APERTURE");
-        if (status) {
+        if (roAnalysis) {
+          float PSF_APERTURE =  psMetadataLookupF32(&status, roAnalysis, "PSF_APERTURE");
+          if (status) {
             psMetadataAddF32 (header, PS_LIST_TAIL, "PSF_APERTURE", PS_DATA_F32, "aperture for psf objects", PSF_APERTURE);
-        }
-        float PSF_FIT_RADIUS =  psMetadataLookupF32(&status, roAnalysis, "PSF_FIT_RADIUS");
-        if (status) {
+          }
+          float PSF_FIT_RADIUS =  psMetadataLookupF32(&status, roAnalysis, "PSF_FIT_RADIUS");
+          if (status) {
             psMetadataAddF32 (header, PS_LIST_TAIL, "PSF_FIT_RADIUS", PS_DATA_F32, "aperture for psf objects", PSF_FIT_RADIUS);
+          }
         }
 

tags/ipp-pv3-cr-20140614/psModules/src/objects/pmSourceIO_CMF.c.in

@@ -358 +358 @@
         @ALL@     axes.theta        = axes.theta * PS_RAD_DEG;
         
-        @>PS1_V4,>PS1_SV2,>PS1_DV3@ if (model->params->n >= PM_PAR_7) {
+        @>PS1_V4,>PS1_SV2,>PS1_DV3@ if (model->params->n > PM_PAR_7) {
         @>PS1_V4,>PS1_SV2,>PS1_DV3@     PAR[PM_PAR_7] = psMetadataLookupF32 (&status, row, "PSF_CORE");
         @>PS1_V4,>PS1_SV2,>PS1_DV3@ }