Changeset 21269 for branches/pap_branch_20090128/psModules/src/camera/pmHDUGenerate.c

Timestamp:

Feb 2, 2009, 2:37:06 PM (17 years ago)

Author:

Paul Price

Message:

Reverting to writing covariance matrices per chip/cell. This allows simple visualisation of the covariance matrix, and a simpler system for reading and writing them.

File:

• branches/pap_branch_20090128/psModules/src/camera/pmHDUGenerate.c (modified) (9 diffs)

branches/pap_branch_20090128/psModules/src/camera/pmHDUGenerate.c

@@ -356 +356 @@
     psElemType maskType = 0;            // Type of readout masks
     psElemType varianceType = 0;        // Type of readout variances
-    psElemType covarianceType = 0;      // Type of readout covariances
     {
         psListIterator *iter = psListIteratorAlloc(cells, PS_LIST_HEAD, false); // Iterator for cells
@@ -385 +384 @@
                     varianceType = checkTypes(varianceType, readout->variance->type.type);
                 }
-                if (!hdu->covariances && readout->covariance) {
-                    covarianceType = checkTypes(covarianceType, PS_TYPE_F32);
-                }
             }
         }
         psFree(iter);
     }
-    if (numReadouts == 0 || (imageType == 0 && maskType == 0 && varianceType == 0 && covarianceType == 0)) {
+    if (numReadouts == 0 || (imageType == 0 && maskType == 0 && varianceType == 0)) {
         // Nothing from which to create an HDU
         psFree(cells);
@@ -432 +428 @@
             hdu->variances->data[i] = variance;
         }
-    }
-    if (covarianceType) {
-        hdu->covariances = psHashAlloc(psListLength(cells));
     }
 
@@ -456 +449 @@
             psArray *readouts = cell->readouts; // Array of readouts
 
-            // Check size of covariances
-            int xMinCovar = INT_MAX, xMaxCovar = INT_MIN, yMinCovar = INT_MAX, yMaxCovar = INT_MIN; // Size
-            if (covarianceType) {
-                for (int i = 0; i < readouts->n; i++) {
-                    pmReadout *readout = readouts->data[i]; // The readout of interest
-                    if (!readout) {
-                        continue;
-                    }
-                    psKernel *covar = readout->covariance; // Covariance matrix
-                    xMinCovar = PS_MIN(xMinCovar, covar->xMin);
-                    xMaxCovar = PS_MAX(xMaxCovar, covar->xMax);
-                    yMinCovar = PS_MIN(yMinCovar, covar->yMin);
-                    yMaxCovar = PS_MAX(yMaxCovar, covar->yMax);
-                }
-            }
-
             psArray *hduImages = hdu->images; // Array of images in the HDU
             psArray *hduMasks = hdu->masks; // Array of masks in the HDU
             psArray *hduVariances = hdu->variances; // Array of variances in the HDU
-            psArray *covariances = (covarianceType ? psArrayAlloc(readouts->n) : NULL; // Covariance images
             for (int i = 0; i < readouts->n; i++) {
                 pmReadout *readout = readouts->data[i]; // The readout of interest
@@ -496 +472 @@
                     psFree(readout->variance);
                     readout->variance = new;
-                }
-                if (readout->covariance) {
-                    psKernel *covar = readout->covariance; // Covariance matrix
-                    int xMin = covar->xMin, xMax = covar->xMax, yMin = covar->yMin, yMax = covar->yMax;// Size
-                    if (xMin == xMinCovar && xMax == xMaxCovar && yMin == yMinCovar && yMax == yMaxCovar) {
-                        variances->data[i] = psMemIncrRefCounter(readout->covariance);
-                    } else {
-                        psKernel *new = psKernelAlloc(xMinCovar, xMaxCovar, yMinCovar, yMaxCovar);// New covar
-                        psImageInit(covar->image, 0);
-                        psImageOverlaySection(new->image, covar->image,
-                                              xMinCovar - xMin, yMinCovar - yMin, "=");
-                        variances->data[i] = new;
-                    }
                 }
 
@@ -533 +496 @@
             }
             psFree(biassecsIter);
-
-            if (covariances) {
-                const char *cellName = psMetadataLookupStr(NULL, cell->concepts, "CELL.NAME"); // Name of cell
-                pmChip *chip = cell->parent; // Parent chip
-                const char *chipName = psMetadataLookupStr(NULL, chip->concepts, "CHIP.NAME"); // Name of chip
-                if (!cellName || !chipName) {
-                    psError(PS_ERR_UNKNOWN, false, "Unable to find cell or chip name.");
-                    return false;
-                }
-                psString name = NULL; // Name for covariance extension
-                psStringAppend(&name, "COVAR_%s_%s", chipName, cellName);
-                if (psHashLookup(hdu->covariances, name)) {
-                    psHashRemove(hash, name);
-                }
-                psHashAdd(hdu->covariances, name, covariance);
-                psFree(name);
-            }
         } // Iterating over cells within the HDU
         psFree(iter);
@@ -636 +582 @@
         return false;
     }
-    if (hdu->images && hdu->masks && hdu->variances && hdu->covariances) {
+    if (hdu->images && hdu->masks && hdu->variances) {
         // It's already here!
         return true;
@@ -686 +632 @@
         return generateForCells(chip);
     }
-    if (hdu->images && hdu->masks && hdu->variances && hdu->covariances) {
+    if (hdu->images && hdu->masks && hdu->variances) {
         // It's already here!
         return true;
@@ -735 +681 @@
         return generateForChips(fpa);
     }
-    if (hdu->images && hdu->masks && hdu->variances && hdu->covariances) {
+    if (hdu->images && hdu->masks && hdu->variances) {
         // It's already here!
         return true;