Changeset 2189 for trunk/src

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.

Location:

trunk/src

Files:

• Scantable.cpp (modified) (20 diffs)
• Scantable.h (modified) (7 diffs)
• ScantableWrapper.h (modified) (1 diff)

trunk/src/Scantable.cpp

@@ -1817 +1817 @@
 }
 
-void Scantable::polyBaseline(const std::vector<bool>& mask, int order, bool getResidual, bool outLogger, const std::string& blfile)
+void Scantable::polyBaseline(const std::vector<bool>& mask, int order, bool getResidual, const std::string& progressInfo, const bool outLogger, const std::string& blfile)
 {
   ofstream ofs;
@@ -1841 +1841 @@
   int nRow = nrow();
   std::vector<bool> chanMask;
+  bool showProgress;
+  int minNRow;
+  parseProgressInfo(progressInfo, showProgress, minNRow);
 
   for (int whichrow = 0; whichrow < nRow; ++whichrow) {
@@ -1847 +1850 @@
     setSpectrum((getResidual ? fitter.getResidual() : fitter.getFit()), whichrow);
     outputFittingResult(outLogger, outTextFile, chanMask, whichrow, coordInfo, hasSameNchan, ofs, "polyBaseline()", fitter);
-    showProgressOnTerminal(whichrow, nRow);
+    showProgressOnTerminal(whichrow, nRow, showProgress, minNRow);
   }
 
@@ -1853 +1856 @@
 }
 
-void Scantable::autoPolyBaseline(const std::vector<bool>& mask, int order, const std::vector<int>& edge, float threshold, int chanAvgLimit, bool getResidual, bool outLogger, const std::string& blfile)
+void Scantable::autoPolyBaseline(const std::vector<bool>& mask, int order, const std::vector<int>& edge, float threshold, int chanAvgLimit, bool getResidual, const std::string& progressInfo, const bool outLogger, const std::string& blfile)
 {
   ofstream ofs;
@@ -1880 +1883 @@
   STLineFinder lineFinder = STLineFinder();
   lineFinder.setOptions(threshold, 3, chanAvgLimit);
+
+  bool showProgress;
+  int minNRow;
+  parseProgressInfo(progressInfo, showProgress, minNRow);
 
   for (int whichrow = 0; whichrow < nRow; ++whichrow) {
@@ -1910 +1917 @@
 
     outputFittingResult(outLogger, outTextFile, chanMask, whichrow, coordInfo, hasSameNchan, ofs, "autoPolyBaseline()", fitter);
-    showProgressOnTerminal(whichrow, nRow);
+    showProgressOnTerminal(whichrow, nRow, showProgress, minNRow);
   }
 
@@ -1916 +1923 @@
 }
 
-void Scantable::cubicSplineBaseline(const std::vector<bool>& mask, int nPiece, float thresClip, int nIterClip, bool getResidual, bool outLogger, const std::string& blfile)
+void Scantable::cubicSplineBaseline(const std::vector<bool>& mask, int nPiece, float thresClip, int nIterClip, bool getResidual, const std::string& progressInfo, const bool outLogger, const std::string& blfile)
 {
   ofstream ofs;
@@ -1940 +1947 @@
   int nRow = nrow();
   std::vector<bool> chanMask;
+  bool showProgress;
+  int minNRow;
+  parseProgressInfo(progressInfo, showProgress, minNRow);
 
   for (int whichrow = 0; whichrow < nRow; ++whichrow) {
@@ -1952 +1962 @@
 
     outputFittingResult(outLogger, outTextFile, chanMask, whichrow, coordInfo, hasSameNchan, ofs, "cubicSplineBaseline()", pieceEdges, params);
-    showProgressOnTerminal(whichrow, nRow);
+    showProgressOnTerminal(whichrow, nRow, showProgress, minNRow);
   }
 
@@ -1958 +1968 @@
 }
 
