Changeset 5435 for trunk/psModules/src/imsubtract

Timestamp:

Oct 20, 2005, 1:06:24 PM (21 years ago)

Author:

gusciora

Message:

....

Location:

trunk/psModules/src/imsubtract

Files:

• pmSubtractBias.c (modified) (2 diffs)
• pmSubtractBias.h (modified) (2 diffs)

trunk/psModules/src/imsubtract/pmSubtractBias.c

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-10-12 21:02:04 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-10-20 23:06:24 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -282 +282 @@
 XXX: The SDRS does not specify type support.  F32 is implemented here.
  *****************************************************************************/
-pmReadout *pmSubtractBias(pmReadout *in,
-                          void *fitSpec,
-                          const psList *overscans,
-                          pmOverscanAxis overScanAxis,
-                          psStats *stat,
-                          psS32 nBinOrig,
-                          pmFit fit,
-                          const pmReadout *bias)
+pmReadout *pmSubtractBias(
+    pmReadout *in,
+    void *fitSpec,
+    pmFit fit,
+    bool overscan,
+    psStats *stat,
+    int nBin,
+    const pmReadout *bias,
+    const pmReadout *dark
+)
 {
     psTrace(".psModule.pmSubtracBias.pmSubtractBias", 4,

trunk/psModules/src/imsubtract/pmSubtractBias.h

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-28 20:43:52 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-10-20 23:06:24 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -38 +38 @@
 } pmFit;
 
-pmReadout *pmSubtractBias(pmReadout *in,                ///< The input pmReadout image
-                          void *fitSpec,                ///< A polynomial or spline, defining the fit type.
-                          const psList *overscans,      ///< A psList of overscan images
-                          pmOverscanAxis overScanAxis,  ///< Defines how overscans are applied
-                          psStats *stat,                ///< The statistic to be used in combining overscan data
-                          int nBin,                     ///< The amount of binning to be done image pixels.
-                          pmFit fit,                    ///< PM_FIT_SPLINE, PM_FIT_POLYNOMIAL, or PM_FIT_NONE
-                          const pmReadout *bias);       ///< A possibly NULL bias pmReadout which is to be subtracted
+pmReadout *pmSubtractBias(
+    pmReadout *in,                      ///< The input pmReadout image
+    void *fitSpec,                      ///< A polynomial or spline, defining the fit type.
+    pmFit fit,                          ///< PM_FIT_SPLINE, PM_FIT_POLYNOMIAL, or PM_FIT_NONE
+    bool overscan,
+    psStats *stat,                      ///< The statistic to be used in combining overscan data
+    int nBin,                           ///< The amount of binning to be done image pixels.
+    const pmReadout *bias,              ///< A possibly NULL bias pmReadout which is to be subtracted
+    const pmReadout *dark               ///< A possibly NULL bias pmReadout which is to be subtracted
+)
+// OLD: remove this
+//    const psList *overscans,      ///< A psList of overscan images
+//    pmOverscanAxis overScanAxis,  ///< Defines how overscans are applied
 
 #endif