Changeset 29060 for branches/sc_branches/trunkTest/psModules/src/imcombine/pmSubtractionStamps.h

Timestamp:

Aug 26, 2010, 9:18:39 AM (16 years ago)

Author:

Serge CHASTEL

Message:

Merging trunk in branch

Location:

branches/sc_branches/trunkTest

Files:

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

branches/sc_branches/trunkTest/psModules/src/imcombine/pmSubtractionStamps.h

@@ -24 +24 @@
     psArray *flux;                      ///< Fluxes for possible stamps (or NULL)
     int footprint;                      ///< Half-size of stamps
-    psKernel *window;                   ///< window function generated from ensemble of stamps
     float normFrac;                     ///< Fraction of flux in window for normalisation window
-    int normWindow;                     ///< Size of window for measuring normalisation
+    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 sysErr;                       ///< Systematic error
     float skyErr;                       ///< increase effective readnoise
@@ -195 +197 @@
 bool pmSubtractionStampsResetStatus (pmSubtractionStampList *stamps);
 
+
+bool pmSubtractionKernelPenaltiesStamp(pmSubtractionStamp *stamp, pmSubtractionKernels *kernels);
+bool pmSubtractionKernelPenalties(pmSubtractionStamp *stamp, pmSubtractionKernels *kernels, int index);
+float pmSubtractionKernelPenaltySingle(psKernel *kernel, bool zeroNull);
+
 #endif