Changeset 6080 for branches/eam_rel9_p0/psModules/src/detrend/pmFlatField.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/detrend/pmFlatField.c (modified) (5 diffs)

branches/eam_rel9_p0/psModules/src/detrend/pmFlatField.c

@@ -24 +24 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.4.8.1.2.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-01-20 06:01:02 $
+ *  @version $Revision: 1.4.8.1.2.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-01-20 09:47:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -53 +53 @@
     psElemType flatType;
     psElemType maskType;
-    psImage *inImage = NULL;
-    psImage *inMask = NULL;
-    psImage *flatImage = NULL;
-
 
     // Check for nulls
@@ -67 +63 @@
     }
 
-    // Get the TRIMSEC of each image
-    {
-        psRegion *trimsec = psMetadataLookupPtr(NULL, in->parent->concepts, "CELL.TRIMSEC");
-        inImage = psImageSubset(in->image, *trimsec);
-        trimsec = psMetadataLookupPtr(NULL, flat->parent->concepts, "CELL.TRIMSEC");
-        flatImage = psImageSubset(flat->image, *trimsec);
-    }
+    psImage *inImage   = in->image;     // Input image
+    psImage *inMask    = in->mask;      // Mask for input image
+    psImage *flatImage = flat->image;   // Flat-field image
+
+    // Offsets on the chip
+    int x0in = psMetadataLookupS32(NULL, in->parent->concepts, "CELL.X0");
+    int y0in = psMetadataLookupS32(NULL, in->parent->concepts, "CELL.Y0");
+    int x0flat = psMetadataLookupS32(NULL, flat->parent->concepts, "CELL.X0");
+    int y0flat = psMetadataLookupS32(NULL, flat->parent->concepts, "CELL.Y0");
 
     if (inImage == NULL) {
@@ -84 +82 @@
         return false;
     }
-    inMask = in->mask;
 
     // Check input image and its mask are not larger than flat image
@@ -102 +99 @@
 
     // Determine total offset based on image offset with chip offset
-    totOffCol = inImage->col0 + in->col0;
-    totOffRow = inImage->row0 + in->row0;
+    totOffCol = inImage->col0 + y0in - flatImage->col0 - y0flat;
+    totOffRow = inImage->row0 + x0in - flatImage->row0 - x0flat;
 
     // Check that offsets are within image limits