Changeset 26136

Timestamp:

Nov 13, 2009, 5:03:05 AM (16 years ago)

Author:

eugene

Message:

remove clumps before passing to chip analysis steps

File:

• branches/eam_branches/20091113/psastro/src/psastroChipAstrom.c (modified) (3 diffs)

branches/eam_branches/20091113/psastro/src/psastroChipAstrom.c

@@ -56 +56 @@
 
                 // select the raw objects for this readout
-                psArray *rawstars = psMetadataLookupPtr (&status, readout->analysis, "PSASTRO.RAWSTARS");
-                if (rawstars == NULL) { continue; }
+                psArray *rawstarsAll = psMetadataLookupPtr (&status, readout->analysis, "PSASTRO.RAWSTARS");
+                if (rawstarsAll == NULL) { continue; }
+                psArray *rawstars = psastroRemoveClumpsIterate(rawstarsAll, 150, 3);
 
                 // select the raw objects for this readout
-                psArray *refstars = psMetadataLookupPtr (&status, readout->analysis, "PSASTRO.REFSTARS");
-                if (refstars == NULL) { continue; }
+                psArray *refstarsAll = psMetadataLookupPtr (&status, readout->analysis, "PSASTRO.REFSTARS");
+                if (refstarsAll == NULL) { continue; }
+                psArray *refstars = psastroRemoveClumpsIterate(refstarsAll, 150, 2);
 
                 // the absolute minimum number of stars is 4 (for order = 1)
                 if ((rawstars->n < 4) || (refstars->n < 4)) {
                     readout->data_exists = false;
-                    psLogMsg ("psastro", 3, "insufficient rawstars (%ld) or refstars (%ld)",
-                              rawstars->n, refstars->n);
+                    psLogMsg ("psastro", 3, "insufficient rawstars (%ld) or refstars (%ld)", rawstars->n, refstars->n);
+                    psFree (rawstars);
+                    psFree (refstars);
                     continue;
                 }
@@ -84 +87 @@
                     readout->data_exists = false;
                     psLogMsg ("psastro", 3, "failed to find a solution\n");
+                    psFree (rawstars);
+                    psFree (refstars);
                     continue;
                 }
@@ -90 +95 @@
                     readout->data_exists = false;
                     psLogMsg ("psastro", 3, "failed to find a solution\n");
+                    psFree (rawstars);
+                    psFree (refstars);
                     continue;
                 }
+
+                psFree (rawstars);
+                psFree (refstars);
 
                 numGoodRO++;