Changeset 7851

Timestamp:

Jul 7, 2006, 7:35:59 PM (20 years ago)

Author:

Paul Price

Message:

pmConceptsAverageCells shouldn't have to set the binning, offsets.

Location:

trunk/psModules/src

Files:

• camera/pmFPAMosaic.c (modified) (2 diffs)
• concepts/pmConceptsAverage.c (modified) (3 diffs)
• concepts/pmConceptsAverage.h (modified) (1 diff)
• imcombine/pmReadoutCombine.c (modified) (2 diffs)

trunk/psModules/src/camera/pmFPAMosaic.c

@@ -995 +995 @@
     // Set the concepts for the target cell
     psList *sourceCells = psArrayToList(source->cells); // List of cells
-    pmConceptsAverageCells(targetCell, sourceCells, xBin, yBin, chipRegion, NULL);
+    pmConceptsAverageCells(targetCell, sourceCells, chipRegion, NULL);
+    {
+        psMetadataItem *item = psMetadataLookup(targetCell->concepts, "CELL.X0");
+        item->data.S32 = 0;
+        item = psMetadataLookup(targetCell->concepts, "CELL.Y0");
+        item->data.S32 = 0;
+        item = psMetadataLookup(targetCell->concepts, "CELL.XBIN");
+        item->data.S32 = xBin;
+        item = psMetadataLookup(targetCell->concepts, "CELL.YBIN");
+        item->data.S32 = yBin;
+    }
+
     psFree(sourceCells);
     psFree(chipRegion);
@@ -1101 +1112 @@
         }
     }
-    pmConceptsAverageCells(targetCell, sourceCells, xBin, yBin, fpaRegion, NULL);
+    pmConceptsAverageCells(targetCell, sourceCells, fpaRegion, NULL);
+    {
+        psMetadataItem *item = psMetadataLookup(targetCell->concepts, "CELL.X0");
+        item->data.S32 = 0;
+        item = psMetadataLookup(targetCell->concepts, "CELL.Y0");
+        item->data.S32 = 0;
+        item = psMetadataLookup(targetCell->concepts, "CELL.XBIN");
+        item->data.S32 = xBin;
+        item = psMetadataLookup(targetCell->concepts, "CELL.YBIN");
+        item->data.S32 = yBin;
+    }
     psFree(sourceCells);
     psFree(fpaRegion);

trunk/psModules/src/concepts/pmConceptsAverage.c

@@ -19 +19 @@
 bool pmConceptsAverageCells(pmCell *target,// Target cell
                             psList *sources, // List of source cells
-                            int xBin, int yBin, // Binning in x and y
                             psRegion *trimsec, // The trim section
                             psRegion *biassec // The bias section
@@ -27 +26 @@
     PS_ASSERT_PTR_NON_NULL(sources, false);
     PS_ASSERT_INT_POSITIVE(sources->n, false);
-    PS_ASSERT_INT_NONNEGATIVE(xBin, false);
-    PS_ASSERT_INT_NONNEGATIVE(yBin, false);
 
     bool success = true;                // Result of setting everything
@@ -96 +93 @@
     MD_UPDATE(target->concepts, "CELL.DARKTIME", F32, darktime);
     MD_UPDATE(target->concepts, "CELL.TIMESYS", S32, timeSys);
-    MD_UPDATE(target->concepts, "CELL.X0", S32, 0);
-    MD_UPDATE(target->concepts, "CELL.Y0", S32, 0);
-    if (xBin > 0) {
-        MD_UPDATE(target->concepts, "CELL.XBIN", S32, xBin);
-    }
-    if (yBin > 0) {
-        MD_UPDATE(target->concepts, "CELL.YBIN", S32, yBin);
-    }
     MD_UPDATE(target->concepts, "CELL.READDIR", S32, readdir);
 

trunk/psModules/src/concepts/pmConceptsAverage.h

@@ -8 +8 @@
 bool pmConceptsAverageCells(pmCell *target,// Target cell
                             psList *sources, // List of source cells
-                            int xBin, int yBin, // Binning in x and y
                             psRegion *trimsec, // The trim section
                             psRegion *biassec // The bias section

trunk/psModules/src/imcombine/pmReadoutCombine.c

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-07-08 05:21:12 $
+ *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-07-08 05:35:59 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -405 +405 @@
         psListAdd(inputCells, PS_LIST_TAIL, readout->parent);
     }
-    pmConceptsAverageCells(output->parent, inputCells, 0, 0, NULL, NULL);
+    pmConceptsAverageCells(output->parent, inputCells, NULL, NULL);
     psFree(inputCells);