Changeset 2640 for branches/hpc34

Timestamp:

08/10/12 20:18:03 (12 years ago)

Author:

WataruKawasaki

Message:

added a new parameter 'csvformat' to sd.scantable.*baseline() and the relevant functions in the C++ side. (2012/08/10 WK)

Location:

branches/hpc34

Files:

• CMakeLists.txt (modified) (2 diffs)
• python/scantable.py (modified) (25 diffs)
• src/Scantable.cpp (modified) (25 diffs)
• src/Scantable.h (modified) (3 diffs)
• src/ScantableWrapper.h (modified) (1 diff)

branches/hpc34/CMakeLists.txt

@@ -5 +5 @@
 # minimum requirement for cmake version
 cmake_minimum_required( VERSION 2.8 )
+
+set( MY_OPT_FLAGS "-O3 -funroll-loops -m64 -march=native -msse4.1 -floop-interchange" )
 
 # options
@@ -85 +87 @@
 # default flags
 set( DEFAULT_CXX_FLAGS
-     "-pipe -Wall -Wextra -Wno-non-template-friend -Wcast-align -Wno-comment" )
+     "${MY_OPT_FLAGS} -pipe -Wall -Wextra -Wno-non-template-friend -Wcast-align -Wno-comment" )
 
 find_package( OpenMP )

branches/hpc34/python/scantable.py

@@ -2440 +2440 @@
                           clipniter=None, plot=None,
                           getresidual=None, showprogress=None, 
-                          minnrow=None, outlog=None, blfile=None):
+                          minnrow=None, outlog=None, blfile=None, csvformat=None):
         """\
         Return a scan which has been baselined (all rows) with sinusoidal 
@@ -2498 +2498 @@
                            parameter values to be written
                            (default is '': no file/logger output)
+            csvformat:     if True blfile is csv-formatted, default is False.
 
         Example:
@@ -2534 +2535 @@
             if outlog        is None: outlog        = False
             if blfile        is None: blfile        = ''
-
+            if csvformat     is None: csvformat     = False
+
+            if csvformat:
+                scsvformat = "T"
+            else:
+                scsvformat = "F"
+            
             #CURRENTLY, PLOT=true is UNAVAILABLE UNTIL sinusoidal fitting is implemented as a fitter method. 
             workscan._sinusoid_baseline(mask, applyfft, fftmethod.lower(), 
                                         str(fftthresh).lower(), 
                                         workscan._parse_wn(addwn), 
-                                        workscan._parse_wn(rejwn), clipthresh,
-                                        clipniter, getresidual, 
+                                        workscan._parse_wn(rejwn),
+                                        clipthresh, clipniter,
+                                        getresidual, 
                                         pack_progress_params(showprogress, 
-                                                             minnrow), outlog,
-                                        blfile)
+                                                             minnrow), 
+                                        outlog, scsvformat+blfile)
             workscan._add_history('sinusoid_baseline', varlist)
             
@@ -2562 +2570 @@
                                chan_avg_limit=None, plot=None,
                                getresidual=None, showprogress=None, 
-                               minnrow=None, outlog=None, blfile=None):
+                               minnrow=None, outlog=None, blfile=None, csvformat=None):
         """\
         Return a scan which has been baselined (all rows) with sinusoidal 
@@ -2642 +2650 @@
                             parameter values to be written
                             (default is "": no file/logger output)
+            csvformat:      if True blfile is csv-formatted, default is False.
 
         Example:
@@ -2678 +2687 @@
             if outlog         is None: outlog         = False
             if blfile         is None: blfile         = ''
+            if csvformat      is None: csvformat      = False
+
+            if csvformat:
+                scsvformat = "T"
+            else:
+                scsvformat = "F"
 
             #CURRENTLY, PLOT=true is UNAVAILABLE UNTIL sinusoidal fitting is implemented as a fitter method. 
@@ -2691 +2706 @@
                                              pack_progress_params(showprogress,
                                                                   minnrow), 
-                                             outlog, blfile)
+                                             outlog, scsvformat+blfile)
             workscan._add_history("auto_sinusoid_baseline", varlist)
             
@@ -2706 +2721 @@
                          clipthresh=None, clipniter=None, plot=None, 
                          getresidual=None, showprogress=None, minnrow=None, 
