Changeset 42370

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/psastroAstromGuess.c (modified) (2 diffs)
• src/psastroConvert.c (modified) (5 diffs)
• src/psastroLoadCrosstalk.c (modified) (4 diffs)
• src/psastroMosaicOneChip.c (modified) (3 diffs)
• src/psastroOneChipFit.c (modified) (1 diff)
• src/psastroOneChipGrid.c (modified) (6 diffs)
• src/psastroUtils.c (modified) (2 diffs)

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

@@ -320 +320 @@
         if (!chip->process || !chip->file_exists || !chip->data_exists) { continue; }
 
-        if (!chip->toFPA || !chip->fromFPA) {
+        // if a chip fails during the calibration, the associated readout->data_exists
+        // gets set to false.  This may be the wrong solution, but it does not break this
+        // analysis here.  Note this is not the chip->data_exists field tested above.
+        // chip->data_exists is only false if the chip data is missing.
+
+        // chip->fromFPA can be NULL if the inversion fails, but I'm not sure
+        // chip->toFPA can be NULL unless it was not in the original model
+        if (!chip->toFPA) {
           char *name = psMetadataLookupStr (NULL, chip->concepts, "CHIP.NAME");
           fprintf (stderr, "no astrom model for %s, skipping\n", name);
           continue;
         }
-
-        // XXX we are currently inconsistent with marking the good vs the bad data
-        // psastroChipAstrom sets data_exists to false if the fit is bad.  this is
-        // probably wrong since it implies there is no data!
+        if (!chip->fromFPA) {
+          char *name = psMetadataLookupStr (NULL, chip->concepts, "CHIP.NAME");
+          fprintf (stderr, "inversion faiulre for %s (%d), will be skipped\n", name, view->chip);
+        }
 
         // skip chips for which the astrometry failed (NASTRO == 0)
@@ -350 +357 @@
         float astError = psMetadataLookupF32 (&status, updates, "CERROR");
         if (fabs(astError) < 1e-6) goto skip_chip;
+
+        // XXX EAM 2022.09.22 : a more robust analysis would put the corner points
+        // on the chip metadata so we can be certain the old and new corner values
+        // are correctly matched.
 
         psPlane ptCH, ptFP, ptTP;

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

@@ -18 +18 @@
 # define PHOT_SOURCE_MASK (PM_SOURCE_MODE_FAIL | PM_SOURCE_MODE_BLEND | PM_SOURCE_MODE_BADPSF | \
                            PM_SOURCE_MODE_DEFECT | PM_SOURCE_MODE_CR_LIMIT | PM_SOURCE_MODE_EXT_LIMIT | \
-                           PM_SOURCE_MODE_POOR) // Mask to apply to sources for rejection
+                           PM_SOURCE_MODE_POOR ) // Mask to apply to sources for rejection
 
 static psArray *chooseStars(psArray *inStars, char *listName, psArray *sources, psVector *index, int nMax, float iMagMin, float iMagMax, pmSourceMode skip);
@@ -193 +193 @@
     int nBrightSkip = 0;
     int nInfSkip = 0;
+    int nCTESkip = 0;
 
     for (int i = 0; (i < inStars->n) && (j < rawStars->n); i++) {
@@ -217 +218 @@
           continue;
         }
+        //Also kick out stars that touch the CTE region
+        if (source->mode2 & PM_SOURCE_MODE2_ON_CTE) {
+            nCTESkip ++;
+            continue;
+        }
+        
         mMin = PS_MIN (mMin, source->psfMag);
         mMax = PS_MAX (mMax, source->psfMag);
@@ -225 +232 @@
 
     psLogMsg ("psastro", 4, "loaded %ld %ssources, using %ld of %ld good sources (inst mag: %f to %f)\n", sources->n, listName, rawStars->n, inStars->n, mMin, mMax);
-    psLogMsg ("psastro", 4, "skip reasons: mode: %d, faint: %d, bright: %d, inf: %d\n", nModeSkip, nFaintSkip, nBrightSkip, nInfSkip);
+    psLogMsg ("psastro", 4, "skip reasons: mode: %d, faint: %d, bright: %d, inf: %d, CTE: %d\n", nModeSkip, nFaintSkip, nBrightSkip, nInfSkip,nCTESkip);
 
     return rawStars;
@@ -509 +516 @@
   float myPltScale = fabs(pltScale[chipID]);
 
