Changeset 2641

Timestamp:

08/10/12 20:49:54 (12 years ago)

Author:

WataruKawasaki

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: parameter of tool functions

Test Programs:

Put in Release Notes: No

Module(s): sd.scantable

Description: added a new parameter csvformat.

Location:

trunk

Files:

• python/scantable.py (modified) (26 diffs)
• src/Scantable.cpp (modified) (34 diffs)
• src/Scantable.h (modified) (3 diffs)
• src/ScantableWrapper.h (modified) (1 diff)

trunk/python/scantable.py

@@ -2524 +2524 @@
                           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 
@@ -2582 +2582 @@
                            parameter values to be written
                            (default is '': no file/logger output)
+            csvformat:     if True blfile is csv-formatted, default is False.
 
         Example:
@@ -2618 +2619 @@
             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. 
@@ -2626 +2633 @@
                                         clipniter, getresidual, 
                                         pack_progress_params(showprogress, 
-                                                             minnrow), outlog,
-                                        blfile)
+                                                             minnrow),
+                                        outlog, scsvformat+blfile)
             workscan._add_history('sinusoid_baseline', varlist)
             
@@ -2646 +2653 @@
                                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 
@@ -2726 +2733 @@
                             parameter values to be written
                             (default is "": no file/logger output)
+            csvformat:      if True blfile is csv-formatted, default is False.
 
         Example:
@@ -2762 +2770 @@
             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. 
@@ -2775 +2789 @@
                                              pack_progress_params(showprogress,
                                                                   minnrow), 
-                                             outlog, blfile)
+                                             outlog, scsvformat+blfile)
             workscan._add_history("auto_sinusoid_baseline", varlist)
             
@@ -2790 +2804 @@
                          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 
@@ -2819 +2833 @@
                           parameter values to be written
                           (default is "": no file/logger output)
+            csvformat:    if True blfile is csv-formatted, default is False.
 
         Example:
@@ -2851 +2866 @@
             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. 
@@ -2856 +2877 @@
                                        getresidual, 
                                        pack_progress_params(showprogress, 
-                                                            minnrow), outlog, 
-                                       blfile)
+                                                            minnrow),
+                                       outlog, scsvformat+blfile)
             workscan._add_history("cspline_baseline", varlist)
             
@@ -2874 +2895 @@
                               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
@@ -2925 +2946 @@
                             parameter values to be written
                             (default is "": no file/logger output)
+            csvformat:      if True blfile is csv-formatted, default is False.
 
         Example:
@@ -2957 +2979 @@
             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.
@@ -2966 +2994 @@
                                             pack_progress_params(showprogress, 
                                                                  minnrow), 
-                                            outlog, blfile)
+                                            outlog, scsvformat+blfile)
             workscan._add_history("auto_cspline_baseline", varlist)
             
@@ -2980 +3008 @@
     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.
@@ -3003 +3031 @@
                           parameter values to be written
                           (default is "": no file/logger output)
+            csvformat:    if True blfile is csv-formatted, default is False.
 
         Example:
@@ -3030 +3059 @@
             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:
@@ -3084 +3119 @@
                                                          blpars["fixed"], 
                                                          rms, str(masklist), 
-                                                         r, True)
+                                                         r, True, csvformat)
                         blf.write(dataout)
 
@@ -3096 +3131 @@
                                         pack_progress_params(showprogress, 
                                                              minnrow), 
-                                        outlog, blfile)
+                                        outlog, scsvformat+blfile)
             
             workscan._add_history("poly_baseline", varlist)
@@ -3113 +3148 @@
                            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.
@@ -3159 +3194 @@
                             parameter values to be written
                             (default is "": no file/logger output)
+            csvformat:      if True blfile is csv-formatted, default is False.
 
         Example:
@@ -3186 +3222 @@
             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)
@@ -3247 +3289 @@
                                                          blpars["fixed"], 
                                                          rms, str(masklist), 
-                                                         r, True)
+                                                         r, True, csvformat)
                         blf.write(dataout)
                     
@@ -3259 +3301 @@
                                              pack_progress_params(showprogress,
                                                                   minnrow), 
-                                             outlog, blfile)
+                                             outlog, scsvformat+blfile)
 
             workscan._add_history("auto_poly_baseline", varlist)