-                         outlog=None, blfile=None):
+                         outlog=None, blfile=None, csvformat=None):
         """\
         Return a scan which has been baselined (all rows) by cubic spline 
@@ -2735 +2750 @@
                           parameter values to be written
                           (default is "": no file/logger output)
+            csvformat:    if True blfile is csv-formatted, default is False.
 
         Example:
@@ -2767 +2783 @@
             if outlog       is None: outlog       = False
             if blfile       is None: blfile       = ''
+            if csvformat     is None: csvformat     = False
+
+            if csvformat:
+                scsvformat = "T"
+            else:
+                scsvformat = "F"
 
             #CURRENTLY, PLOT=true UNAVAILABLE UNTIL cubic spline fitting is implemented as a fitter method. 
@@ -2772 +2794 @@
                                        getresidual, 
                                        pack_progress_params(showprogress, 
-                                                            minnrow), outlog, 
-                                       blfile)
+                                                            minnrow),
+                                       outlog, scsvformat+blfile)
             workscan._add_history("cspline_baseline", varlist)
             
@@ -2790 +2812 @@
                               getresidual=None, plot=None,
                               showprogress=None, minnrow=None, outlog=None,
-                              blfile=None):
+                              blfile=None, csvformat=None):
         """\
         Return a scan which has been baselined (all rows) by cubic spline
@@ -2841 +2863 @@
                             parameter values to be written
                             (default is "": no file/logger output)
+            csvformat:      if True blfile is csv-formatted, default is False.
 
         Example:
@@ -2873 +2896 @@
             if outlog         is None: outlog         = False
             if blfile         is None: blfile         = ''
+            if csvformat      is None: csvformat      = False
+
+            if csvformat:
+                scsvformat = "T"
+            else:
+                scsvformat = "F"
 
             #CURRENTLY, PLOT=true UNAVAILABLE UNTIL cubic spline fitting is implemented as a fitter method.
@@ -2882 +2911 @@
                                             pack_progress_params(showprogress, 
                                                                  minnrow), 
-                                            outlog, blfile)
+                                            outlog, scsvformat+blfile)
             workscan._add_history("auto_cspline_baseline", varlist)
             
@@ -2896 +2925 @@
     def poly_baseline(self, mask=None, order=None, insitu=None, plot=None, 
                       getresidual=None, showprogress=None, minnrow=None, 
-                      outlog=None, blfile=None):
+                      outlog=None, blfile=None, csvformat=None):
         """\
         Return a scan which has been baselined (all rows) by a polynomial.
@@ -2919 +2948 @@
                           parameter values to be written
                           (default is "": no file/logger output)
+            csvformat:    if True blfile is csv-formatted, default is False.
 
         Example:
@@ -2946 +2976 @@
             if outlog       is None: outlog       = False
             if blfile       is None: blfile       = ""
+            if csvformat    is None: csvformat    = False
+
+            if csvformat:
+                scsvformat = "T"
+            else:
+                scsvformat = "F"
 
             if plot:
@@ -2990 +3026 @@
                                                          blpars["fixed"], 
                                                          rms, str(masklist), 
-                                                         r, True)
+                                                         r, True, csvformat)
                         blf.write(dataout)
 
@@ -3002 +3038 @@
                                         pack_progress_params(showprogress, 
                                                              minnrow), 
-                                        outlog, blfile)
+                                        outlog, scsvformat+blfile)
             
             workscan._add_history("poly_baseline", varlist)
@@ -3019 +3055 @@
                            plot=None, insitu=None,
                            getresidual=None, showprogress=None, 
-                           minnrow=None, outlog=None, blfile=None):
+                           minnrow=None, outlog=None, blfile=None, csvformat=None):
         """\
         Return a scan which has been baselined (all rows) by a polynomial.
@@ -3065 +3101 @@
                             parameter values to be written
                             (default is "": no file/logger output)
+            csvformat:      if True blfile is csv-formatted, default is False.
 
         Example:
@@ -3092 +3129 @@
             if outlog         is None: outlog         = False
             if blfile         is None: blfile         = ''
