Changeset 23594 for branches/cnb_branches/cnb_branch_20090301/psModules/src/imcombine/pmSubtractionIO.c

Timestamp:

Mar 29, 2009, 6:15:31 PM (17 years ago)

Author:

beaumont

Message:

merged with head

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/imcombine/pmSubtractionIO.c (modified) (3 diffs)

branches/cnb_branches/cnb_branch_20090301/psModules/src/imcombine/pmSubtractionIO.c

@@ -4 +4 @@
 
 #include "pmHDU.h"
+#include "pmHDUUtils.h"
 #include "pmFPA.h"
 #include "pmFPAview.h"
@@ -143 +144 @@
     psMetadata *header = psMetadataAlloc(); // Header for FITS file
 
+    pmCell *cell = ro->parent;          // Cell of interest
+    if (cell) {
+        pmChip *chip = cell->parent;    // Chip of interest
+        pmFPA *fpa = chip->parent;      // FPA of interest
+        pmHDU *hdu = pmHDUGetHighest(fpa, chip, cell); // HDU for readout
+        if (hdu) {
+            header = psMetadataCopy(header, hdu->header);
+        }
+    }
+
     // CVS tags, used to identify the version of this file (in case incompatibilities are introduced)
     psString cvsFile = psStringCopy("$RCSfile: pmSubtractionIO.c,v $");
@@ -533 +544 @@
         return true;
     }
-    if (file->fileLevel != PM_FPA_LEVEL_FPA) {
-        return true;
-    }
-    if (file->fpa->chips->n == 1) {
-        return true;
-    }
 
     // find the FPA phu