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

Timestamp:

Oct 25, 2007, 1:05:14 PM (19 years ago)

Author:

Paul Price

Message:

Adding CELL.[XY]PARITY to list of concepts to 'average'.

File:

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

trunk/psModules/src/concepts/pmConceptsAverage.c

@@ -97 +97 @@
     int xBin = 0, yBin = 0;             // Binning
     int x0 = 0, y0 = 0;                 // Offset
+    int xParity = 0, yParity = 0;       // Parity
 
     int nCells = 0;                     // Number of cells;
@@ -121 +122 @@
             if (same) {
                 // Only makes sense to update these if they are the same cell
-                x0  = psMetadataLookupS32(NULL, cell->concepts, "CELL.X0");
-                y0  = psMetadataLookupS32(NULL, cell->concepts, "CELL.Y0");
+                x0 = psMetadataLookupS32(NULL, cell->concepts, "CELL.X0");
+                y0 = psMetadataLookupS32(NULL, cell->concepts, "CELL.Y0");
+                xParity = psMetadataLookupS32(NULL, cell->concepts, "CELL.XPARITY");
+                yParity = psMetadataLookupS32(NULL, cell->concepts, "CELL.YPARITY");
             }
         } else {
@@ -154 +157 @@
                     psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Differing CELL.Y0 in use: %d vs %d\n",
                             y0, psMetadataLookupS32(NULL, cell->concepts, "CELL.Y0"));
+                    success = false;
+                }
+                if (xParity != psMetadataLookupS32(NULL, cell->concepts, "CELL.XPARITY")) {
+                    psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Differing CELL.XPARITY in use: %d vs %d\n",
+                            xParity, psMetadataLookupS32(NULL, cell->concepts, "CELL.XPARITY"));
+                    success = false;
+                }
+                if (yParity != psMetadataLookupS32(NULL, cell->concepts, "CELL.YPARITY")) {
+                    psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Differing CELL.YPARITY in use: %d vs %d\n",
+                            yParity, psMetadataLookupS32(NULL, cell->concepts, "CELL.YPARITY"));
                     success = false;
                 }
@@ -189 +202 @@
         MD_UPDATE(target->concepts, "CELL.X0", S32, x0);
         MD_UPDATE(target->concepts, "CELL.Y0", S32, y0);
+        MD_UPDATE(target->concepts, "CELL.XPARITY", S32, xParity);
+        MD_UPDATE(target->concepts, "CELL.YPARITY", S32, yParity);
     }