Changeset 41285 for trunk/psastro/src/psastroOneChipFit.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/psastroOneChipFit.c (modified) (4 diffs)

trunk/psastro/src/psastroOneChipFit.c

@@ -36 +36 @@
 
     // select the desired chip order
-    REQUIRED_RECIPE_VALUE (int order, "PSASTRO.CHIP.ORDER", S32);
+    REQUIRED_RECIPE_VALUE (int defaultOrder, "PSASTRO.CHIP.ORDER", S32);
 
     // allowed limits for valid solutions
@@ -57 +57 @@
         }
 
+        sprintf (name, "PSASTRO.ONE.CHIP.ORDER.N%d", iter);
+        int order = psMetadataLookupS32 (&status, recipe, name);
+        if (!status) {
+            order = defaultOrder;
+        }
 
         // use small radius to match stars
@@ -76 +81 @@
             match = unique;
         }
+
+        // XXX check if we correctly applied the new transformation:
+        if (psTraceGetLevel("psastro.dump") > 0) {
+          char *filename = NULL;
+          char *chipname = psMetadataLookupStr (&status, chip->concepts, "CHIP.NAME");
+          psStringAppend (&filename, "match.pref.%s.%d.dat", chipname, iter);
+          psastroDumpMatchedStars (filename, rawstars, refstars, match);
+          psFree (filename);
+          filename = NULL;
+        }
+
 
         // modify the order to correspond to the actual number of matched stars:
@@ -137 +153 @@
         psastroUpdateChipToFPA (fpa, chip); // updates PSASTRO.RAWSTARS and PSASTRO.REFSTARS
 
+        // XXX check if we correctly applied the new transformation:
+        if (psTraceGetLevel("psastro.dump") > 0) {
+          char *filename = NULL;
+          char *chipname = psMetadataLookupStr (&status, chip->concepts, "CHIP.NAME");
+          psStringAppend (&filename, "match.post.%s.%d.dat", chipname, iter);
+          psastroDumpMatchedStars (filename, rawstars, refstars, match);
+          psFree (filename);
+          filename = NULL;
+        }
+
         // toSky converts from FPA & TPA units (microns) to sky units (radians)
         float plateScale = 0.5*(fpa->toSky->Xs + fpa->toSky->Ys)*3600.0*PM_DEG_RAD;