Changeset 35400

Timestamp:

Apr 15, 2013, 5:01:13 PM (13 years ago)

Author:

watersc1

Message:

Add option to switch back to old rejection code. Disabled testing define statement in mixture model code.

Location:

trunk

Files:

• ppStack/src/ppStackPrepare.c (modified) (6 diffs)
• psLib/src/math/psMixtureModels.c (modified) (1 diff)

trunk/ppStack/src/ppStackPrepare.c

@@ -1 +1 @@
 # include "ppStack.h"
+
+
+// Option to use the old FWHM rejection code.
+# define NEW_REJECTION
+// #define OLD_REJECTION
+
 
 # define RE_PHOTOMETER 0
@@ -293 +299 @@
             psLogMsg("ppStack", PS_LOG_INFO, "PSF FWHM for image %d is too large (%f vs %f maxFWHM) --- rejected.", i, options->inputSeeing->data.F32[i], maxFWHM);
         }
+        // End old rejection fixed limit.
 #endif
         psStringAppend(&log, "Input %d: %f\n", i, options->inputSeeing->data.F32[i]);
@@ -301 +308 @@
     psFree(log);
 
+#ifdef NEW_REJECTION
     // Do GMM test with two modes to decide where to put the break.
     double Punimodal;
@@ -324 +332 @@
       return(false);
     }
-    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]);
+    //    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,
@@ -364 +372 @@
     psFree(pi);
     psFree(P);
+    // End new rejection code
+#endif
     
 #ifdef OLD_REJECTION
@@ -389 +399 @@
         }
     }
+    // End old rejection sigma clip
 #endif
     // Generate target PSF

trunk/psLib/src/math/psMixtureModels.c

@@ -42 +42 @@
 
 
-#define TESTING
+// #define TESTING
 /////////////////////////////////////////////////////////////////////////////////
 // Internal functions                                                          //