Changeset 2065 for branches/casa-prerelease/pre-asap/src/Scantable.h

Timestamp:

03/24/11 18:12:46 (13 years ago)

Author:

WataruKawasaki

Message:

merged bug fixes from trunk (r2063)

Location:

branches/casa-prerelease/pre-asap

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/Scantable.h (modified) (3 diffs)

branches/casa-prerelease/pre-asap/src/Scantable.h

@@ -544 +544 @@
                                    const std::string& masklist, 
                                    int whichrow, 
-                                   bool verbose=false) const;
+                                   bool verbose=false,
+                                   int start=-1,
+                                   int count=-1,
+                                   bool resetparamid=false) const;
   std::string formatPiecewiseBaselineParams(const std::vector<int>& ranges, 
                                             const std::vector<float>& params, 
@@ -669 +672 @@
   std::vector<float> doCubicSplineFitting(const std::vector<float>& data, 
                                           const std::vector<bool>& mask,
-                                          std::vector<int>& sectionRanges,
+                                          std::vector<int>& idxEdge,
                                           std::vector<float>& params,
                                           int nPiece=2,
@@ -695 +698 @@
   //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>& pieceEdges, 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, 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);