Changeset 29543 for trunk/psModules/src/imcombine/pmSubtractionStamps.h

Timestamp:

Oct 25, 2010, 2:45:41 PM (16 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20100823

File:

• trunk/psModules/src/imcombine/pmSubtractionStamps.h (modified) (2 diffs)

trunk/psModules/src/imcombine/pmSubtractionStamps.h

@@ -25 +25 @@
     int footprint;                      ///< Half-size of stamps
     float normFrac;                     ///< Fraction of flux in window for normalisation window
+    float normValue;                    ///< calculated normalization
+    float normValue2;                   ///< calculated normalization
     psKernel *window1;                  ///< window function generated from ensemble of stamps (input 1)
     psKernel *window2;                  ///< window function generated from ensemble of stamps (input 2)
-    float normWindow1;                    ///< Size of window for measuring normalisation
-    float normWindow2;                    ///< Size of window for measuring normalisation
+    psKernel *window;                   ///< weighting window function (sigma = 1.1 * MAX(fwhm))
+    float normWindow1;                  ///< Size of window for measuring normalisation
+    float normWindow2;                  ///< Size of window for measuring normalisation
     float sysErr;                       ///< Systematic error
     float skyErr;                       ///< increase effective readnoise
@@ -85 +88 @@
     psVector *vector;                   ///< Least-squares vector, or NULL
     double norm;                        ///< Normalisation difference
+    double normI1;                       ///< Sum(flux) for image 1
+    double normI2;                       ///< Sum(flux) for image 2
+    double normSquare1;                 ///< Sum(flux^2) for image 1 (used for penalty)
+    double normSquare2;                 ///< Sum(flux^2) for image 2 (used for penalty)
     pmSubtractionStampStatus status;    ///< Status of stamp
+    psVector *MxxI1;                    ///< second moments of convolution images
+    psVector *MyyI1;                    ///< second moments of convolution images
+    psVector *MxxI2;                    ///< second moments of convolution images
+    psVector *MyyI2;                    ///< second moments of convolution images
+    double MxxI1raw;
+    double MyyI1raw;
+    double MxxI2raw;
+    double MyyI2raw;
 } pmSubtractionStamp;