Changeset 2189 for trunk/src/Scantable.h

Timestamp:

06/09/11 19:17:30 (13 years ago)

Author:

WataruKawasaki

Message:

New Development: No

JIRA Issue: Yes CAS-3149

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: scantable.*_baseline() parameter

Test Programs:

Put in Release Notes: No

Module(s):

Description: Added two parameters 'showprogress' and 'minnrow' to scantable.*_baseline() to enable to show progress status during time-consuming processes.

File:

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

trunk/src/Scantable.h

@@ -502 +502 @@
                     int order, 
                     bool getResidual=true,
-                    bool outLogger=false, 
+                    const std::string& progressInfo="true,1000", 
+                    const bool outLogger=false, 
                     const std::string& blfile="");
   void autoPolyBaseline(const std::vector<bool>& mask,
@@ -510 +511 @@
                         int chanAvgLimit=1, 
                         bool getResidual=true,
-                        bool outLogger=false, 
+                        const std::string& progressInfo="true,1000", 
+                        const bool outLogger=false, 
                         const std::string& blfile="");
   void cubicSplineBaseline(const std::vector<bool>& mask,
@@ -517 +519 @@
                            int nIterClip,
                            bool getResidual=true,
-                           bool outLogger=false,
+                           const std::string& progressInfo="true,1000", 
+                           const bool outLogger=false,
                            const std::string& blfile="");
   void autoCubicSplineBaseline(const std::vector<bool>& mask,
@@ -527 +530 @@
                                int chanAvgLimit=1, 
                                bool getResidual=true,
-                               bool outLogger=false, 
+                               const std::string& progressInfo="true,1000", 
+                               const bool outLogger=false, 
                                const std::string& blfile="");
   void sinusoidBaseline(const std::vector<bool>& mask,
@@ -538 +542 @@
                         int nIterClip,
                         bool getResidual=true,
-                        bool outLogger=false,
+                        const std::string& progressInfo="true,1000", 
+                        const bool outLogger=false,
                         const std::string& blfile="");
   void autoSinusoidBaseline(const std::vector<bool>& mask,
@@ -552 +557 @@
                             int chanAvgLimit=1, 
                             bool getResidual=true,
-                            bool outLogger=false, 
+                            const std::string& progressInfo="true,1000", 
+                            const bool outLogger=false, 
                             const std::string& blfile="");
   std::vector<float> execFFT(const int whichrow, 
@@ -741 +747 @@
   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 showProgressOnTerminal(const int nProcessed, const int nTotal, const int nTotalThreshold=1000);
+  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);
 
   void applyChanFlag( casa::uInt whichrow, const std::vector<bool>& msk, casa::uChar flagval);