Changeset 42370 for branches/eam_branches/ipp-20220316/psastro/src/psastroLoadCrosstalk.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/psastroLoadCrosstalk.c (modified) (4 diffs)

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; }