+            if csvformat      is None: csvformat      = False
+
+            if csvformat:
+                scsvformat = "T"
+            else:
+                scsvformat = "F"
 
             edge = normalise_edge_param(edge)
@@ -3145 +3188 @@
                                                          blpars["fixed"], 
                                                          rms, str(masklist), 
-                                                         r, True)
+                                                         r, True, csvformat)
                         blf.write(dataout)
                     
@@ -3157 +3200 @@
                                              pack_progress_params(showprogress,
                                                                   minnrow), 
-                                             outlog, blfile)
+                                             outlog, scsvformat+blfile)
 
             workscan._add_history("auto_poly_baseline", varlist)

branches/hpc34/src/Scantable.cpp

@@ -2333 +2333 @@
     bool hasSameNchan = true;
     bool outTextFile = false;
+    bool csvFormat = false;
 
     if (blfile != "") {
-      ofs.open(blfile.c_str(), ios::out | ios::app);
+      csvFormat = (blfile.substr(0, 1) == "T");
+      ofs.open(blfile.substr(1).c_str(), ios::out | ios::app);
       if (ofs) outTextFile = true;
     }
@@ -2359 +2361 @@
       fitBaseline(chanMask, whichrow, fitter);
       setSpectrum((getResidual ? fitter.getResidual() : fitter.getFit()), whichrow);
-      outputFittingResult(outLogger, outTextFile, chanMask, whichrow, coordInfo, hasSameNchan, ofs, "polyBaseline()", fitter);
+      outputFittingResult(outLogger, outTextFile, csvFormat, chanMask, whichrow, coordInfo, hasSameNchan, ofs, "polyBaseline()", fitter);
       showProgressOnTerminal(whichrow, nRow, showProgress, minNRow);
     }
@@ -2377 +2379 @@
     bool hasSameNchan = true;
     bool outTextFile = false;
+    bool csvFormat = false;
 
     if (blfile != "") {
-      ofs.open(blfile.c_str(), ios::out | ios::app);
+      csvFormat = (blfile.substr(0, 1) == "T");
+      ofs.open(blfile.substr(1).c_str(), ios::out | ios::app);
       if (ofs) outTextFile = true;
     }
@@ -2431 +2435 @@
       setSpectrum((getResidual ? fitter.getResidual() : fitter.getFit()), whichrow);
 
-      outputFittingResult(outLogger, outTextFile, chanMask, whichrow, coordInfo, hasSameNchan, ofs, "autoPolyBaseline()", fitter);
+      outputFittingResult(outLogger, outTextFile, csvFormat, chanMask, whichrow, coordInfo, hasSameNchan, ofs, "autoPolyBaseline()", fitter);
       showProgressOnTerminal(whichrow, nRow, showProgress, minNRow);
     }
@@ -2449 +2453 @@
     bool hasSameNchan = true;
     bool outTextFile = false;
+    bool csvFormat = false;
 
     if (blfile != "") {
-      ofs.open(blfile.c_str(), ios::out | ios::app);
+      csvFormat = (blfile.substr(0, 1) == "T");
+      ofs.open(blfile.substr(1).c_str(), ios::out | ios::app);
       if (ofs) outTextFile = true;
     }
@@ -2484 +2490 @@
       //
 
-      outputFittingResult(outLogger, outTextFile, chanMask, whichrow, coordInfo, hasSameNchan, ofs, "cubicSplineBaseline()", pieceEdges, params, nClipped);
+      outputFittingResult(outLogger, outTextFile, csvFormat, chanMask, whichrow, coordInfo, hasSameNchan, ofs, "cubicSplineBaseline()", pieceEdges, params, nClipped);
       showProgressOnTerminal(whichrow, nRow, showProgress, minNRow);
     }
@@ -2503 +2509 @@
     bool hasSameNchan = true;
     bool outTextFile = false;
+    bool csvFormat = false;
 
     if (blfile != "") {
-      ofs.open(blfile.c_str(), ios::out | ios::app);
+      csvFormat = (blfile.substr(0, 1) == "T");
+      ofs.open(blfile.substr(1).c_str(), ios::out | ios::app);
       if (ofs) outTextFile = true;
     }
@@ -2564 +2572 @@
       //
 
