Changeset 26167 for branches/eam_branches/20091113/psastro/src/psastroChipAstrom.c

Timestamp:

Nov 16, 2009, 6:35:43 PM (17 years ago)

Author:

eugene

Message:

remove clumpfor raw and ref stars for entire run, save as SUBSET

File:

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

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

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