Changeset 2811 for trunk

Timestamp:

04/12/13 10:32: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: add a new parameter 'retfitres' to sd.scantable.apply_bltable() and sd.scantable.sub_baseline().

Location:

trunk/src

Files:

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

trunk/src/Scantable.cpp

@@ -2490 +2490 @@
 }
 
-std::vector<std::string> Scantable::applyBaselineTable(const std::string& bltable, const std::string& outbltable, const bool outbltableexists, const bool overwrite)
+std::vector<std::string> Scantable::applyBaselineTable(const std::string& bltable, const bool returnfitresult, const std::string& outbltable, const bool outbltableexists, const bool overwrite)
 {
   STBaselineTable btin = STBaselineTable(bltable);
@@ -2520 +2520 @@
       float rms;
       std::vector<float> resfit = doApplyBaselineTable(spec, mask, ftype, fpar, params, rms);
-
       setSpectrum(resfit, whichrow);
 
-      res.push_back(packFittingResults(whichrow, params, rms));
+      if (returnfitresult) {
+        res.push_back(packFittingResults(whichrow, params, rms));
+      }
 
       if (outBaselineTable) {
@@ -2556 +2557 @@
 }
 
-std::vector<std::string> Scantable::subBaseline(const std::vector<std::string>& blInfoList, const std::string& outbltable, const bool outbltableexists, const bool overwrite)
+std::vector<std::string> Scantable::subBaseline(const std::vector<std::string>& blInfoList, const bool returnfitresult, const std::string& outbltable, const bool outbltableexists, const bool overwrite)
 {
   int nRowBl = blInfoList.size();
@@ -2602 +2603 @@
       std::vector<float> resfit = doSubtractBaseline(spec, mask, ftype, fpar, params, rms, finalmask, clipth, clipn, uself, irow, lfth, lfedge, lfavg);
       setSpectrum(resfit, irow);
-      res.push_back(packFittingResults(irow, params, rms));
+
+      if (returnfitresult) {
+        res.push_back(packFittingResults(irow, params, rms));
+      }
 
       if (outBaselineTable) {

trunk/src/Scantable.h

@@ -511 +511 @@
   bool getFlagtraFast(casa::uInt whichrow);
 
-  std::vector<std::string> applyBaselineTable(const std::string& bltable, const std::string& outbltable, const bool outbltableexists, const bool overwrite);
-  std::vector<std::string> subBaseline(const std::vector<std::string>& blInfoList, const std::string& outbltable, const bool outbltableexists, const bool overwrite);
+  std::vector<std::string> applyBaselineTable(const std::string& bltable, 
+                                              const bool returnfitresult, 
+                                              const std::string& outbltable, 
+                                              const bool outbltableexists, 
+                                              const bool overwrite);
+  std::vector<std::string> subBaseline(const std::vector<std::string>& blInfoList, 
+                                       const bool returnfitresult, 
+                                       const std::string& outbltable, 
+                                       const bool outbltableexists, 
+                                       const bool overwrite);
   void polyBaseline(const std::vector<bool>& mask,
                     int order,

trunk/src/ScantableWrapper.h

@@ -281 +281 @@
   { table_->regridSpecChannel( dnu, nchan ); }
 
-  std::vector<std::string> applyBaselineTable(const std::string& bltable, const std::string& outbltable, const bool outbltableexists, const bool overwrite)
-  { return table_->applyBaselineTable(bltable, outbltable, outbltableexists, overwrite); }
-  std::vector<std::string> subBaseline(const std::vector<std::string>& blinfo, const std::string& outbltable, const bool outbltableexists, const bool overwrite)
-  { return table_->subBaseline(blinfo, outbltable, outbltableexists, overwrite); }
+  std::vector<std::string> applyBaselineTable(const std::string& bltable, const bool returnfitresult, const std::string& outbltable, const bool outbltableexists, const bool overwrite)
+  { return table_->applyBaselineTable(bltable, returnfitresult, outbltable, outbltableexists, overwrite); }
+  std::vector<std::string> subBaseline(const std::vector<std::string>& blinfo, const bool returnfitresult, const std::string& outbltable, const bool outbltableexists, const bool overwrite)
+  { return table_->subBaseline(blinfo, returnfitresult, outbltable, outbltableexists, overwrite); }
   void polyBaseline(const std::vector<bool>& mask, int order, float clipthresh, int clipniter, bool getresidual=true, const std::string& showprogress="true,1000", const bool outlog=false, const std::string& blfile="", const std::string& bltable="")
   { table_->polyBaseline(mask, order, clipthresh, clipniter, getresidual, showprogress, outlog, blfile, bltable); }