-      outputFittingResult(outLogger, outTextFile, chanMask, whichrow, coordInfo, hasSameNchan, ofs, "autoCubicSplineBaseline()", pieceEdges, params, nClipped);
+      outputFittingResult(outLogger, outTextFile, csvFormat, chanMask, whichrow, coordInfo, hasSameNchan, ofs, "autoCubicSplineBaseline()", pieceEdges, params, nClipped);
       showProgressOnTerminal(whichrow, nRow, showProgress, minNRow);
     }
@@ -3007 +3015 @@
     bool hasSameNchan = true;
     bool outTextFile = false;
+    bool csvFormat = false;
 
     if (blfile != "") {
-      ofs.open(blfile.c_str(), ios::out | ios::app);
+      csvFormat = (blfile.substr(0, 1) == "T");
+      ofs.open(blfile.substr(1).c_str(), ios::out | ios::app);
       if (ofs) outTextFile = true;
     }
@@ -3059 +3069 @@
       //
 
-      outputFittingResult(outLogger, outTextFile, chanMask, whichrow, coordInfo, hasSameNchan, ofs, "sinusoidBaseline()", params, nClipped);
+      outputFittingResult(outLogger, outTextFile, csvFormat, chanMask, whichrow, coordInfo, hasSameNchan, ofs, "sinusoidBaseline()", params, nClipped);
       showProgressOnTerminal(whichrow, nRow, showProgress, minNRow);
     }
@@ -3077 +3087 @@
     bool hasSameNchan = true;
     bool outTextFile = false;
+    bool csvFormat = false;
 
     if (blfile != "") {
-      ofs.open(blfile.c_str(), ios::out | ios::app);
+      csvFormat = (blfile.substr(0, 1) == "T");
+      ofs.open(blfile.substr(1).c_str(), ios::out | ios::app);
       if (ofs) outTextFile = true;
     }
@@ -3140 +3152 @@
       //
 
-      outputFittingResult(outLogger, outTextFile, chanMask, whichrow, coordInfo, hasSameNchan, ofs, "autoSinusoidBaseline()", params, nClipped);
+      outputFittingResult(outLogger, outTextFile, csvFormat, chanMask, whichrow, coordInfo, hasSameNchan, ofs, "autoSinusoidBaseline()", params, nClipped);
       showProgressOnTerminal(whichrow, nRow, showProgress, minNRow);
     }
@@ -3422 +3434 @@
 
 /* for poly. the variations of outputFittingResult() should be merged into one eventually (2011/3/10 WK)  */
