Changeset 2081 for trunk/src/Scantable.h

Timestamp:

03/30/11 21:30:28 (13 years ago)

Author:

WataruKawasaki

Message:

New Development: No

JIRA Issue: Yes CAS-2847

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s): Scantable

Description: Scantable::sinusoidBaseline(), Scantable::autoSinusoidBaseline()

File:

• trunk/src/Scantable.h (modified) (5 diffs)

trunk/src/Scantable.h

@@ -522 +522 @@
                                const std::string& blfile="");
   void sinusoidBaseline(const std::vector<bool>& mask,
-                        int nMinWavesInSW,
-                        int nMaxWavesInSW,
+                        const std::vector<int>& nWaves,
+                        float maxWaveLength,
                         float thresClip, 
                         int nIterClip,
+                        bool getResidual=true,
                         bool outLogger=false,
                         const std::string& blfile="");
   void autoSinusoidBaseline(const std::vector<bool>& mask,
-                            int nMinWavesInSW,
-                            int nMaxWavesInSW,
+                            const std::vector<int>& nWaves,
+                            float maxWaveLength,
                             float thresClip, 
                             int nIterClip,
@@ -536 +537 @@
                             float threshold=3.0, 
                             int chanAvgLimit=1, 
+                            bool getResidual=true,
                             bool outLogger=false, 
                             const std::string& blfile="");
@@ -672 +674 @@
   std::vector<float> doCubicSplineFitting(const std::vector<float>& data, 
                                           const std::vector<bool>& mask,
+                                          int nPiece,
                                           std::vector<int>& idxEdge,
                                           std::vector<float>& params,
-                                          int nPiece=2,
                                           float thresClip=3.0, 
                                           int nIterClip=1,
@@ -680 +682 @@
   std::vector<float> doSinusoidFitting(const std::vector<float>& data, 
                                        const std::vector<bool>& mask,
-                                       int nMinWavesInSW,
-                                       int nMaxWavesInSW,
+                                       const std::vector<int>& waveNumbers,
+                                       float maxWaveLength, 
                                        std::vector<float>& params,
                                        float thresClip=3.0, 
@@ -698 +700 @@
   //std::vector<bool> getCompositeChanMask(int whichrow, const std::vector<bool>& inMask, const std::vector<int>& edge, const int minEdgeSize, STLineFinder& lineFinder);
   void outputFittingResult(bool outLogger, bool outTextFile, const std::vector<bool>& chanMask, int whichrow, const casa::String& coordInfo, bool hasSameNchan, std::ofstream& ofs, const casa::String& funcName, Fitter& fitter);
-  void outputFittingResult(bool outLogger, bool outTextFile, const std::vector<bool>& chanMask, int whichrow, const casa::String& coordInfo, bool hasSameNchan, std::ofstream& ofs, const casa::String& funcName, const std::vector<int>& edge, const std::vector<float>& params, const std::vector<bool>& fixed);
-  void outputFittingResult(bool outLogger, bool outTextFile, const std::vector<bool>& chanMask, int whichrow, const casa::String& coordInfo, bool hasSameNchan, std::ofstream& ofs, const casa::String& funcName, const std::vector<float>& params, const std::vector<bool>& fixed);
+  void outputFittingResult(bool outLogger, bool outTextFile, const std::vector<bool>& chanMask, int whichrow, const casa::String& coordInfo, bool hasSameNchan, std::ofstream& ofs, const casa::String& funcName, const std::vector<int>& edge, const std::vector<float>& params);
+  void outputFittingResult(bool outLogger, bool outTextFile, const std::vector<bool>& chanMask, int whichrow, const casa::String& coordInfo, bool hasSameNchan, std::ofstream& ofs, const casa::String& funcName, const std::vector<float>& params);
 
   void applyChanFlag( casa::uInt whichrow, const std::vector<bool>& msk, casa::uChar flagval);