Changeset 34041 for branches/meh_branches/ppstack_test/ppStack/src/ppStackSources.c

Timestamp:

Jun 19, 2012, 5:24:19 PM (14 years ago)

Author:

mhuber

Message:

merging latest r34040 trunk changes to branch

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• ppStack/src/ppStackSources.c (modified) (4 diffs)

branches/meh_branches/ppstack_test/ppStack/src/ppStackSources.c

@@ -9 +9 @@
 //#define FAKE_COLS 4861
 //#define FAKE_ROWS 4913
+// MEH - new warp sizes and simtests used -- will just make smaller output sample images and needs to be 1k for simstest
+//#define FAKE_COLS 6400
+//#define FAKE_ROWS 6400
 #define FAKE_COLS 1000
 #define FAKE_ROWS 1000
@@ -170 +173 @@
         pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PPSTACK.INPUT", i); // File of interest
 
-//MEH 0->1
-#if defined(TESTING) && 1
+//MEH 0->1 -- remember this is manually set to size FAKE_COLS/ROWS and may not overlap on edges
+//MEH - breaks if move SourcesTrans before target psf section in ppStackPrepare.. move to ppStackMatch 
+//      since silly if not conv?
+#if defined(TESTING) && 0
         pmReadout *fake = pmReadoutAlloc(NULL); // Fake readout
         pmPSF *psf = psMetadataLookupPtr(NULL, config->arguments, "PSF.TARGET"); // PSF for fake image
@@ -184 +189 @@
         psFitsClose(fits);
         psFree(fake);
+        //MEH - should also free psf..
+        psFree(psf);
 #endif
 
@@ -477 +484 @@
 
         // XXX something of a hack: require at least 2 detections or the nominated fraction of the max possible
-        int minMatches = PS_MAX(2, fracMatch * num);// Minimum number of matches required
+        //int minMatches = PS_MAX(2, fracMatch * num);// Minimum number of matches required
+        //MEH - if many poor images will hit oddity with num fraction, use numGoodImages? does it change another threshold?
+        int minMatches = PS_MAX(2, fracMatch * numGoodImages);// Minimum number of matches required
         for (int i = 0; i < matches->n; i++) {
             pmSourceMatch *match = matches->data[i]; // Match of interest
+            //MEH
+            psLogMsg("ppStack", PS_LOG_INFO, "TESTING:sources: i:%d %ld %d %f %d", i,matches->n,num,fracMatch,match->num);
             if (match->num < minMatches) {
                 continue;