+  psLogMsg ("psastro.correctKH", PS_LOG_INFO, "applying KH correction to %s (%d)\n", chipName, chipID);
+
   // apply the correction to the detections
   for (int i = 0; i < inStars->n; i++) {

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

@@ -370 +370 @@
           //-----------------------------------------------------------------
           //new style crostalk masking, with crosstalk rules from the recipes
-          if(!crossCheck) {
+          if (!crossCheck) {
             // load ghost model metadata structure
             psMetadata *crossModel = NULL;
@@ -386 +386 @@
 
             pmDetEff *de = psMetadataLookupPtr(NULL, readout->analysis, PM_DETEFF_ANALYSIS); // Detection efficiency
+            if (!de) continue; // chip has a problem if DETEFF is missing, just skip it
             if (isnan(de->magRef)) { continue; }
 
-            // find the CROSSTALK.RUKE this chip lands in (if any)
+            // find the CROSSTALK.RULE this chip lands in (if any)
             psListIterator *crossIter = psListIteratorAlloc(crossRules->data.list, PS_LIST_HEAD, false);
             psMetadataItem *crossItem = NULL;
@@ -528 +529 @@
                     //check again if the crosstalk is above the target chip background level
                     pmDetEff *tarde = psMetadataLookupPtr(NULL, targetReadout->analysis, PM_DETEFF_ANALYSIS); // Detection efficiency
+                    if (!tarde) continue;
                     if (isnan(tarde->magRef)) { continue; }
 
@@ -706 +708 @@
                     //check if the crosstalk is above the target chip background level
                     pmDetEff *tarde = psMetadataLookupPtr(NULL, targetReadout->analysis, PM_DETEFF_ANALYSIS); // Detection efficiency
+                    if (!tarde) continue; 
                     if (isnan(tarde->magRef)) { continue; }
 

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

@@ -148 +148 @@
     if (order == 1) { minNstar = PS_MAX ( 8, minNstar); }
 
+    // determine fromFPA transformation and apply new transformation to raw & ref stars
+    psastroUpdateChipToFPA (fpa, chip);
+
     bool validSolution = true;
 
@@ -162 +165 @@
     if (astNstar < minNstar) {
         psLogMsg("psastro", PS_LOG_INFO, "solution uses too few stars: %d < %d", astNstar, minNstar);
+        validSolution = false;
+    }
+    if (!chip->fromFPA) {
+        psLogMsg("psastro", PS_LOG_INFO, "toFPA/fromFPA inversion failure");
         validSolution = false;
     }
@@ -189 +196 @@
     psMetadataAddF32 (updates, PS_LIST_TAIL, "AST_MRY",   PS_META_REPLACE, "mosaic astrometry Y 10-90 percentile (arcsec)", results->dYrange * plateScale);
 
-    // determine fromFPA transformation and apply new transformation to raw & ref stars
-    psastroUpdateChipToFPA (fpa, chip);
-
-    //plot results
+    // plot results
     pmAstromVisualPlotMosaicOneChip(rawstars, refstars, match, recipe);
 

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

@@ -217 +217 @@
         validSolution = false;
     }
+    if (!chip->fromFPA) {
+        psLogMsg("psastro", PS_LOG_INFO, "toFPA/fromFPA inversion failure");
+        validSolution = false;
+    }
 
     // DVO expects NASTRO = 0 if we fail to find a solution

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.
+*/

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

@@ -109 +109 @@
 
     psRegion *region = pmChipPixels (chip);
-
     psFree (chip->fromFPA);
     chip->fromFPA = psPlaneTransformInvert (NULL, chip->toFPA, *region, 50, 4);
     psFree (region);
+
+    // XXX EAM 2022.09.22 : for a specific case, psPlaneTransformInvert fails.
+    // This probably means the solution was poor in any case.  
+    // Some options:
+    // 1) skip the chip in psastroAstromGuessCheck (supply bad corners)
+    // 2) mark this chip as bad (return an error here and trap in psastroMosaicOneChip)
+    // 3) warn of the failure:
+    if (!chip->fromFPA) {
+        char *name = psMetadataLookupStr (NULL, chip->concepts, "CHIP.NAME");
+        psLogMsg ("psastro", PS_LOG_INFO, "WARNING: failure to invert toFPA for %s", name);
+    }
 
     // loop over cells in this chip
@@ -150 +160 @@
                     pmAstromObj *ref = refstars->data[i];
                     psPlaneTransformApply (ref->chip, chip->fromFPA, ref->FP);
+                    // if chip->fromFPA is NULL (non-invertable), the action is skipped
                 }
             }