Changeset 2774 for trunk

Timestamp:

02/25/13 17:35:27 (12 years ago)

Author:

WataruKawasaki

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s): sd

Description: fixed a bug in Scantable::getCompositeChanMask().

Location:

trunk/src

Files:

• STLineFinder.cpp (modified) (2 diffs)
• Scantable.cpp (modified) (13 diffs)

trunk/src/STLineFinder.cpp

@@ -1006 +1006 @@
                throw AipsError("STLineFinder::findLines - the in_edge parameter has a negative"
                                 "number of channels to drop");
-           if (edge.first>=int(nchan))
+           if (edge.first>=int(nchan)) {
                throw AipsError("STLineFinder::findLines - all channels are rejected by the in_edge parameter");
+           }
            if (in_edge.size()==2) {
                edge.second=in_edge[1];
@@ -1015 +1016 @@
                edge.second=nchan-edge.second;
            } else edge.second=nchan-edge.first;
-           if (edge.second<0 || (edge.first>=edge.second))
+           if (edge.second<0 || (edge.first>=edge.second)) {
                throw AipsError("STLineFinder::findLines - all channels are rejected by the in_edge parameter");
+           }
        }
 

trunk/src/Scantable.cpp

@@ -2641 +2641 @@
 }
 
-  std::vector<float> Scantable::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)
-{
-  //--- replacing mask with (mask AND mask_linefinder).
+std::vector<float> Scantable::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)
+{
   if (uself) {
     STLineFinder lineFinder = STLineFinder();
-    lineFinder.setOptions(lfth, 3, lfavg);
-
-    int minEdgeSize = getIFNos().size()*2;
-    int edgeSize = lfedge.size();
+    initLineFinder(lfedge, lfth, lfavg, lineFinder);
     std::vector<int> currentEdge;
-    currentEdge.clear();
-    if (edgeSize >= 2) {
-      int idx = 0;
-      if (edgeSize > 2) {
-        if (edgeSize < minEdgeSize) {
-          throw(AipsError("Length of edge element info is less than that of IFs"));
-        }
-        idx = 2 * getIF(irow);
-      }
-      currentEdge.push_back(lfedge[idx]);
-      currentEdge.push_back(lfedge[idx+1]);
-    } else {
-      throw(AipsError("Wrong length of edge element"));
-    }
-    lineFinder.setData(spec);
-    lineFinder.findLines(getCompositeChanMask(irow, mask), currentEdge, irow);
-
-    std::vector<bool> lfcompmask = lineFinder.getMask();
-    mask.clear();
-    mask.resize(lfcompmask.size());
-    for (uInt i = 0; i < mask.size(); ++i) {
-      mask[i] = lfcompmask[i];
-    }
-  }
-  //---
+    mask = getCompositeChanMask(irow, mask, lfedge, currentEdge, lineFinder);
+  }
 
   std::vector<float> res;
@@ -2933 +2906 @@
                                STLineFinder& lineFinder)
 {
-  if (edge.size() < getIFNos().size()*2) {
+  if ((edge.size() > 2) && (edge.size() < getIFNos().size()*2)) {
     throw(AipsError("Length of edge element info is less than that of IFs"));
   }
@@ -2947 +2920 @@
                              const std::string& bltable)
 {
-  /****/
+  /****
   double TimeStart = mathutil::gettimeofday_sec();
-  /****/
+  ****/
 
   try {
@@ -3007 +2980 @@
   }
 
-  /****/
+  /****
   double TimeEnd = mathutil::gettimeofday_sec();
   double elapse1 = TimeEnd - TimeStart;
   std::cout << "poly-new   : " << elapse1 << " (sec.)" << endl;
-  /****/
+  ****/
 }
 
@@ -3091 +3064 @@
                                   const std::string& bltable)
 {
-  //
+  /*
   double TimeStart = mathutil::gettimeofday_sec();
-  //
+  */
 
   try {
@@ -3151 +3124 @@
   }
 
+  /*
   double TimeEnd = mathutil::gettimeofday_sec();
   double elapse1 = TimeEnd - TimeStart;
   std::cout << "cheby   : " << elapse1 << " (sec.)" << endl;
+  */
 }
 
@@ -3226 +3201 @@
 }
 
