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

Timestamp:

Feb 24, 2020, 4:01:13 PM (6 years ago)

Author:

eugene

Message:

adding recipe values PSASTRO.REFSTAR.CLUMP.NITER, PSASTRO.REFSTAR.CLUMP.SCALE (defaulting to 150, 3 as previously defined); adding log messages to track timing; adding chip-only iteration-depended fitting order; chip-only fitting needs to use bilevel astrometry if the toTPA transformation has order > 1

File:

• trunk/psastro/src/psastroRemoveClumps.c (modified) (4 diffs)

trunk/psastro/src/psastroRemoveClumps.c

@@ -35 +35 @@
     }
 
+    int nIter = psMetadataLookupS32 (&status, recipe, "PSASTRO.REFSTAR.CLUMP.NITER");
+    if (!status) nIter = 3;
+
+    psF32 clumpScale = psMetadataLookupS32 (&status, recipe, "PSASTRO.REFSTAR.CLUMP.SCALE");
+    if (!status) clumpScale = 150;
+
     pmFPAview *view = pmFPAviewAlloc (0);
     pmFPA *fpa = input->fpa;
@@ -58 +64 @@
                 // XXX do we need both RAWSTARS and SUBSET? 
                 // XXX put these parameters in the recipe, please
-                psArray *subset = psastroRemoveClumpsIterate(rawstars, 150, 3);
+                psArray *subset = psastroRemoveClumpsIterate(rawstars, clumpScale, nIter);
                 psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSASTRO.RAWSTARS.SUBSET", PS_DATA_ARRAY, "astrometry objects", subset);
                 psFree (subset);
@@ -65 +71 @@
                 if ((gridstars == rawstars) || (gridstars == NULL)) { continue; }
 
-                psArray *gridstars_subset = psastroRemoveClumpsIterate(gridstars, 150, 3);
+                psArray *gridstars_subset = psastroRemoveClumpsIterate(gridstars, clumpScale, nIter);
                 psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSASTRO.GRID.RAWSTARS.SUBSET", PS_DATA_ARRAY, "astrometry objects", gridstars_subset);
                 psFree (gridstars_subset);
@@ -79 +85 @@
     psArray *newset = psMemIncrRefCounter (input);
     for (int i = 0; i < nIter; i++) {
-        psArray *subset = psastroRemoveClumps (newset, 150);
+        psArray *subset = psastroRemoveClumps (newset, scale);
         psFree (newset);
         newset = subset;