-void Scantable::autoCubicSplineBaseline(const std::vector<bool>& mask, int nPiece, float thresClip, int nIterClip, const std::vector<int>& edge, float threshold, int chanAvgLimit, bool getResidual, bool outLogger, const std::string& blfile)
+void Scantable::autoCubicSplineBaseline(const std::vector<bool>& mask, int nPiece, float thresClip, int nIterClip, const std::vector<int>& edge, float threshold, int chanAvgLimit, bool getResidual, const std::string& progressInfo, const bool outLogger, const std::string& blfile)
 {
   ofstream ofs;
@@ -1985 +1995 @@
   STLineFinder lineFinder = STLineFinder();
   lineFinder.setOptions(threshold, 3, chanAvgLimit);
+
+  bool showProgress;
+  int minNRow;
+  parseProgressInfo(progressInfo, showProgress, minNRow);
 
   for (int whichrow = 0; whichrow < nRow; ++whichrow) {
@@ -2021 +2035 @@
 
     outputFittingResult(outLogger, outTextFile, chanMask, whichrow, coordInfo, hasSameNchan, ofs, "autoCubicSplineBaseline()", pieceEdges, params);
-    showProgressOnTerminal(whichrow, nRow);
+    showProgressOnTerminal(whichrow, nRow, showProgress, minNRow);
   }
 
@@ -2370 +2384 @@
 }
 
-void Scantable::sinusoidBaseline(const std::vector<bool>& mask, const bool applyFFT, const std::string& fftMethod, const std::string& fftThresh, const std::vector<int>& addNWaves, const std::vector<int>& rejectNWaves, float thresClip, int nIterClip, bool getResidual, bool outLogger, const std::string& blfile)
+void Scantable::sinusoidBaseline(const std::vector<bool>& mask, const bool applyFFT, const std::string& fftMethod, const std::string& fftThresh, const std::vector<int>& addNWaves, const std::vector<int>& rejectNWaves, float thresClip, int nIterClip, bool getResidual, const std::string& progressInfo, const bool outLogger, const std::string& blfile)
 {
   ofstream ofs;
@@ -2395 +2409 @@
   std::vector<bool> chanMask;
   std::vector<int> nWaves;
+
+  bool showProgress;
+  int minNRow;
+  parseProgressInfo(progressInfo, showProgress, minNRow);
 
   for (int whichrow = 0; whichrow < nRow; ++whichrow) {
@@ -2422 +2440 @@
 
     outputFittingResult(outLogger, outTextFile, chanMask, whichrow, coordInfo, hasSameNchan, ofs, "sinusoidBaseline()", params);
-    showProgressOnTerminal(whichrow, nRow);
+    showProgressOnTerminal(whichrow, nRow, showProgress, minNRow);
   }
 
@@ -2428 +2446 @@
 }
 
-void Scantable::autoSinusoidBaseline(const std::vector<bool>& mask, const bool applyFFT, const std::string& fftMethod, const std::string& fftThresh, const std::vector<int>& addNWaves, const std::vector<int>& rejectNWaves, float thresClip, int nIterClip, const std::vector<int>& edge, float threshold, int chanAvgLimit, bool getResidual, bool outLogger, const std::string& blfile)
+void Scantable::autoSinusoidBaseline(const std::vector<bool>& mask, const bool applyFFT, const std::string& fftMethod, const std::string& fftThresh, const std::vector<int>& addNWaves, const std::vector<int>& rejectNWaves, float thresClip, int nIterClip, const std::vector<int>& edge, float threshold, int chanAvgLimit, bool getResidual, const std::string& progressInfo, const bool outLogger, const std::string& blfile)
 {
   ofstream ofs;
@@ -2457 +2475 @@
   STLineFinder lineFinder = STLineFinder();
   lineFinder.setOptions(threshold, 3, chanAvgLimit);
+
+  bool showProgress;
+  int minNRow;
+  parseProgressInfo(progressInfo, showProgress, minNRow);
 
   for (int whichrow = 0; whichrow < nRow; ++whichrow) {
@@ -2493 +2515 @@
 
     outputFittingResult(outLogger, outTextFile, chanMask, whichrow, coordInfo, hasSameNchan, ofs, "autoSinusoidBaseline()", params);
-    showProgressOnTerminal(whichrow, nRow);
+    showProgressOnTerminal(whichrow, nRow, showProgress, minNRow);
   }
 
@@ -2815 +2837 @@
 }
 