trunk/src/Scantable.cpp

@@ -2489 +2489 @@
     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;
     }
@@ -2515 +2517 @@
       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);
     }
@@ -2533 +2535 @@
     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;
     }
@@ -2587 +2591 @@
       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);
     }
@@ -2600 +2604 @@
 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)
 {
-  /*************/
-  //clock_t totTimeStart, totTimeEnd, blTimeStart, blTimeEnd, ioTimeStart, ioTimeEnd;
+  /*************
   double totTimeStart, totTimeEnd, blTimeStart, blTimeEnd, ioTimeStart, ioTimeEnd, msTimeStart, msTimeEnd, seTimeStart, seTimeEnd, otTimeStart, otTimeEnd, prTimeStart, prTimeEnd;
   double elapseMs = 0.0;
@@ -2609 +2612 @@
   double elapseBl = 0.0;
   double elapseIo = 0.0;
-  //totTimeStart = clock();
   totTimeStart = mathutil::gettimeofday_sec();
-  /*************/
+  *************/
 
   try {
@@ -2618 +2620 @@
     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;
     }
@@ -2643 +2647 @@
     //--------------------------------
     for (int whichrow = 0; whichrow < nRow; ++whichrow) {
-      /******************/
-      //ioTimeStart = clock();
+      /******************
       ioTimeStart = mathutil::gettimeofday_sec();
-      /**/
+      **/
       std::vector<float> sp = getSpectrum(whichrow);
-      /**/
-      //ioTimeEnd = clock();
+      /**
       ioTimeEnd = mathutil::gettimeofday_sec();
       elapseIo += (double)(ioTimeEnd - ioTimeStart);
-
-      //blTimeStart = clock();
       msTimeStart = mathutil::gettimeofday_sec();
-      /******************/
+      ******************/
 
       chanMask = getCompositeChanMask(whichrow, mask);
 
-      /**/
+      /**
       msTimeEnd = mathutil::gettimeofday_sec();
       elapseMs += (double)(msTimeEnd - msTimeStart);
       blTimeStart = mathutil::gettimeofday_sec();
-      /**/
+      **/
 
       //fitBaseline(chanMask, whichrow, fitter);
@@ -2672 +2672 @@
       std::vector<float> res = doCubicSplineFitting(sp, chanMask, nPiece, pieceEdges, params, nClipped, thresClip, nIterClip, getResidual);
 
-      /**/
+      /**
       blTimeEnd = mathutil::gettimeofday_sec();
       elapseBl += (double)(blTimeEnd - blTimeStart);
       seTimeStart = mathutil::gettimeofday_sec();
-      /**/
+      **/
 
 
@@ -2682 +2682 @@
       //
 
-      /**/
+      /**
       seTimeEnd = mathutil::gettimeofday_sec();
       elapseSe += (double)(seTimeEnd - seTimeStart);
       otTimeStart = mathutil::gettimeofday_sec();
-      /**/
-
-      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);
+
+      /**
       otTimeEnd = mathutil::gettimeofday_sec();
       elapseOt += (double)(otTimeEnd - otTimeStart);
       prTimeStart = mathutil::gettimeofday_sec();
-      /**/
+      **/
 
       showProgressOnTerminal(whichrow, nRow, showProgress, minNRow);
 
-      /******************/
-      //blTimeEnd = clock();
+      /******************
       prTimeEnd = mathutil::gettimeofday_sec();
       elapsePr += (double)(prTimeEnd - prTimeStart);
-      /******************/
+      ******************/
     }
     //--------------------------------
@@ -2711 +2710 @@
     throw;
   }