-void Scantable::outputFittingResult(bool outLogger, bool outTextFile, const std::vector<bool>& chanMask, int whichrow, const casa::String& coordInfo, bool hasSameNchan, ofstream& ofs, const casa::String& funcName, Fitter& fitter)
+void Scantable::outputFittingResult(bool outLogger, bool outTextFile, bool csvFormat, const std::vector<bool>& chanMask, int whichrow, const casa::String& coordInfo, bool hasSameNchan, ofstream& ofs, const casa::String& funcName, Fitter& fitter)
 {
   if (outLogger || outTextFile) {
@@ -3432 +3444 @@
     if (outLogger) {
       LogIO ols(LogOrigin("Scantable", funcName, WHERE));
-      ols << formatBaselineParams(params, fixed, rms, -1, masklist, whichrow, false) << LogIO::POST ;
+      ols << formatBaselineParams(params, fixed, rms, -1, masklist, whichrow, false, csvFormat) << LogIO::POST ;
     }
     if (outTextFile) {
-      ofs << formatBaselineParams(params, fixed, rms, -1, masklist, whichrow, true) << flush;
+      ofs << formatBaselineParams(params, fixed, rms, -1, masklist, whichrow, true, csvFormat) << flush;
     }
   }
@@ -3441 +3453 @@
 
 /* for cspline. will be merged once cspline is available in fitter (2011/3/10 WK) */
-void Scantable::outputFittingResult(bool outLogger, bool outTextFile, const std::vector<bool>& chanMask, int whichrow, const casa::String& coordInfo, bool hasSameNchan, ofstream& ofs, const casa::String& funcName, const std::vector<int>& edge, const std::vector<float>& params, const int nClipped)
+void Scantable::outputFittingResult(bool outLogger, bool outTextFile, bool csvFormat, const std::vector<bool>& chanMask, int whichrow, const casa::String& coordInfo, bool hasSameNchan, ofstream& ofs, const casa::String& funcName, const std::vector<int>& edge, const std::vector<float>& params, const int nClipped)
 {
   if (outLogger || outTextFile) {
@@ -3451 +3463 @@
     if (outLogger) {
       LogIO ols(LogOrigin("Scantable", funcName, WHERE));
-      ols << formatPiecewiseBaselineParams(edge, params, fixed, rms, nClipped, masklist, whichrow, false) << LogIO::POST ;
+      ols << formatPiecewiseBaselineParams(edge, params, fixed, rms, nClipped, masklist, whichrow, false, csvFormat) << LogIO::POST ;
     }
     if (outTextFile) {
-      ofs << formatPiecewiseBaselineParams(edge, params, fixed, rms, nClipped, masklist, whichrow, true) << flush;
+      ofs << formatPiecewiseBaselineParams(edge, params, fixed, rms, nClipped, masklist, whichrow, true, csvFormat) << flush;
     }
   }
@@ -3460 +3472 @@
 
 /* for sinusoid. will be merged once sinusoid is available in fitter (2011/3/10 WK) */
-void Scantable::outputFittingResult(bool outLogger, bool outTextFile, const std::vector<bool>& chanMask, int whichrow, const casa::String& coordInfo, bool hasSameNchan, ofstream& ofs, const casa::String& funcName, const std::vector<float>& params, const int nClipped)
+void Scantable::outputFittingResult(bool outLogger, bool outTextFile, bool csvFormat, const std::vector<bool>& chanMask, int whichrow, const casa::String& coordInfo, bool hasSameNchan, ofstream& ofs, const casa::String& funcName, const std::vector<float>& params, const int nClipped)
 {
   if (outLogger || outTextFile) {
@@ -3470 +3482 @@
     if (outLogger) {
       LogIO ols(LogOrigin("Scantable", funcName, WHERE));
-      ols << formatBaselineParams(params, fixed, rms, nClipped, masklist, whichrow, false) << LogIO::POST ;
+      ols << formatBaselineParams(params, fixed, rms, nClipped, masklist, whichrow, false, csvFormat) << LogIO::POST ;
     }
     if (outTextFile) {
-      ofs << formatBaselineParams(params, fixed, rms, nClipped, masklist, whichrow, true) << flush;
+      ofs << formatBaselineParams(params, fixed, rms, nClipped, masklist, whichrow, true, csvFormat) << flush;
     }
   }
@@ -3574 +3586 @@
 
 
-std::string Scantable::formatBaselineParamsHeader(int whichrow, const std::string& masklist, bool verbose) const
-{
-  ostringstream oss;
-
+std::string Scantable::formatBaselineParamsHeader(int whichrow, const std::string& masklist, bool verbose, bool csvformat) const
+{
   if (verbose) {
-    oss <<  " Scan[" << getScan(whichrow)  << "]";
-    oss <<  " Beam[" << getBeam(whichrow)  << "]";
-    oss <<    " IF[" << getIF(whichrow)    << "]";
-    oss <<   " Pol[" << getPol(whichrow)   << "]";
-    oss << " Cycle[" << getCycle(whichrow) << "]: " << endl;
-    oss << "Fitter range = " << masklist << endl;
-    oss << "Baseline parameters" << endl;
+    ostringstream oss;
+
+    if (csvformat) {
+      oss << getScan(whichrow)  << ",";
+      oss << getBeam(whichrow)  << ",";
+      oss << getIF(whichrow)    << ",";
+      oss << getPol(whichrow)   << ",";
+      oss << getCycle(whichrow) << ",";
+      String commaReplacedMasklist = masklist;
+      string::size_type pos = 0;
+      while (pos = commaReplacedMasklist.find(","), pos != string::npos) {
+        commaReplacedMasklist.replace(pos, 1, ";");
+        pos++;
+      }
+      oss << commaReplacedMasklist << ",";
+    } else {
+      oss <<  " Scan[" << getScan(whichrow)  << "]";
+      oss <<  " Beam[" << getBeam(whichrow)  << "]";
+      oss <<    " IF[" << getIF(whichrow)    << "]";
+      oss <<   " Pol[" << getPol(whichrow)   << "]";
+      oss << " Cycle[" << getCycle(whichrow) << "]: " << endl;
+      oss << "Fitter range = " << masklist << endl;
+      oss << "Baseline parameters" << endl;
+    }
     oss << flush;
-  }
-
-  return String(oss);
-}
-
-std::string Scantable::formatBaselineParamsFooter(float rms, int nClipped, bool verbose) const
-{
-  ostringstream oss;
-
+
+    return String(oss);
+  }
+
+  return "";
+}
+
+std::string Scantable::formatBaselineParamsFooter(float rms, int nClipped, bool verbose, bool csvformat) const
+{
   if (verbose) {
-    oss << "Results of baseline fit" << endl;
-    oss << "  rms = " << setprecision(6) << rms << endl;
-    if (nClipped >= 0) {
-      oss << "  Number of clipped channels = " << nClipped << endl;
-    }
-    for (int i = 0; i < 60; ++i) {
-      oss << "-";
+    ostringstream oss;
+
+    if (csvformat) {
+      oss << rms << ",";
+      if (nClipped >= 0) {
+        oss << nClipped;
+      }
+    } else {
+      oss << endl;
+      oss << "Results of baseline fit" << endl;
+      oss << "  rms = " << setprecision(6) << rms << endl;
+      if (nClipped >= 0) {
+        oss << "  Number of clipped channels = " << nClipped << endl;
+      }
+      for (int i = 0; i < 60; ++i) {
+        oss << "-";
+      }
     }
     oss << endl;
     oss << flush;
-  }
-
-  return String(oss);
+
+    return String(oss);
+  }
+
+  return "";
 }
 
@@ -3619 +3658 @@
                                             int whichrow, 
                                             bool verbose, 
+                                            bool csvformat, 
                                             int start, int count,
                                             bool resetparamid) const
@@ -3629 +3669 @@
 
     ostringstream oss;
-    oss << formatBaselineParamsHeader(whichrow, masklist, verbose);
+    oss << formatBaselineParamsHeader(whichrow, masklist, verbose, csvformat);
 
     if (start < 0) start = 0;
@@ -3642 +3682 @@
       }
       std::string sFix = ((fixed.size() > 0) && (fixed[i]) && verbose) ? "(fixed)" : "";
-      oss << "  p" << (i+paramidoffset) << sFix << "= " << right << setw(13) << setprecision(6) << params[i];
-    }
-
-    oss << endl;
-    oss << formatBaselineParamsFooter(rms, nClipped, verbose);
+      if (csvformat) {
+        oss << params[i] << sFix;
+      } else {
+        oss << "  p" << (i+paramidoffset) << sFix << "= " << right << setw(13) << setprecision(6) << params[i];
+      }
+    }
+
+    if (csvformat) {
+      oss << ",";
+    }
+    oss << formatBaselineParamsFooter(rms, nClipped, verbose, csvformat);
 
     return String(oss);