-void Scantable::showProgressOnTerminal(const int nProcessed, const int nTotal, const int nTotalThreshold)
-{
-  if (nTotal >= nTotalThreshold) {
+void Scantable::parseProgressInfo(const std::string& progressInfo, bool& showProgress, int& minNRow)
+{
+  int idxDelimiter = progressInfo.find(",");
+  if (idxDelimiter < 0) {
+    throw(AipsError("wrong value in 'showprogress' parameter")) ;
+  }
+  showProgress = (progressInfo.substr(0, idxDelimiter) == "true");
+  std::istringstream is(progressInfo.substr(idxDelimiter+1));
+  is >> minNRow;
+}
+
+void Scantable::showProgressOnTerminal(const int nProcessed, const int nTotal, const bool showProgress, const int nTotalThreshold)
+{
+  if (showProgress && (nTotal >= nTotalThreshold)) {
     int nInterval = int(floor(double(nTotal)/100.0));
     if (nInterval == 0) nInterval++;
@@ -2824 +2857 @@
       printf("\x1b[31m\x1b[1m");             //set red color, highlighted
       printf("[  0%%]");
-      printf("\x1b[39m\x1b[0m");             //default attributes
+      printf("\x1b[39m\x1b[0m");             //set default attributes
       fflush(NULL);
     } else if (nProcessed % nInterval == 0) {
-      printf("\r\x1b[1C");                   //go to the 2nd column
+      printf("\r");                          //go to the head of line
       printf("\x1b[31m\x1b[1m");             //set red color, highlighted
-      printf("%3d", (int)(100.0*(double(nProcessed+1))/(double(nTotal))) );
-      printf("\x1b[39m\x1b[0m");             //default attributes
-      printf("\x1b[2C");                     //go to the end of line
+      printf("[%3d%%]", (int)(100.0*(double(nProcessed+1))/(double(nTotal))) );
+      printf("\x1b[39m\x1b[0m");             //set default attributes
       fflush(NULL);
     }

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);

trunk/src/ScantableWrapper.h

@@ -264 +264 @@
   { table_->reshapeSpectrum( nmin, nmax ); }
 
-  void polyBaseline(const std::vector<bool>& mask, int order, bool getresidual=true, bool outlog=false, const std::string& blfile="")
-  { table_->polyBaseline(mask, order, getresidual, outlog, blfile); }
-
-  void autoPolyBaseline(const std::vector<bool>& mask, int order, const std::vector<int>& edge, float threshold=5.0, int chan_avg_limit=1, bool getresidual=true, bool outlog=false, const std::string& blfile="")
-  { table_->autoPolyBaseline(mask, order, edge, threshold, chan_avg_limit, getresidual, outlog, blfile); }
-
-  void cubicSplineBaseline(const std::vector<bool>& mask, int npiece, float clipthresh, int clipniter, bool getresidual=true, bool outlog=false, const std::string& blfile="")
-  { table_->cubicSplineBaseline(mask, npiece, clipthresh, clipniter, getresidual, outlog, blfile); }
-
-  void autoCubicSplineBaseline(const std::vector<bool>& mask, int npiece, float clipthresh, int clipniter, const std::vector<int>& edge, float threshold=5.0, int chan_avg_limit=1, bool getresidual=true, bool outlog=false, const std::string& blfile="")
-  { table_->autoCubicSplineBaseline(mask, npiece, clipthresh, clipniter, edge, threshold, chan_avg_limit, getresidual, outlog, blfile); }
-
-  void sinusoidBaseline(const std::vector<bool>& mask, const bool applyfft, const std::string& fftmethod, const std::string& fftthresh, const std::vector<int>& addwn, const std::vector<int>& rejwn, float clipthresh, int clipniter, bool getresidual=true, bool outlog=false, const std::string& blfile="")
-  { table_->sinusoidBaseline(mask, applyfft, fftmethod, fftthresh, addwn, rejwn, clipthresh, clipniter, getresidual, outlog, blfile); }
-
-  void autoSinusoidBaseline(const std::vector<bool>& mask, const bool applyfft, const std::string& fftmethod, const std::string& fftthresh, const std::vector<int>& addwn, const std::vector<int>& rejwn, float clipthresh, int clipniter, const std::vector<int>& edge, float threshold=5.0, int chan_avg_limit=1, bool getresidual=true, bool outlog=false, const std::string& blfile="")
-  { table_->autoSinusoidBaseline(mask, applyfft, fftmethod, fftthresh, addwn, rejwn, clipthresh, clipniter, edge, threshold, chan_avg_limit, getresidual, outlog, blfile); }
+  void polyBaseline(const std::vector<bool>& mask, int order, bool getresidual=true, const std::string& showprogress="true,1000", const bool outlog=false, const std::string& blfile="")
+  { table_->polyBaseline(mask, order, getresidual, showprogress, outlog, blfile); }
+
+  void autoPolyBaseline(const std::vector<bool>& mask, int order, const std::vector<int>& edge, float threshold=5.0, int chan_avg_limit=1, bool getresidual=true, const std::string& showprogress="true,1000", const bool outlog=false, const std::string& blfile="")
+  { table_->autoPolyBaseline(mask, order, edge, threshold, chan_avg_limit, getresidual, showprogress, outlog, blfile); }
+
+  void cubicSplineBaseline(const std::vector<bool>& mask, int npiece, float clipthresh, int clipniter, bool getresidual=true, const std::string& showprogress="true,1000", const bool outlog=false, const std::string& blfile="")
+  { table_->cubicSplineBaseline(mask, npiece, clipthresh, clipniter, getresidual, showprogress, outlog, blfile); }
+
+  void autoCubicSplineBaseline(const std::vector<bool>& mask, int npiece, float clipthresh, int clipniter, const std::vector<int>& edge, float threshold=5.0, int chan_avg_limit=1, bool getresidual=true, const std::string& showprogress="true,1000", const bool outlog=false, const std::string& blfile="")
+  { table_->autoCubicSplineBaseline(mask, npiece, clipthresh, clipniter, edge, threshold, chan_avg_limit, getresidual, showprogress, outlog, blfile); }
+
+  void sinusoidBaseline(const std::vector<bool>& mask, const bool applyfft, const std::string& fftmethod, const std::string& fftthresh, const std::vector<int>& addwn, const std::vector<int>& rejwn, float clipthresh, int clipniter, bool getresidual=true, const std::string& showprogress="true,1000", const bool outlog=false, const std::string& blfile="")
+  { table_->sinusoidBaseline(mask, applyfft, fftmethod, fftthresh, addwn, rejwn, clipthresh, clipniter, getresidual, showprogress, outlog, blfile); }
+
+  void autoSinusoidBaseline(const std::vector<bool>& mask, const bool applyfft, const std::string& fftmethod, const std::string& fftthresh, const std::vector<int>& addwn, const std::vector<int>& rejwn, float clipthresh, int clipniter, const std::vector<int>& edge, float threshold=5.0, int chan_avg_limit=1, bool getresidual=true, const std::string& showprogress="true,1000", const bool outlog=false, const std::string& blfile="")
+  { table_->autoSinusoidBaseline(mask, applyfft, fftmethod, fftthresh, addwn, rejwn, clipthresh, clipniter, edge, threshold, chan_avg_limit, getresidual, showprogress, outlog, blfile); }
 
   float getRms(const std::vector<bool>& mask, int whichrow)