Changeset 7630 for trunk/psModules/src/camera/pmFPA.c

Timestamp:

Jun 22, 2006, 10:03:50 AM (20 years ago)

Author:

magnier

Message:

added pmReadoutFreeData, freeing bias sections

File:

• trunk/psModules/src/camera/pmFPA.c (modified) (4 diffs)

trunk/psModules/src/camera/pmFPA.c

@@ -12 +12 @@
 * XXX: Should we implement non-linear cell->chip transforms?
 *
-*  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-06-21 03:21:16 $
+*  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-06-22 20:03:50 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -177 +177 @@
 }
 
+void pmReadoutFreeData (pmReadout *readout)
+{
+    psFree(readout->image);
+    psFree(readout->mask);
+    psFree(readout->weight);
+    psFree(readout->bias);
+
+    readout->image = NULL;
+    readout->weight = NULL;
+    readout->mask = NULL;
+    readout->bias = NULL;
+}
+
 void pmCellFreeData(pmCell *cell)
 {
     PS_ASSERT_PTR_NON_NULL(cell,);
 
-    pmCellFreeReadouts(cell);
+    for (int i = 0; i < cell->readouts->n; i++) {
+        pmReadoutFreeData(cell->readouts->data[i]);
+    }
     if (cell->hdu) {
         psFree(cell->hdu->images);
+        psFree(cell->hdu->weights);
+        psFree(cell->hdu->masks);
+        // psFree(cell->hdu->header);
+
         cell->hdu->images = NULL;
+        cell->hdu->weights = NULL;
+        cell->hdu->masks = NULL;
+        // cell->hdu->header = NULL;
     }
 }
@@ -197 +219 @@
     if (chip->hdu) {
         psFree(chip->hdu->images);
+        psFree(chip->hdu->weights);
+        psFree(chip->hdu->masks);
+        // psFree(chip->hdu->header);
+
         chip->hdu->images = NULL;
+        chip->hdu->weights = NULL;
+        chip->hdu->masks = NULL;
+        // chip->hdu->header = NULL;
     }
 }
@@ -210 +239 @@
     if (fpa->hdu) {
         psFree(fpa->hdu->images);
+        psFree(fpa->hdu->weights);
+        psFree(fpa->hdu->masks);
+        // psFree(fpa->hdu->header);
+
         fpa->hdu->images = NULL;
+        fpa->hdu->weights = NULL;
+        fpa->hdu->masks = NULL;
+        // fpa->hdu->header = NULL;
     }
 }