Changeset 10302

Timestamp:

Nov 29, 2006, 3:03:06 PM (20 years ago)

Author:

Paul Price

Message:

More changes related to name fixes (noun-verb)

Location:

trunk/psModules/src/detrend

Files:

• pmBias.c (modified) (5 diffs)
• pmBias.h (modified) (3 diffs)

trunk/psModules/src/detrend/pmBias.c

@@ -8 +8 @@
 
 #include "pmFPA.h"
-#include "pmSubtractBias.h"
+#include "pmBias.h"
 
 
@@ -37 +37 @@
 
 
-// psSubtractFrame(): this routine will take as input a readout for the input image and a readout for the bias
+// subtractFrame(): this routine will take as input a readout for the input image and a readout for the bias
 // image.  The bias image is subtracted in place from the input image.
-static bool SubtractFrame(pmReadout *in, // Input readout
+static bool subtractFrame(pmReadout *in, // Input readout
                           const pmReadout *sub, // Readout to be subtracted from input
                           float scale   // Scale to apply before subtracting
@@ -195 +195 @@
 
 
-bool pmSubtractBias(pmReadout *in, pmOverscanOptions *overscanOpts,
+bool pmBiasSubtract(pmReadout *in, pmOverscanOptions *overscanOpts,
                     const pmReadout *bias, const pmReadout *dark)
 {
     psTrace("psModules.detrend", 4,
-            "---- pmSubtractBias() begin ----\n");
+            "---- pmBiasSubtract() begin ----\n");
     PS_ASSERT_PTR_NON_NULL(in, NULL);
     PS_ASSERT_IMAGE_NON_NULL(in->image, NULL);
@@ -357 +357 @@
     // Bias frame subtraction
     if (bias) {
-        if (!SubtractFrame(in, bias, 1.0))
+        if (!subtractFrame(in, bias, 1.0))
             return false;
     }
@@ -365 +365 @@
         float inTime = psMetadataLookupF32(NULL, in->parent->concepts, "CELL.DARKTIME");
         float darkTime = psMetadataLookupF32(NULL, dark->parent->concepts, "CELL.DARKTIME");
-        if (!SubtractFrame(in, dark, inTime/darkTime))
+        if (!subtractFrame(in, dark, inTime/darkTime))
             return false;
     }

trunk/psModules/src/detrend/pmBias.h

@@ -1 @@
-/// @file pmSubtractBias.h
+/// @file pmBias.h
 ///
 /// @brief Subtract the overscan, bias and dark
@@ -8 +8 @@
 /// @author Paul Price, IfA
 ///
-/// @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2006-11-30 00:52:21 $
+/// @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+/// @date $Date: 2006-11-30 01:03:06 $
 ///
 /// Copyright 2004--2006 Institute for Astronomy, University of Hawaii
 ///
 
-#ifndef PM_SUBTRACT_BIAS_H
-#define PM_SUBTRACT_BIAS_H
+#ifndef PM__BIAS_H
+#define PM__BIAS_H
 
 #include <pslib.h>
@@ -60 +60 @@
 /// Subtracts the overscan, as measured from the bias member of the input readout (if options are non-NULL),
 /// bias (if non-NULL) and dark (if non-NULL) scaled by the CELL.DARKTIME concept.
-bool pmSubtractBias(pmReadout *in,      ///< Input readout, to be overscan/bias/dark corrected
+bool pmBiasSubtract(pmReadout *in,      ///< Input readout, to be overscan/bias/dark corrected
                     pmOverscanOptions *overscanOpts, ///< Options for overscan subtraction, or NULL
                     const pmReadout *bias, ///< Bias image to subtract, or NULL