-  /***************/
-  //totTimeEnd = clock();
+  /***************
   totTimeEnd = mathutil::gettimeofday_sec();
-  //std::cout << "io    : " << elapseIo/CLOCKS_PER_SEC << " (sec.)" << endl;
-  //std::cout << "bl    : " << elapseBl/CLOCKS_PER_SEC << " (sec.)" << endl;
-  //std::cout << "total : " << (double)(totTimeEnd - totTimeStart)/CLOCKS_PER_SEC << " (sec.)" << endl;
   std::cout << "io    : " << elapseIo << " (sec.)" << endl;
   std::cout << "ms    : " << elapseMs << " (sec.)" << endl;
@@ -2724 +2719 @@
   std::cout << "pr    : " << elapsePr << " (sec.)" << endl;
   std::cout << "total : " << (double)(totTimeEnd - totTimeStart) << " (sec.)" << endl;
-  /***************/
+  ***************/
 }
 
 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)
 {
-  /*************
-  clock_t totTimeStart, totTimeEnd, blTimeStart, blTimeEnd, ioTimeStart, ioTimeEnd;
-  double elapseBl = 0.0;
-  double elapseIo = 0.0;
-  totTimeStart = clock();
-  *************/
-
   try {
     ofstream ofs;
@@ -2741 +2729 @@
     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;
     }
@@ -2768 +2758 @@
 
     for (int whichrow = 0; whichrow < nRow; ++whichrow) {
-      /******************
-      ioTimeStart = clock();
-      */
       std::vector<float> sp = getSpectrum(whichrow);
-      /*
-      ioTimeEnd = clock();
-      elapseIo += (double)(ioTimeEnd - ioTimeStart);
-
-      blTimeStart = clock();
-      ******************/
 
       //-------------------------------------------------------
@@ -2797 +2778 @@
         throw(AipsError("Wrong length of edge element"));
       }
-      lineFinder.setData(getSpectrum(whichrow));
+      //lineFinder.setData(getSpectrum(whichrow));
+      lineFinder.setData(sp);
       lineFinder.findLines(getCompositeChanMask(whichrow, mask), currentEdge, whichrow);
       chanMask = lineFinder.getMask();
@@ -2812 +2794 @@
       //
 
-      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);
-
-      /******************
-      blTimeEnd = clock();
-      elapseBl += (double)(blTimeEnd - blTimeStart);
-      ******************/
-
     }
 
@@ -2827 +2803 @@
     throw;
   }
-
-  /***************
-  totTimeEnd = clock();
-  std::cout << "io    : " << elapseIo/CLOCKS_PER_SEC << " (sec.)" << endl;
-  std::cout << "bl    : " << elapseBl/CLOCKS_PER_SEC << " (sec.)" << endl;
-  std::cout << "total : " << (double)(totTimeEnd - totTimeStart)/CLOCKS_PER_SEC << " (sec.)" << endl;
-  ***************/
 }
 
@@ -3268 +3237 @@
     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;
     }
@@ -3320 +3291 @@
       //
 
-      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);
     }
@@ -3338 +3309 @@
     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;
     }
@@ -3401 +3374 @@
       //
 
-      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);
     }
@@ -3705 +3678 @@
 
 /* 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) {
@@ -3715 +3688 @@
     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;
     }
   }
@@ -3724 +3697 @@
 
 /* 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) {
@@ -3750 +3723 @@
     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;
     }
 
@@ -3766 +3739 @@
 
 /* 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) {
@@ -3776 +3749 @@
     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;
     }
   }
@@ -3902 +3875 @@
 
 
-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 "";
 }
 
@@ -3947 +3947 @@
                                             int whichrow, 
                                             bool verbose, 
+                                            bool csvformat, 
                                             int start, int count,
                                             bool resetparamid) const
@@ -3957 +3958 @@
 
     ostringstream oss;
-    oss << formatBaselineParamsHeader(whichrow, masklist, verbose);
+    oss << formatBaselineParamsHeader(whichrow, masklist, verbose, csvformat);
 
     if (start < 0) start = 0;
@@ -3970 +3971 @@
       }
       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);
@@ -3981 +3988 @@
 }
 
-  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());
@@ -3989 +3996 @@
     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");
@@ -3999 +4006 @@
 
     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);

trunk/src/Scantable.h

@@ -580 +580 @@
                                    int whichrow, 
                                    bool verbose=false,
+                                   bool csvformat=false,
                                    int start=-1,
                                    int count=-1,
@@ -590 +591 @@
                                             const std::string& masklist, 
                                             int whichrow, 
-                                            bool verbose=false) const;
+                                            bool verbose=false,
+                                            bool csvformat=false) const;
   std::vector<uint> getMoleculeIdColumnData() const;
   void setMoleculeIdColumnData(const std::vector<uint>& molids);
@@ -757 +759 @@
                                 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);

trunk/src/ScantableWrapper.h

@@ -298 +298 @@
   { 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