Changeset 35350 for branches/eam_branches/ipp-20130307/psModules/src/detrend/pmPattern.c

Timestamp:

Apr 2, 2013, 3:01:21 PM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130307

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/detrend/pmPattern.c (modified) (3 diffs)

branches/eam_branches/ipp-20130307/psModules/src/detrend/pmPattern.c

@@ -997 +997 @@
       pmChip *chip = out->fpa->chips->data[i];
       pmCell *cell = chip->cells->data[0]; // Cell of interest
-      pmReadout *ro = cell->readouts->data[0]; // Readout of interest
-
+
+      
       psStatsInit(bgStats);
 
@@ -1009 +1009 @@
       int y = chipName[3] - '0';
 
-      
+      if ((cell->readouts->n != 1)||(!chip->data_exists))  {
+        A->data.F64[y][x] = NAN;
+        B->data.F64[y][x] = NAN;
+        C->data.F64[y][x] = NAN;
+        D->data.F64[y][x] = NAN;
+        continue;
+      }
+      pmReadout *ro = cell->readouts->data[0]; // Readout of interest      
       for (int j = 0; j < 4; j++) {
         if (j == 0) {  // Region B
@@ -1284 +1291 @@
         pmChip *chip = out->fpa->chips->data[i];
         pmCell *cell = chip->cells->data[0]; // Cell of interest
+        if ((cell->readouts->n != 1)||(!chip->data_exists))  {
+          continue;
+        }
         pmReadout *ro = cell->readouts->data[0]; // Readout of interest
         const char *chipName = psMetadataLookupStr(NULL,chip->concepts, "CHIP.NAME");