Changeset 42370 for branches/eam_branches/ipp-20220316/psastro/src/psastroOneChipGrid.c

Timestamp:

Feb 4, 2023, 12:12:53 PM (3 years ago)

Author:

eugene

Message:

merge changes from trunk: handle inversion failures and missing DETEFF

Location:

branches/eam_branches/ipp-20220316/psastro

Files:

• . (modified) (1 prop)
• src/psastroOneChipGrid.c (modified) (6 diffs)

branches/eam_branches/ipp-20220316/psastro/src/psastroOneChipGrid.c

@@ -22 +22 @@
     bool status;
     pmAstromStats *stats = NULL;
+    char *chipname = psMetadataLookupStr (NULL, chip->concepts, "CHIP.NAME");
+
 
     // do we need to get a rough initial match?
@@ -49 +51 @@
     }
 
-    psLogMsg ("psastro", 3, "grid search using %ld raw vs %ld ref stars\n", rawGridStars->n, refGridStars->n);
+    psLogMsg ("psastro", 3, "grid search for chip %s using %ld raw vs %ld ref stars\n",chipname,rawGridStars->n, refGridStars->n);
 
     // find initial offset / rotation / scale
     pmAstromStats *gridStats = pmAstromGridMatch (rawGridStars, refGridStars, recipe);
     if (gridStats == NULL) {
-        psLogMsg ("psastro", 3, "failed to find a grid match solution\n");
+        psLogMsg ("psastro", 3, "failed to find a grid match solution for chip %s\n",chipname);
         psFree (rawGridStars);
         psFree (refGridStars);
@@ -60 +62 @@
         return false;
     }
-    psLogMsg ("psastro", 3, "basic grid search result - offset: %f,%f pixels, rotation: %f deg\n", gridStats->offset.x, gridStats->offset.y, DEG_RAD*gridStats->angle);
+    psLogMsg ("psastro", 3, "basic grid search result for chip %s - offset: %f,%f pixels, rotation: %f deg\n",chipname, gridStats->offset.x, gridStats->offset.y, DEG_RAD*gridStats->angle);
 
 # if (1) 
@@ -73 +75 @@
         return false;
     }
-    psLogMsg ("psastro", 3, "tweak grid search result - offset: %f,%f pixels, rotation: %f deg\n", stats->offset.x, stats->offset.y, DEG_RAD*stats->angle);
+    psLogMsg ("psastro", 3, "tweak grid search result for chip %s - offset: %f,%f pixels, rotation: %f deg\n",chipname, stats->offset.x, stats->offset.y, DEG_RAD*stats->angle);
 # else
     // EAM TEST: skip tweak
@@ -82 +84 @@
     // adjust the chip.toFPA terms only
     pmAstromGridApply (chip->toFPA, stats);
-    psastroUpdateChipToFPA (fpa, chip); // updates PSASTRO.RAWSTARS and PSASTRO.REFSTARS
+    psastroUpdateChipToFPA (fpa, chip); // updates PSASTRO.RAWSTARS and PSASTRO.REFSTARS (see note below)
     psFree (gridStats);
     psFree (rawGridStars);
@@ -90 +92 @@
     return true;
 }
+
+/* if psastroUpdateChiptoFPA fails to invert the toFPA transformation, 
+   the ref->chip coordinates will not be set.  This is not a problem
+   at this stage since they are not used in the calculation.  Later
+   passes can still yield a valid solution.
+*/