Changeset 26259 for trunk/psastro/src/psastroRemoveClumps.c

Timestamp:

Nov 22, 2009, 2:57:41 PM (16 years ago)

Author:

eugene

Message:

various fixes to psastro:

1) added bootstrap resampling to zero point error analysis
2) added iterative clump removal from refstars and rawstars
3) added unique reference match option
4) some improved visualizations
5) improved mosaic iterations

File:

• trunk/psastro/src/psastroRemoveClumps.c (modified) (1 diff)

trunk/psastro/src/psastroRemoveClumps.c

@@ -12 +12 @@
 
 # include "psastroInternal.h"
+
+bool psastroRemoveClumpsRawstars (pmConfig *config) {
+
+    bool status;
+
+    pmChip *chip = NULL;
+    pmCell *cell = NULL;
+    pmReadout *readout = NULL;
+
+    // select the current recipe
+    psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, PSASTRO_RECIPE);
+    if (!recipe) {
+        psError(PSASTRO_ERR_CONFIG, true, "Can't find PSASTRO recipe");
+        return false;
+    }
+
+    // select the input data sources
+    pmFPAfile *input = psMetadataLookupPtr (&status, config->files, "PSASTRO.INPUT");
+    if (!input) {
+        psError(PSASTRO_ERR_CONFIG, true, "Can't find input data");
+        return false;
+    }
+
+    pmFPAview *view = pmFPAviewAlloc (0);
+    pmFPA *fpa = input->fpa;
+
+    while ((chip = pmFPAviewNextChip (view, fpa, 1)) != NULL) {
+        psTrace ("psastro", 4, "Chip %d: %x %x\n", view->chip, chip->file_exists, chip->process);
+        if (!chip->process || !chip->file_exists) { continue; }
+
+        while ((cell = pmFPAviewNextCell (view, fpa, 1)) != NULL) {
+            psTrace ("psastro", 4, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
+            if (!cell->process || !cell->file_exists) { continue; }
+            if (!chip->fromFPA) { continue; }
+
+            // process each of the readouts
+            while ((readout = pmFPAviewNextReadout (view, fpa, 1)) != NULL) {
+                if (! readout->data_exists) { continue; }
+
+                // select the raw objects for this readout
+                psArray *rawstars = psMetadataLookupPtr (&status, readout->analysis, "PSASTRO.RAWSTARS");
+                if (rawstars == NULL) { continue; }
+
+                // generate a reduced subset excluding the clumps
+                // XXX do we need both RAWSTARS and SUBSET? 
+                // XXX put these parameters in the recipe, please
+                psArray *subset = psastroRemoveClumpsIterate(rawstars, 150, 3);
+                psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSASTRO.RAWSTARS.SUBSET", PS_DATA_ARRAY, "astrometry objects", subset);
+                psFree (subset);
+            }
+        }
+    }
+    psFree (view);
+    return true;
+}
+
+psArray *psastroRemoveClumpsIterate (psArray *input, int scale, int nIter) {
+
+    psArray *newset = psMemIncrRefCounter (input);
+    for (int i = 0; i < nIter; i++) {
+        psArray *subset = psastroRemoveClumps (newset, 150);
+        psFree (newset);
+        newset = subset;
+    }
+    return newset;
+}    
 
 /**