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

Timestamp:

Feb 5, 2009, 4:31:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging pap_branch_20090128. Resolved a small number of conflicts. Compiles, but not tested in detail.

File:

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

trunk/psModules/src/camera/pmFPA.c

@@ -32 +32 @@
     psFree(readout->image);
     psFree(readout->mask);
-    psFree(readout->weight);
+    psFree(readout->variance);
+    psFree(readout->covariance);
     psFree(readout->analysis);
     psFree(readout->bias);
@@ -163 +164 @@
     psFree(readout->image);
     psFree(readout->mask);
-    psFree(readout->weight);
+    psFree(readout->variance);
+    psFree(readout->covariance);
     psFree(readout->bias);
 
@@ -169 +171 @@
 
     readout->image = NULL;
-    readout->weight = NULL;
+    readout->variance = NULL;
+    readout->covariance = NULL;
     readout->mask = NULL;
 
@@ -179 +182 @@
     readout->thisImageScan = 0;
     readout->thisMaskScan = 0;
-    readout->thisWeightScan = 0;
+    readout->thisVarianceScan = 0;
 
     readout->lastImageScan = 0;
     readout->lastMaskScan = 0;
-    readout->lastWeightScan = 0;
+    readout->lastVarianceScan = 0;
 }
 
@@ -197 +200 @@
     if (cell->hdu) {
         psFree(cell->hdu->images);
-        psFree(cell->hdu->weights);
+        psFree(cell->hdu->variances);
         psFree(cell->hdu->masks);
         // psFree(cell->hdu->header);
 
         cell->hdu->images = NULL;
-        cell->hdu->weights = NULL;
+        cell->hdu->variances = NULL;
         cell->hdu->masks = NULL;
         // cell->hdu->header = NULL;
@@ -219 +222 @@
     if (chip->hdu) {
         psFree(chip->hdu->images);
-        psFree(chip->hdu->weights);
+        psFree(chip->hdu->variances);
         psFree(chip->hdu->masks);
         // psFree(chip->hdu->header);
 
         chip->hdu->images = NULL;
-        chip->hdu->weights = NULL;
+        chip->hdu->variances = NULL;
         chip->hdu->masks = NULL;
         // chip->hdu->header = NULL;
@@ -241 +244 @@
     if (fpa->hdu) {
         psFree(fpa->hdu->images);
-        psFree(fpa->hdu->weights);
+        psFree(fpa->hdu->variances);
         psFree(fpa->hdu->masks);
         // psFree(fpa->hdu->header);
 
         fpa->hdu->images = NULL;
-        fpa->hdu->weights = NULL;
+        fpa->hdu->variances = NULL;
         fpa->hdu->masks = NULL;
         // fpa->hdu->header = NULL;
@@ -259 +262 @@
     tmpReadout->image = NULL;
     tmpReadout->mask = NULL;
-    tmpReadout->weight = NULL;
+    tmpReadout->variance = NULL;
+    tmpReadout->covariance = NULL;
     tmpReadout->bias = psListAlloc(NULL);
     tmpReadout->analysis = psMetadataAlloc();
@@ -276 +280 @@
     tmpReadout->thisImageScan = 0;
     tmpReadout->thisMaskScan = 0;
-    tmpReadout->thisWeightScan = 0;
+    tmpReadout->thisVarianceScan = 0;
 
     tmpReadout->lastImageScan = 0;
     tmpReadout->lastMaskScan = 0;
-    tmpReadout->lastWeightScan = 0;
+    tmpReadout->lastVarianceScan = 0;
 
     tmpReadout->forceScan = false;