-double Scantable::calculateModelSelectionCriteria(const std::string& valname, const std::string& blfunc, int order, const std::vector<bool>& inMask, int whichrow, bool useLineFinder, const std::vector<int>& edge, float threshold, int chanAvgLimit)
+double Scantable::calculateModelSelectionCriteria(const std::string& valname, 
+                                                  const std::string& blfunc, 
+                                                  int order, 
+                                                  const std::vector<bool>& inMask, 
+                                                  int whichrow, 
+                                                  bool useLineFinder, 
+                                                  const std::vector<int>& edge, 
+                                                  float threshold, 
+                                                  int chanAvgLimit)
 {
   std::vector<float> sp = getSpectrum(whichrow);
@@ -3233 +3216 @@
 
   if (useLineFinder) {
-    int minEdgeSize = getIFNos().size()*2;
-
-    int edgeSize = edge.size();
+    STLineFinder lineFinder = STLineFinder();
+    initLineFinder(edge, threshold, chanAvgLimit, lineFinder);
     std::vector<int> currentEdge;
-    currentEdge.clear();
-    if (edgeSize >= 2) {
-      int idx = 0;
-      if (edgeSize > 2) {
-        if (edgeSize < minEdgeSize) {
-          throw(AipsError("Length of edge element info is less than that of IFs"));
-        }
-        idx = 2 * getIF(whichrow);
-      }
-      currentEdge.push_back(edge[idx]);
-      currentEdge.push_back(edge[idx+1]);
-    } else {
-      throw(AipsError("Wrong length of edge element"));
-    }
-
-    STLineFinder lineFinder = STLineFinder();
-    lineFinder.setData(sp);
-    lineFinder.setOptions(threshold, 3, chanAvgLimit);
-    lineFinder.findLines(getCompositeChanMask(whichrow, inMask), currentEdge, whichrow);
-    chanMask = lineFinder.getMask();
-
+    chanMask = getCompositeChanMask(whichrow, inMask, edge, currentEdge, lineFinder);
   } else {
-
     chanMask = getCompositeChanMask(whichrow, inMask);
   }
@@ -3735 +3696 @@
                                     const std::string& bltable)
 {
-  /****/
+  /****
   double TimeStart = mathutil::gettimeofday_sec();
-  /****/
+  ****/
 
   try {
@@ -3796 +3757 @@
   }
 
-  /****/
+  /****
   double TimeEnd = mathutil::gettimeofday_sec();
   double elapse1 = TimeEnd - TimeStart;
   std::cout << "cspline-new   : " << elapse1 << " (sec.)" << endl;
-  /****/
+  ****/
 }
 
@@ -4445 +4406 @@
                                  const std::string& bltable)
 {
-  /****/
+  /****
   double TimeStart = mathutil::gettimeofday_sec();
-  /****/
+  ****/
 
   try {
@@ -4518 +4479 @@
   }
 
-  /****/
+  /****
   double TimeEnd = mathutil::gettimeofday_sec();
   double elapse1 = TimeEnd - TimeStart;
   std::cout << "sinusoid-old   : " << elapse1 << " (sec.)" << endl;
-  /****/
+  ****/
 }
 
@@ -4744 +4705 @@
 {
   std::vector<uint> ifNos = getIFNos();
-  if (edge.size() < ifNos.size()*2) {
+  if ((edge.size() > 2) && (edge.size() < ifNos.size()*2)) {
     throw(AipsError("Length of edge element info is less than that of IFs"));
   }
 
-  int ifVal = getIF(whichrow);
-  bool foundIF = false;
-  uint idx;
-  for (uint i = 0; i < ifNos.size(); ++i) {
-    if (ifVal == (int)ifNos[i]) {
-      idx = 2*i;
-      foundIF = true;
-      break;
-    }
-  }
-  if (!foundIF) {
-    throw(AipsError("bad IF number"));
+  uint idx = 0;
+  if (edge.size() > 2) {
+    int ifVal = getIF(whichrow);
+    bool foundIF = false;
+    for (uint i = 0; i < ifNos.size(); ++i) {
+      if (ifVal == (int)ifNos[i]) {
+        idx = 2*i;
+        foundIF = true;
+        break;
+      }
+    }
+    if (!foundIF) {
+      throw(AipsError("bad IF number"));
+    }
   }