Changeset 35455 for trunk/ppStack/src

Timestamp:

Apr 30, 2013, 6:10:41 PM (13 years ago)

Author:

watersc1

Message:

Changes to stacking code:

• New input FWHM clipping algorithm using mixture models
• New recipes/reductions that further reduce FWHM clipping
• pmSubtractionRejectStamps now fits flux/chi^{2 values in log-log space to prevent outliers biasing the fit (and causing images to be rejected due to a small number of bad stamps)}
• pmPSF now correctly chooses between useReff forms as appropriate
• pmPSF change fixes circularization issues in pmReadoutFakeFromSources
• pmPSFEnvelope somewhat more clear about circularization
• Changed debugging in pmSubtractionEquation to add information.

I do not see any conflicts with the ppSub code.

Location:

trunk/ppStack/src

Files:

• ppStackConvolve.c (modified) (1 diff)
• ppStackMatch.c (modified) (1 diff)
• ppStackPrepare.c (modified) (3 diffs)

trunk/ppStack/src/ppStackConvolve.c

@@ -403 +403 @@
                     continue;
                 }
-                if ((options->matchChi2->data.F32[i] > thresh) || ! isfinite(options->matchChi2->data.F32[i])) {
+                if ((options->matchChi2->data.F32[i] > thresh) ||
+                    ! isfinite(options->matchChi2->data.F32[i])) {
                     numRej++;
                     options->inputMask->data.PS_TYPE_VECTOR_MASK_DATA[i] |= PPSTACK_MASK_CHI2;

trunk/ppStack/src/ppStackMatch.c

@@ -467 +467 @@
                 sum += kernels->rms;
                 num++;
+                //              psLogMsg("ppStack", PS_LOG_INFO, "KERNMATCHDUMP %d %d %g %g %g\n",
+                //                       index,num,kernels->mean,kernels->rms,sum);
             }
             psFree(iter);
             options->matchChi2->data.F32[index] = sum / (psImageCovarianceFactor(readout->covariance) * num);
+
         }
 

trunk/ppStack/src/ppStackPrepare.c

@@ -334 +334 @@
     //    fprintf(stderr,"means: %g %g\n",means->data.F32[0],means->data.F32[1]);
     //    fprintf(stderr,"sigma: %g %g \n",S->data.F32[0],S->data.F32[1]);
-
     //    fprintf(stderr,"pi:    %g %g\n",pi->data.F32[0],pi->data.F32[1]);
-    
-    //    unwrittenGMMfunction(options->inputSeeing, options->inputMask, 0xff,
-    //           &Punimodal,
-    //           &m1,&s1,&pi1,
-    //           &m2,&s2,&pi2);
 
     // Use Gaussian mixture model analysis of the FWHM distribution to decide an optional FWHM limit
@@ -358 +352 @@
     if (limit > maxFWHM)    { limit = maxFWHM; }    // We should not be larger than our max
     if (limit < threshFWHM) { limit = threshFWHM; } // Nor smaller than our min
-
+    psLogMsg("ppStack",PS_LOG_INFO,
+             "PSF FWHM distribution: limit: %f (%f %f %f) (%f %f %f) %f",
+             limit,means->data.F32[0],S->data.F32[0],pi->data.F32[0],
+             means->data.F32[1],S->data.F32[1],pi->data.F32[1],
+             Punimodal);
     for (int i = 0; i < num; i++) {
       if (options->inputSeeing->data.F32[i] > limit) {
@@ -404 +402 @@
     if (options->convolve) {
         options->psf = ppStackPSF(config, numCols, numRows, psfs, options);
-        psFree(psfs);
+        psFree(psfs);
         if (!options->psf) {
 #if 1