Changeset 13374

Timestamp:

May 14, 2007, 3:55:17 AM (19 years ago)

Author:

rhl

Message:

Added argument to psphotRoughClass to indicate that the PSF clump's already known

Location:

trunk/psphot/src

Files:

• psphot.h (modified) (1 diff)
• psphotReadout.c (modified) (2 diffs)
• psphotRoughClass.c (modified) (2 diffs)

trunk/psphot/src/psphot.h

@@ -33 +33 @@
                                 const psMetadata *recipe, psArray *footprints);
 psArray        *psphotSourceStats (pmReadout *readout, psMetadata *recipe, psArray *allpeaks);
-bool            psphotRoughClass (psArray *sources, psMetadata *recipe);
+bool            psphotRoughClass (psArray *sources, psMetadata *recipe, const bool findPsfClump);
 bool            psphotBasicDeblend (psArray *sources, psMetadata *recipe);
 pmPSF          *psphotChoosePSF (pmReadout *readout, psArray *sources, psMetadata *recipe);

trunk/psphot/src/psphotReadout.c

@@ -104 +104 @@
 
     // classify sources based on moments, brightness
-    if (!psphotRoughClass (sources, recipe)) {
+    if (!psphotRoughClass (sources, recipe, true)) {
         psLogMsg ("psphot", 3, "failed to find a valid PSF clump for image");
         return psphotReadoutCleanup (config, readout, recipe, NULL, sources);
@@ -201 +201 @@
 
     // set source type
-    psphotRoughClass (newSources, recipe);
+    psphotRoughClass (newSources, recipe, false);
 
     // create full input models

trunk/psphot/src/psphotRoughClass.c

@@ -2 +2 @@
 
 // 2006.02.02 : no leaks
-bool psphotRoughClass (psArray *sources, psMetadata *recipe) {
+bool psphotRoughClass (psArray *sources, psMetadata *recipe, const bool findPsfClump) {
 
-    pmPSFClump   psfClump;
+    static pmPSFClump   psfClump;
+    static bool havePsfClump = false;
 
     psTimerStart ("psphot");
 
-    psfClump = pmSourcePSFClump (sources, recipe);
+    if (findPsfClump) {
+        psfClump = pmSourcePSFClump (sources, recipe);
+    } else if (!havePsfClump) {
+        psError(PSPHOT_ERR_PROG, false, "You must find the PSF clump before reusing it");
+    } else {
+        ;
+    }
+    
+    havePsfClump = false;               // we don't know if it's valid
     if (psfClump.X < 0) {
         psError(PSPHOT_ERR_PROG, false, "programming error calling pmSourcePSFClump");
@@ -31 +40 @@
     psLogMsg ("psphot.roughclass", PS_LOG_INFO, "rough classification: %f sec\n", psTimerMark ("psphot"));
 
+    havePsfClump = true;                        // we have set psfClump
+    
     return true;
 }