Changeset 29165 for branches/eam_branches/ipp-20100823/psModules/src/imcombine/pmSubtractionStamps.h

Timestamp:

Sep 15, 2010, 5:32:21 PM (16 years ago)

Author:

eugene

Message:

clean up the code to remove old test concepts; normalization is calculated up front; matrix equation does not include place-holder elements for background and norm

File:

• branches/eam_branches/ipp-20100823/psModules/src/imcombine/pmSubtractionStamps.h (modified) (2 diffs)

branches/eam_branches/ipp-20100823/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
     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
+    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 +86 @@
     psVector *vector;                   ///< Least-squares vector, or NULL
     double norm;                        ///< Normalisation difference
+    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
 } pmSubtractionStamp;