Changeset 9943 for trunk/psModules/src/concepts/pmConceptsAverage.c

Timestamp:

Nov 9, 2006, 4:13:17 PM (20 years ago)

Author:

Paul Price

Message:

Adding XBIN and YBIN to list that gets checked.

File:

• trunk/psModules/src/concepts/pmConceptsAverage.c (modified) (3 diffs)

trunk/psModules/src/concepts/pmConceptsAverage.c

@@ -37 +37 @@
     psTimeType timeSys = 0;             // Time system
     int readdir      = 0;               // Cell read direction
+    int xBin = 0, yBin = 0;             // Binning
 
     int nCells = 0;                     // Number of cells;
@@ -56 +57 @@
             timeSys = psMetadataLookupS32(NULL, cell->concepts, "CELL.TIMESYS");
             readdir = psMetadataLookupS32(NULL, cell->concepts, "CELL.READDIR");
+            xBin    = psMetadataLookupS32(NULL, cell->concepts, "CELL.XBIN");
+            yBin    = psMetadataLookupS32(NULL, cell->concepts, "CELL.YBIN");
         } else {
             if (timeSys != psMetadataLookupS32(NULL, cell->concepts, "CELL.TIMESYS")) {
@@ -65 +68 @@
                 psLogMsg(__func__, PS_LOG_ERROR, "Differing cell read directions in use: %d vs %d\n", readdir,
                          psMetadataLookupS32(NULL, cell->concepts, "CELL.READDIR"));
+                success = false;
+            }
+            if (xBin != psMetadataLookupS32(NULL, cell->concepts, "CELL.XBIN")) {
+                psLogMsg(__func__, PS_LOG_ERROR, "Differing cell x binnings in use: %d vs %d\n", xBin,
+                         psMetadataLookupS32(NULL, cell->concepts, "CELL.XBIN"));
+                success = false;
+            }
+            if (yBin != psMetadataLookupS32(NULL, cell->concepts, "CELL.YBIN")) {
+                psLogMsg(__func__, PS_LOG_ERROR, "Differing cell y binnings in use: %d vs %d\n", yBin,
+                         psMetadataLookupS32(NULL, cell->concepts, "CELL.YBIN"));
                 success = false;
             }