Changeset 6080 for branches/eam_rel9_p0/psModules/src/imsubtract/pmSubtractBias.c

Timestamp:

Jan 19, 2006, 11:47:06 PM (21 years ago)

Author:

Paul Price

Message:

Readouts now contain a subimage

File:

• branches/eam_rel9_p0/psModules/src/imsubtract/pmSubtractBias.c (modified) (5 diffs)

branches/eam_rel9_p0/psModules/src/imsubtract/pmSubtractBias.c

@@ -11 +11 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.6.8.1.2.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-01-20 06:03:29 $
+ *  @version $Revision: 1.6.8.1.2.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-01-20 09:47:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -102 +102 @@
     assert(sub);
 
-    // Get the trim sections
-    psRegion *inTrimsec = psMetadataLookupPtr(NULL, in->parent->concepts, "CELL.TRIMSEC");
-    psRegion *subTrimsec = psMetadataLookupPtr(NULL, sub->parent->concepts, "CELL.TRIMSEC");
-    psImage *inImage = psImageSubset(in->image, *inTrimsec); // The input image
-    psImage *subImage = psImageSubset(sub->image, *subTrimsec); // The image to be subtracted
-    psImage *inMask = in->mask ? psImageSubset(in->mask, *inTrimsec) : NULL; // The input mask
-    psImage *subMask = sub->mask ? psImageSubset(sub->mask, *subTrimsec) : NULL; // The input mask
+    psImage *inImage  = in->image;      // The input image
+    psImage *inMask   = in->mask;       // The input mask
+    psImage *subImage = sub->image;     // The image to be subtracted
+    psImage *subMask  = sub->mask;      // The mask for the subtraction image
 
     // Offsets of the cells
@@ -425 +422 @@
     PS_ASSERT_READOUT_TYPE(in, PS_TYPE_F32, NULL);
 
-    pmCell *cell = in->parent;      // The parent cell
-    psRegion *trimsec = psMetadataLookupPtr(NULL, cell->concepts, "CELL.TRIMSEC"); // The trim region
-    psImage *image = psImageSubset(in->image, *trimsec); // The image corresponding to the trim region
+    psImage *image = in->image;         // The input image
 
     // Overscan processing
@@ -438 +433 @@
         }
 
-        // Get the list of overscans
-        psList *overscanRegions = psMetadataLookupPtr(NULL, cell->concepts, "CELL.BIASSEC");
-        psList *overscans = psListAlloc(NULL); // List of the overscan images
-        psListIterator *iter = psListIteratorAlloc(overscanRegions, PS_LIST_HEAD, false); // Iterator
-        psRegion *biassec = NULL;       // A BIASSEC region from the list
-        while ((biassec = psListGetAndIncrement(iter))) {
-            psImage *overscan = psImageSubset(in->image, *biassec);
-            psListAdd(overscans, PS_LIST_TAIL, overscan);
-            psFree(overscan);
-        }
-        psFree(iter);
+        psList *overscans = in->bias; // List of the overscan images
 
         psStats *myStats = psStatsAlloc(PS_STAT_SAMPLE_MEAN); // A new psStats, to avoid clobbering original
@@ -482 +467 @@
 
             // We do the regular overscan subtraction
-            bool readRows = psMetadataLookupBool(NULL, cell->concepts, "CELL.READDIR"); // Read direction
+
+            bool readRows = psMetadataLookupBool(NULL, in->parent->concepts, "CELL.READDIR");// Read direction
 
             if (readRows) {