@@ -3653 +3699 @@
 }
 
-  std::string Scantable::formatPiecewiseBaselineParams(const std::vector<int>& ranges, const std::vector<float>& params, const std::vector<bool>& fixed, float rms, int nClipped, const std::string& masklist, int whichrow, bool verbose) const
+std::string Scantable::formatPiecewiseBaselineParams(const std::vector<int>& ranges, const std::vector<float>& params, const std::vector<bool>& fixed, float rms, int nClipped, const std::string& masklist, int whichrow, bool verbose, bool csvformat) const
 {
   int nOutParam = (int)(params.size());
@@ -3661 +3707 @@
     return("  Not fitted");
   } else if (nPiece < 0) {
-    return formatBaselineParams(params, fixed, rms, nClipped, masklist, whichrow, verbose);
+    return formatBaselineParams(params, fixed, rms, nClipped, masklist, whichrow, verbose, csvformat);
   } else if (nPiece < 1) {
     return("  Bad count of the piece edge info");
@@ -3671 +3717 @@
 
     ostringstream oss;
-    oss << formatBaselineParamsHeader(whichrow, masklist, verbose);
-
-    stringstream ss;
-    ss << ranges[nPiece] << flush;
-    int wRange = ss.str().size() * 2 + 5;
-
-    for (int i = 0; i < nPiece; ++i) {
-      ss.str("");
-      ss << "  [" << ranges[i] << "," << (ranges[i+1]-1) << "]";
-      oss << left << setw(wRange) << ss.str();
-      oss << formatBaselineParams(params, fixed, rms, 0, masklist, whichrow, false, i*nParam, nParam, true);
-    }
-
-    oss << formatBaselineParamsFooter(rms, nClipped, verbose);
+    oss << formatBaselineParamsHeader(whichrow, masklist, verbose, csvformat);
+
+    if (csvformat) {
+      for (int i = 0; i < nPiece; ++i) {
+        oss << ranges[i] << "," << (ranges[i+1]-1) << ","; 
+        oss << formatBaselineParams(params, fixed, rms, 0, masklist, whichrow, false, csvformat, i*nParam, nParam, true);
+      }
+    } else {
+      stringstream ss;
+      ss << ranges[nPiece] << flush;
+      int wRange = ss.str().size() * 2 + 5;
+
+      for (int i = 0; i < nPiece; ++i) {
+        ss.str("");
+        ss << "  [" << ranges[i] << "," << (ranges[i+1]-1) << "]";
+        oss << left << setw(wRange) << ss.str();
+        oss << formatBaselineParams(params, fixed, rms, 0, masklist, whichrow, false, csvformat, i*nParam, nParam, true);
+        oss << endl;
+      }
+    }
+
+    oss << formatBaselineParamsFooter(rms, nClipped, verbose, csvformat);
 
     return String(oss);

branches/hpc34/src/Scantable.h

@@ -579 +579 @@
                                    int whichrow, 
                                    bool verbose=false,
+                                   bool csvformat=false,
                                    int start=-1,
                                    int count=-1,
@@ -589 +590 @@
                                             const std::string& masklist, 
                                             int whichrow, 
-                                            bool verbose=false) const;
+                                            bool verbose=false,
+                                            bool csvformat=false) const;
 
 
@@ -754 +756 @@
                                 bool verbose=false);
   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, int nClipped, bool verbose) const;
