Changeset 2193 for trunk/src/Scantable.h

Timestamp:

06/14/11 20:47:29 (13 years ago)

Author:

WataruKawasaki

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s):

Description: modified Scantable::*Baseline() so that the number of clipped channels be output.

File:

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

trunk/src/Scantable.h

@@ -568 +568 @@
                                    const std::vector<bool>& fixed, 
                                    float rms, 
+                                   int nClipped,
                                    const std::string& masklist, 
                                    int whichrow, 
@@ -578 +579 @@
                                             const std::vector<bool>& fixed, 
                                             float rms, 
+                                            int nClipped,
                                             const std::string& masklist, 
                                             int whichrow, 
@@ -701 +703 @@
                                           std::vector<int>& idxEdge,
                                           std::vector<float>& params,
+                                          int& nClipped,
                                           float thresClip=3.0, 
                                           int nIterClip=1,
@@ -708 +711 @@
                                        const std::vector<int>& waveNumbers,
                                        std::vector<float>& params,
+                                       int& nClipped,
                                        float thresClip=3.0, 
                                        int nIterClip=1,
@@ -741 +745 @@
   std::vector<int> getMaskEdgeIndices(const std::vector<bool>& mask);
   std::string formatBaselineParamsHeader(int whichrow, const std::string& masklist, bool verbose) const;
-  std::string formatBaselineParamsFooter(float rms, bool verbose) const;
+  std::string formatBaselineParamsFooter(float rms, int nClipped, bool verbose) const;
   std::vector<bool> getCompositeChanMask(int whichrow, const std::vector<bool>& inMask);
   //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);
-  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 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 int nClipped);
+  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 int nClipped);
   void parseProgressInfo(const std::string& progressInfo, bool& showProgress, int& minNRow);
   void showProgressOnTerminal(const int nProcessed, const int nTotal, const bool showProgress=true, const int nTotalThreshold=1000);