Changeset 36599

Timestamp:

Mar 19, 2014, 4:05:43 PM (12 years ago)

Author:

bills

Message:

in full force merge sources after running RoughClass

Location:

tags/ipp-20140114/psphot/src

Files:

• psphotFullForce.SourceStats.c (modified) (1 diff)
• psphotFullForceReadout.c (modified) (2 diffs)

tags/ipp-20140114/psphot/src/psphotFullForce.SourceStats.c

@@ -85 +85 @@
     psAssert (markVal, "missing MARK.PSPHOT");
 
-    psArray *sources = detections->allSources;
+    // psArray *sources = detections->allSources;
+    psArray *sources = detections->newSources ? detections->newSources : detections->allSources;
 
     // generate the array of sources, define the associated pixel

tags/ipp-20140114/psphot/src/psphotFullForceReadout.c

@@ -52 +52 @@
     psphotLoadExtSources (config, view, filerule);
 
+#ifdef notmoved
+    // XXX: moved down below
     // merge the newly selected sources into the existing list (detections->allSources)
     // NOTE: merge OLD and NEW
     psphotMergeSources (config, view, filerule);
+#endif
 
     // construct sources and measure moments and other basic stats (saved on detections->allSources)
@@ -63 +66 @@
         return psphotReadoutCleanup (config, view, filerule);
     }
+    
+    // classify sources based on moments, brightness.  if a PSF model has been loaded, the PSF
+    // clump defined for it is used not measured (detections->newSources)
+    if (!psphotRoughClass (config, view, filerule)) { // pass 1
+        psError (PSPHOT_ERR_UNKNOWN, false, "failed to determine rough classifications");
+        return psphotReadoutCleanup (config, view, filerule);
+    }
+
+    // merge the newly selected sources into the existing list (detections->allSources)
+    // NOTE: merge OLD and NEW
+    psphotMergeSources (config, view, filerule);
+
 
     // generate a psf model for any readouts which need one