Changeset 2095 for branches/casa-prerelease/pre-asap/src

Timestamp:

04/01/11 21:43:18 (14 years ago)

Author:

WataruKawasaki

Message:

merged from bug fixes from trunk (r2093)

Location:

branches/casa-prerelease/pre-asap

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/SConscript (modified) (1 prop)
• src/Scantable.cpp (modified) (14 diffs)
• src/Scantable.h (modified) (6 diffs)
• src/ScantableWrapper.h (modified) (1 diff)

branches/casa-prerelease/pre-asap/src/Scantable.cpp

@@ -1761 +1761 @@
 }
 
-void Scantable::polyBaseline(const std::vector<bool>& mask, int order, bool outLogger, const std::string& blfile)
+void Scantable::polyBaseline(const std::vector<bool>& mask, int order, bool getResidual, bool outLogger, const std::string& blfile)
 {
   ofstream ofs;
@@ -1789 +1789 @@
     chanMask = getCompositeChanMask(whichrow, mask);
     fitBaseline(chanMask, whichrow, fitter);
-    setSpectrum(fitter.getResidual(), whichrow);
+    setSpectrum((getResidual ? fitter.getResidual() : fitter.getFit()), whichrow);
     outputFittingResult(outLogger, outTextFile, chanMask, whichrow, coordInfo, hasSameNchan, ofs, "polyBaseline()", fitter);
   }
@@ -1796 +1796 @@
 }
 
-void Scantable::autoPolyBaseline(const std::vector<bool>& mask, int order, const std::vector<int>& edge, float threshold, int chanAvgLimit, 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, bool outLogger, const std::string& blfile)
 {
   ofstream ofs;
@@ -1850 +1850 @@
 
     fitBaseline(chanMask, whichrow, fitter);
-    setSpectrum(fitter.getResidual(), whichrow);
+    setSpectrum((getResidual ? fitter.getResidual() : fitter.getFit()), whichrow);
 
     outputFittingResult(outLogger, outTextFile, chanMask, whichrow, coordInfo, hasSameNchan, ofs, "autoPolyBaseline()", fitter);
@@ -1858 +1858 @@
 }
 
-void Scantable::cubicSplineBaseline(const std::vector<bool>& mask, int nPiece, float thresClip, int nIterClip, bool outLogger, const std::string& blfile)
+void Scantable::cubicSplineBaseline(const std::vector<bool>& mask, int nPiece, float thresClip, int nIterClip, bool getResidual, bool outLogger, const std::string& blfile)
 {
   ofstream ofs;
@@ -1886 +1886 @@
     chanMask = getCompositeChanMask(whichrow, mask);
     //fitBaseline(chanMask, whichrow, fitter);
-    //setSpectrum(fitter.getResidual(), whichrow);
+    //setSpectrum((getResidual ? fitter.getResidual() : fitter.getFit()), whichrow);
     std::vector<int> pieceEdges;
     std::vector<float> params;
-    std::vector<float> res = doCubicSplineFitting(getSpectrum(whichrow), chanMask, nPiece, pieceEdges, params, thresClip, nIterClip, true);
+    std::vector<float> res = doCubicSplineFitting(getSpectrum(whichrow), chanMask, nPiece, pieceEdges, params, thresClip, nIterClip, getResidual);
     setSpectrum(res, whichrow);
     //
@@ -1899 +1899 @@
 }
 
-void Scantable::autoCubicSplineBaseline(const std::vector<bool>& mask, int nPiece, float thresClip, int nIterClip, const std::vector<int>& edge, float threshold, int chanAvgLimit, 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, bool outLogger, const std::string& blfile)
 {
   ofstream ofs;
@@ -1954 +1954 @@
 
     //fitBaseline(chanMask, whichrow, fitter);
-    //setSpectrum(fitter.getResidual(), whichrow);
+    //setSpectrum((getResidual ? fitter.getResidual() : fitter.getFit()), whichrow);
     std::vector<int> pieceEdges;
     std::vector<float> params;
-    std::vector<float> res = doCubicSplineFitting(getSpectrum(whichrow), chanMask, nPiece, pieceEdges, params, thresClip, nIterClip, true);
+    std::vector<float> res = doCubicSplineFitting(getSpectrum(whichrow), chanMask, nPiece, pieceEdges, params, thresClip, nIterClip, getResidual);
     setSpectrum(res, whichrow);
     //
@@ -1973 +1973 @@
   }
   if (nPiece < 1) {
-    throw(AipsError("wrong number of the sections for fitting"));
+    throw(AipsError("number of the sections must be one or more"));
   }
 
@@ -2215 +2215 @@
     chanMask = getCompositeChanMask(whichrow, mask);
     //fitBaseline(chanMask, whichrow, fitter);
