Changeset 12650

Timestamp:

Mar 28, 2007, 1:27:23 PM (19 years ago)

Author:

Paul Price

Message:

Average CELL.X0 and CELL.Y0 as well.

File:

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

trunk/psModules/src/concepts/pmConceptsAverage.c

@@ -39 +39 @@
     int readdir      = 0;               // Cell read direction
     int xBin = 0, yBin = 0;             // Binning
+    int x0 = 0, y0 = 0;                 // Offset
 
     int nCells = 0;                     // Number of cells;
@@ -60 +61 @@
             xBin    = psMetadataLookupS32(NULL, cell->concepts, "CELL.XBIN");
             yBin    = psMetadataLookupS32(NULL, cell->concepts, "CELL.YBIN");
+            x0      = psMetadataLookupS32(NULL, cell->concepts, "CELL.X0");
+            y0      = psMetadataLookupS32(NULL, cell->concepts, "CELL.Y0");
         } else {
             if (timeSys != psMetadataLookupS32(NULL, cell->concepts, "CELL.TIMESYS")) {
-                psLogMsg(__func__, PS_LOG_ERROR, "Differing time systems in use: %d vs %d\n", timeSys,
+                psLogMsg(__func__, PS_LOG_ERROR, "Differing CELL.TIMESYS in use: %d vs %d\n", timeSys,
                          psMetadataLookupS32(NULL, cell->concepts, "CELL.TIMESYS"));
                 success = false;
             }
             if (readdir != psMetadataLookupS32(NULL, cell->concepts, "CELL.READDIR")) {
-                psLogMsg(__func__, PS_LOG_ERROR, "Differing cell read directions in use: %d vs %d\n", readdir,
+                psLogMsg(__func__, PS_LOG_ERROR, "Differing CELL.READDIR 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,
+                psLogMsg(__func__, PS_LOG_ERROR, "Differing CELL.XBIN 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,
+                psLogMsg(__func__, PS_LOG_ERROR, "Differing CELL.YBIN in use: %d vs %d\n", yBin,
                          psMetadataLookupS32(NULL, cell->concepts, "CELL.YBIN"));
+                success = false;
+            }
+            if (x0 != psMetadataLookupS32(NULL, cell->concepts, "CELL.X0")) {
+                psLogMsg(__func__, PS_LOG_ERROR, "Differing CELL.X0 in use: %d vs %d\n", x0,
+                         psMetadataLookupS32(NULL, cell->concepts, "CELL.X0"));
+                success = false;
+            }
+            if (y0 != psMetadataLookupS32(NULL, cell->concepts, "CELL.Y0")) {
+                psLogMsg(__func__, PS_LOG_ERROR, "Differing CELL.Y0 in use: %d vs %d\n", y0,
+                         psMetadataLookupS32(NULL, cell->concepts, "CELL.Y0"));
                 success = false;
             }
@@ -110 +123 @@
     MD_UPDATE(target->concepts, "CELL.XBIN", S32, xBin);
     MD_UPDATE(target->concepts, "CELL.YBIN", S32, yBin);
+    MD_UPDATE(target->concepts, "CELL.X0", S32, x0);
+    MD_UPDATE(target->concepts, "CELL.Y0", S32, y0);
 
     // CELL.TIME needs special care