Changeset 3048 for trunk

Timestamp:

08/25/15 19:56:55 (9 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: Yes (CAS-6572)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: Added a parameter to define rowid to Scantable::doApplyBaselineTable.

Test Programs:

Put in Release Notes: No

Module(s): sdbaseline2

Description: A bug fix in mask definition.

Location:

trunk/src

Files:

• Scantable.cpp (modified) (3 diffs)
• Scantable.h (modified) (1 diff)

trunk/src/Scantable.cpp

@@ -12 +12 @@
 #include <map>
 #include <sys/time.h>
+#include <iostream>
 
 #include <atnf/PKSIO/SrcType.h>
@@ -2608 +2609 @@
       std::vector<float> params;
       float rms;
-      std::vector<float> resfit = doApplyBaselineTable(spec, mask, ftype, fpar, params, rms);
+      std::vector<float> resfit = doApplyBaselineTable(spec, mask, ftype, fpar, params, rms, whichrow);
       setSpectrum(resfit, whichrow);
 
@@ -2743 +2744 @@
 }
 
-std::vector<float> Scantable::doApplyBaselineTable(std::vector<float>& spec, 
-                                                   std::vector<bool>& mask, 
-                                                   const STBaselineFunc::FuncName ftype, 
+std::vector<float> Scantable::doApplyBaselineTable(std::vector<float>& spec,
+                                                   std::vector<bool>& mask,
+                                                   const STBaselineFunc::FuncName ftype,
                                                    std::vector<int>& fpar, 
                                                    std::vector<float>& params, 
-                                                   float&rms)
+                                                   float&rms,
+                                                   int irow)
 {
   std::vector<bool> finalmask;
   std::vector<int> lfedge;
-  return doSubtractBaseline(spec, mask, ftype, fpar, params, rms, finalmask, 0.0, 0, false, 0, 0.0, lfedge, 0);
+  return doSubtractBaseline(spec, mask, ftype, fpar, params, rms, finalmask, 0.0, 0, false, irow, 0.0, lfedge, 0);
 }
 

trunk/src/Scantable.h

@@ -991 +991 @@
   std::string packFittingResults(const int irow, const std::vector<float>& params, const float rms);
   void parseBlInfo(const std::string& blInfo, int& whichrow, STBaselineFunc::FuncName& ftype, std::vector<int>& fpar, std::vector<bool>& mask, float& thresClip, int& nIterClip, bool& useLineFinder, float& thresLF, std::vector<int>& edgeLF, int& avgLF);
- std::vector<float> doApplyBaselineTable(std::vector<float>& spec, std::vector<bool>& mask, const STBaselineFunc::FuncName ftype, std::vector<int>& fpar, std::vector<float>& params, float&rms);
+  std::vector<float> doApplyBaselineTable(std::vector<float>& spec, std::vector<bool>& mask, const STBaselineFunc::FuncName ftype, std::vector<int>& fpar, std::vector<float>& params, float&rms, int irow);
  std::vector<float> doSubtractBaseline(std::vector<float>& spec, std::vector<bool>& mask, const STBaselineFunc::FuncName ftype, std::vector<int>& fpar, std::vector<float>& params, float&rms, std::vector<bool>& finalmask, float clipth, int clipn, bool uself, int irow, float lfth, std::vector<int>& lfedge, int lfavg);