-    //setSpectrum(fitter.getResidual(), whichrow);
+    //setSpectrum((getResidual ? fitter.getResidual() : fitter.getFit()), whichrow);
     std::vector<float> params;
-    //std::vector<float> res = doSinusoidFitting(getSpectrum(whichrow), chanMask, nWaves, params, thresClip, nIterClip, true);
     std::vector<float> res = doSinusoidFitting(getSpectrum(whichrow), chanMask, nWaves, maxWaveLength, params, thresClip, nIterClip, getResidual);
     setSpectrum(res, whichrow);
@@ -2283 +2282 @@
 
     //fitBaseline(chanMask, whichrow, fitter);
-    //setSpectrum(fitter.getResidual(), whichrow);
+    //setSpectrum((getResidual ? fitter.getResidual() : fitter.getFit()), whichrow);
     std::vector<float> params;
     std::vector<float> res = doSinusoidFitting(getSpectrum(whichrow), chanMask, nWaves, maxWaveLength, params, thresClip, nIterClip, getResidual);
@@ -2335 +2334 @@
 
   const double PI = 6.0 * asin(0.5); // PI (= 3.141592653...)
-  double baseXFactor = 2.0*PI/(double)maxWaveLength/(double)(nChan-1);  //the denominator (nChan-1) should be changed to (xdata[nChan-1]-xdata[0]) for accepting x-values given in velocity or frequency when this function is moved to fitter.
+  double baseXFactor = 2.0*PI/(double)maxWaveLength/(double)(nChan-1);  //the denominator (nChan-1) should be changed to (xdata[nChan-1]-xdata[0]) for accepting x-values given in velocity or frequency when this function is moved to fitter. (2011/03/30 WK)
 
   // xArray : contains elemental values for computing the least-square matrix. 
@@ -2635 +2634 @@
 
   if (verbose) {
-    for (int i = 0; i < 60; ++i) {
-      oss << "-";
-    }
-    oss << endl;
     oss <<  " Scan[" << getScan(whichrow)  << "]";
     oss <<  " Beam[" << getBeam(whichrow)  << "]";
@@ -2659 +2654 @@
     oss << "Results of baseline fit" << endl;
     oss << "  rms = " << setprecision(6) << rms << endl;
+    for (int i = 0; i < 60; ++i) {
+      oss << "-";
+    }
+    oss << flush;
   }
 

branches/casa-prerelease/pre-asap/src/Scantable.h

@@ -497 +497 @@
   void polyBaseline(const std::vector<bool>& mask, 
                     int order, 
+                    bool getResidual=true,
                     bool outLogger=false, 
                     const std::string& blfile="");
@@ -504 +505 @@
                         float threshold=3.0, 
                         int chanAvgLimit=1, 
+                        bool getResidual=true,
                         bool outLogger=false, 
                         const std::string& blfile="");
@@ -510 +512 @@
                            float thresClip, 
                            int nIterClip,
+                           bool getResidual=true,
                            bool outLogger=false,
                            const std::string& blfile="");
@@ -519 +522 @@
                                float threshold=3.0, 
                                int chanAvgLimit=1, 
+                               bool getResidual=true,
                                bool outLogger=false, 
                                const std::string& blfile="");
@@ -679 +683 @@
                                           float thresClip=3.0, 
                                           int nIterClip=1,
-                                          bool getResidual=false);
+                                          bool getResidual=true);
   std::vector<float> doSinusoidFitting(const std::vector<float>& data, 
                                        const std::vector<bool>& mask,
@@ -687 +691 @@
                                        float thresClip=3.0, 
                                        int nIterClip=1,
-                                       bool getResidual=false);
+                                       bool getResidual=true);
   bool hasSameNchanOverIFs();
   std::string getMaskRangeList(const std::vector<bool>& mask, 

branches/casa-prerelease/pre-asap/src/ScantableWrapper.h

@@ -257 +257 @@
   { table_->reshapeSpectrum( nmin, nmax ); }
 
-  void polyBaseline(const std::vector<bool>& mask, int order, bool outlog=false, const std::string& blfile="")
-  { table_->polyBaseline(mask, order, 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 outlog=false, const std::string& blfile="")
-  { table_->autoPolyBaseline(mask, order, edge, threshold, chan_avg_limit, outlog, blfile); }
-
-  void cubicSplineBaseline(const std::vector<bool>& mask, int npiece, float clipthresh, int clipniter, bool outlog=false, const std::string& blfile="")
-  { table_->cubicSplineBaseline(mask, npiece, clipthresh, clipniter, 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 outlog=false, const std::string& blfile="")
-  { table_->autoCubicSplineBaseline(mask, npiece, clipthresh, clipniter, edge, threshold, chan_avg_limit, outlog, blfile); }
+  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 std::vector<int>& nwave, float maxwavelength, float clipthresh, int clipniter, bool getresidual=true, bool outlog=false, const std::string& blfile="")