Changeset 28078

Timestamp:

May 23, 2010, 11:43:01 AM (16 years ago)

Author:

eugene

Message:

free pmHDU elements when freeing pmFPA/Chip/etc data (is this the right solution?)

File:

• branches/eam_branches/psModules.20100523/src/camera/pmFPA.c (modified) (4 diffs)

branches/eam_branches/psModules.20100523/src/camera/pmFPA.c

@@ -10 +10 @@
 
 #include "pmHDU.h"
+#include "pmHDUUtils.h"
 #include "pmFPA.h"
 #include "pmFPALevel.h"
@@ -198 +199 @@
         pmReadoutFreeData(cell->readouts->data[i]);
     }
-    if (cell->hdu) {
-        psFree(cell->hdu->images);
-        psFree(cell->hdu->variances);
-        psFree(cell->hdu->masks);
-        // psFree(cell->hdu->header);
-
-        cell->hdu->images = NULL;
-        cell->hdu->variances = NULL;
-        cell->hdu->masks = NULL;
-        // cell->hdu->header = NULL;
-    }
+    pmHDU *hdu = pmHDUFromCell(cell);
+    if (hdu) {
+        psFree(hdu->images);
+        psFree(hdu->variances);
+        psFree(hdu->masks);
+    }      
+
+    // if (cell->hdu) {
+    //     psFree(cell->hdu->images);
+    //     psFree(cell->hdu->variances);
+    //     psFree(cell->hdu->masks);
+    //     // psFree(cell->hdu->header);
+    // 
+    //     cell->hdu->images = NULL;
+    //     cell->hdu->variances = NULL;
+    //     cell->hdu->masks = NULL;
+    //     // cell->hdu->header = NULL;
+    // }
 }
 
@@ -220 +228 @@
         pmCellFreeData(chip->cells->data[i]);
     }
-    if (chip->hdu) {
-        psFree(chip->hdu->images);
-        psFree(chip->hdu->variances);
-        psFree(chip->hdu->masks);
-        // psFree(chip->hdu->header);
-
-        chip->hdu->images = NULL;
-        chip->hdu->variances = NULL;
-        chip->hdu->masks = NULL;
-        // chip->hdu->header = NULL;
-    }
+    pmHDU *hdu = pmHDUFromChip(chip);
+    if (hdu) {
+        psFree(hdu->images);
+        psFree(hdu->variances);
+        psFree(hdu->masks);
+    }      
+
+    // if (chip->hdu) {
+    //     psFree(chip->hdu->images);
+    //     psFree(chip->hdu->variances);
+    //     psFree(chip->hdu->masks);
+    //     // psFree(chip->hdu->header);
+    // 
+    //     chip->hdu->images = NULL;
+    //     chip->hdu->variances = NULL;
+    //     chip->hdu->masks = NULL;
+    //     // chip->hdu->header = NULL;
+    // }
 }
 
@@ -242 +257 @@
         pmChipFreeData(fpa->chips->data[i]);
     }
-    if (fpa->hdu) {
-        psFree(fpa->hdu->images);
-        psFree(fpa->hdu->variances);
-        psFree(fpa->hdu->masks);
-        // psFree(fpa->hdu->header);
-
-        fpa->hdu->images = NULL;
-        fpa->hdu->variances = NULL;
-        fpa->hdu->masks = NULL;
-        // fpa->hdu->header = NULL;
-    }
+    pmHDU *hdu = pmHDUFromFPA(fpa);
+    if (hdu) {
+        psFree(hdu->images);
+        psFree(hdu->variances);
+        psFree(hdu->masks);
+    }      
+
+    // if (fpa->hdu) {
+    //     psFree(fpa->hdu->images);
+    //     psFree(fpa->hdu->variances);
+    //     psFree(fpa->hdu->masks);
+    //     // psFree(fpa->hdu->header);
+    // 
+    //     fpa->hdu->images = NULL;
+    //     fpa->hdu->variances = NULL;
+    //     fpa->hdu->masks = NULL;
+    //     // fpa->hdu->header = NULL;
+    // }
 }