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

Timestamp:

Mar 28, 2007, 1:45:31 PM (19 years ago)

Author:

Paul Price

Message:

Distinguishing between mosaicking (different cells within the same chip) and stacking (same cells within different chips) for concept averaging.

File:

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

trunk/psModules/src/concepts/pmConceptsAverage.c

@@ -22 +22 @@
 // Set a variety of concepts in a cell by averaging over several
 // XXX does not properly set XSIZE, YSIZE
-bool pmConceptsAverageCells(pmCell *target, psList *sources, psRegion *trimsec, psRegion *biassec)
+bool pmConceptsAverageCells(pmCell *target, psList *sources, psRegion *trimsec, psRegion *biassec, bool same)
 {
     PS_ASSERT_PTR_NON_NULL(target, false);
@@ -61 +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");
+
+            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");
+            }
         } else {
             if (timeSys != psMetadataLookupS32(NULL, cell->concepts, "CELL.TIMESYS")) {
@@ -84 +88 @@
                 success = false;
             }
-            if (x0 != psMetadataLookupS32(NULL, cell->concepts, "CELL.X0")) {
-                psError(PS_ERR_BAD_PARAMETER_VALUE, true, "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")) {
-                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 (same) {
+                if (x0 != psMetadataLookupS32(NULL, cell->concepts, "CELL.X0")) {
+                    psError(PS_ERR_BAD_PARAMETER_VALUE, true, "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")) {
+                    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;
+                }
             }
         }
@@ -123 +129 @@
     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);
+    if (same) {
+        MD_UPDATE(target->concepts, "CELL.X0", S32, x0);
+        MD_UPDATE(target->concepts, "CELL.Y0", S32, y0);
+    }
 
     // CELL.TIME needs special care