Changeset 18218

Timestamp:

Jun 19, 2008, 4:55:29 PM (18 years ago)

Author:

eugene

Message:

do not error on bad background values

File:

• trunk/ppMerge/src/ppMergeScaleZero.c (modified) (2 diffs)

trunk/ppMerge/src/ppMergeScaleZero.c

@@ -97 +97 @@
                       float gain = psMetadataLookupF32(NULL, cell->concepts, "CELL.GAIN"); // Cell gain
                       if (!isfinite(gain)) {
-                          psError(PS_ERR_BAD_PARAMETER_VALUE, false,
-                                  "CELL.GAIN for file %d chip %d cell %d is not set.",
-                                  i, view->chip, view->cell);
-                          goto ERROR;
+                        // psError(PS_ERR_BAD_PARAMETER_VALUE, false,
+                        // "CELL.GAIN for file %d chip %d cell %d is not set.",
+                        // i, view->chip, view->cell);
+                        // goto ERROR;
+                        psWarning ("CELL.GAIN for file %d chip %d cell %d is NaN", i, view->chip, view->cell);
                       }
                       gains->data.F32[cellNum] = gain;
@@ -106 +107 @@
                       // Measure the background
                       if (!psImageBackground(stats, NULL, readout->image, readout->mask, maskVal, rng)) {
-                          psError(PS_ERR_UNKNOWN, false,
-                                  "Unable to get statistics for file %d chip %d cell %d",
-                                  i, view->chip, view->cell);
-                          goto ERROR;
-                      }
-                      background->data.F32[i][cellNum] = psStatsGetValue(stats, meanStat);
+                        // psError(PS_ERR_UNKNOWN, false,
+                        // "Unable to get statistics for file %d chip %d cell %d",
+                        // i, view->chip, view->cell);
+                        // goto ERROR;
+                        psWarning ("Unable to get statistics for file %d chip %d cell %d", i, view->chip, view->cell);
+                        background->data.F32[i][cellNum] = NAN;
+                      } else {
+                        background->data.F32[i][cellNum] = psStatsGetValue(stats, meanStat);
+                      }
                       break;
                   }