Changeset 35527 for branches/eam_branches/ipp-20130419/pswarp/src/pswarpUpdateStatistics.c

Timestamp:

May 7, 2013, 12:01:01 PM (13 years ago)

Author:

eugene

Message:

pswarp can now take an input.mdc file with multiple input images listed to generate a warp for a collection

File:

• branches/eam_branches/ipp-20130419/pswarp/src/pswarpUpdateStatistics.c (modified) (3 diffs)

branches/eam_branches/ipp-20130419/pswarp/src/pswarpUpdateStatistics.c

@@ -15 +15 @@
 // for each readout
 bool pswarpUpdateStatistics (pmFPA *output, psMetadata *fpaStats, pmFPA *input, pmFPA *astrom, pmConfig *config)  {
+
+    if (!fpaStats) {
+        psLogMsg("pswarp", PS_LOG_INFO, "stats not requested, skipping");
+        return true;
+    }
 
     // load the recipe
@@ -95 +100 @@
                 }
 
-                // Set covariance matrix for output
-                // XXX is this the right place for the covariance calculation?
-# if (0)
-                psList *covariances = psMetadataLookupPtr(&mdok, output->analysis, PSWARP_ANALYSIS_COVARIANCES); // Covariance matrices
-                psAssert(covariances, "Should be there");
-                psArray *covars = psListToArray(covariances); // Array of covariance matrices
-                psKernel *covar = psImageCovarianceAverage(covars);
-                psFree(covars);
-                psMetadataRemoveKey(output->analysis, PSWARP_ANALYSIS_COVARIANCES);
-
-                // Correct covariance matrix scale for the mean (square root of the) Jacobian
-                double jacobian = psMetadataLookupF64(NULL, output->analysis, PSWARP_ANALYSIS_JACOBIAN); // Jacobian
-                int goodPixels = psMetadataLookupS32(NULL, output->analysis, PSWARP_ANALYSIS_GOODPIX);   // Good pixels
-                jacobian /= goodPixels;
-                output->covariance = psImageCovarianceScale(covar, jacobian);
-                psFree(covar);
-
-                if (output->variance) {
-                  psImageCovarianceTransfer(output->variance, output->covariance);
-                }
-# endif
-
-                {
-                  // Add MD5 information for readout
-                  psString headerName = NULL; ///< Header name for MD5
-                  psVector *md5 = psImageMD5(readout->image); ///< md5 hash
-                  psString md5string = psMD5toString(md5); ///< String
-
-                  pmHDU *hdu = pmHDUFromReadout(readout);
-                  psStringAppend(&headerName, "MD5_%s_%s_%d", chipName, cellName, view->readout);
-                  psMetadataAddStr(hdu->header, PS_LIST_TAIL, headerName, PS_META_REPLACE, "Image MD5", md5string);
-                  psFree(md5);
-                  psFree(md5string);
-                  psFree(headerName);
-                }
                 psFree (readoutName);
             }
-
-            psList *inputCells = psMetadataLookupPtr (NULL, cell->analysis, "INPUT.CELLS");
-            if (!pmConceptsAverageCells(cell, inputCells, NULL, NULL, false)) {
-                psError(psErrorCodeLast(), false, "Unable to average cell concepts.");
-                psFree(view);
-                return false;
-            }
-
-            // XXX Is this too ad-hoc?
-            psRegion *trimsec = psMetadataLookupPtr(NULL, cell->concepts, "CELL.TRIMSEC"); ///< Trim section
-            trimsec->x0 = trimsec->x1 = trimsec->y0 = trimsec->y1 = 0; ///< All pixels
-
         }
     }
 
     // Perform statistics on the output image (ppStatsFPA loops down the hierarchy)
-    if (fpaStats) {
-      pmFPAviewReset (view);
-      if (!ppStatsFPA(fpaStats, output, view, maskValue, config)) {
+    pmFPAviewReset (view);
+    if (!ppStatsFPA(fpaStats, output, view, maskValue, config)) {
         psWarning("Unable to perform statistics on warped image.");
-      }
     }
     psFree(view);
-
-    if (!psMetadataCopy(output->concepts, input->concepts)) {
-        psError(psErrorCodeLast(), false, "Unable to copy FPA concepts from input to output.");
-        return false;
-    }
 
     if (Nreadout == 0) {
@@ -168 +119 @@
     }      
 
-    // Update ZP from the astrometry
-    {
-        psMetadataItem *item = psMetadataLookup(output->concepts, "FPA.ZP");
-        item->data.F32 = psMetadataLookupF32(NULL, astrom->concepts, "FPA.ZP");
-    }
-
-    // need to update the chip and fpa level astrometry appropriately, see
-    // code in psastro
-    
-# if (0)
-    if (!pmAstromWriteWCS(hdu->header, outFPA, outChip, WCS_NONLIN_TOL)) {
-        psError(psErrorCodeLast(), false, "Unable to generate WCS header.");
-        return false;
-    }
-# endif
-
     return true;
 }