+  std::string formatBaselineParamsHeader(int whichrow, const std::string& masklist, bool verbose, bool csvformat) const;
+  std::string formatBaselineParamsFooter(float rms, int nClipped, bool verbose, bool csvformat) 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, 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 outputFittingResult(bool outLogger, bool outTextFile, bool csvFormat, 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, bool csvFormat, 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, bool csvFormat, 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);

branches/hpc34/src/ScantableWrapper.h

@@ -292 +292 @@
   { return table_->getRms(mask, whichrow); }
 
-  std::string formatBaselineParams(const std::vector<float>& params, const std::vector<bool>& fixed, float rms, const std::string& masklist, int whichrow, bool verbose=false)
-  { return table_->formatBaselineParams(params, fixed, rms, -1, masklist, whichrow, verbose); }
-
-  std::string formatPiecewiseBaselineParams(const std::vector<int>& ranges, const std::vector<float>& params, const std::vector<bool>& fixed, float rms, const std::string& masklist, int whichrow, bool verbose=false)
-  { return table_->formatPiecewiseBaselineParams(ranges, params, fixed, rms, -1, masklist, whichrow, verbose); }
+  std::string formatBaselineParams(const std::vector<float>& params, const std::vector<bool>& fixed, float rms, const std::string& masklist, int whichrow, bool verbose=false, bool csvformat=false)
+    { return table_->formatBaselineParams(params, fixed, rms, -1, masklist, whichrow, verbose, csvformat); }
+
+  std::string formatPiecewiseBaselineParams(const std::vector<int>& ranges, const std::vector<float>& params, const std::vector<bool>& fixed, float rms, const std::string& masklist, int whichrow, bool verbose=false, bool csvformat=false)
+  { return table_->formatPiecewiseBaselineParams(ranges, params, fixed, rms, -1, masklist, whichrow, verbose, csvformat); }
 
   bool getFlagtraFast(int whichrow=0) const