Changeset 1641 for trunk

Timestamp:

10/02/09 15:34:14 (15 years ago)

Author:

Max Voronkov

Message:

fixed ticket:174 - flagging information is now taken into account

File:

• trunk/src/STLineFinder.cpp (modified) (3 diffs)

trunk/src/STLineFinder.cpp

@@ -474 +474 @@
       running_box=new RunningBox(spectrum,mask,edge,max_box_nchan);
 
-
       // determine the off-line variance first
       // an assumption made: lines occupy a small part of the spectrum
@@ -516 +515 @@
 
            signs[ch]=getAboveMeanSign();
-           // os<<ch<<" "<<spectrum[ch]<<" "<<fabs(running_box->aboveMean())<<" "<<
-           // threshold*offline_variance<<endl;
-
-           const Float buf=running_box->aboveMean();
-           if (buf>0) signs[ch]=1;
-           else if (buf<0) signs[ch]=-1;
-           else if (buf==0) signs[ch]=0;
-           //os<<ch<<" "<<spectrum[ch]<<" "<<running_box->getLinMean()<<" "<<
-           //             threshold*offline_variance<<endl;
+            //os<<ch<<" "<<spectrum[ch]<<" "<<fabs(running_box->aboveMean())<<" "<<
+            //threshold*offline_variance<<endl;
       }
       if (lines.size())
@@ -700 +692 @@
       throw AipsError("STLineFinder::findLines - in_scan and in_mask have different"
             "number of spectral channels.");
+
+  // taking flagged channels into account
+  vector<bool> flaggedChannels = scan->getMask(whichRow);
+  if (flaggedChannels.size()) {
+      // there is a mask set for this row
+      if (flaggedChannels.size() != mask.nelements()) {
+          throw AipsError("STLineFinder::findLines - internal inconsistency: number of mask elements do not match the number of channels");
+      }
+      for (size_t ch = 0; ch<mask.nelements(); ++ch) {
+           mask[ch] &= flaggedChannels[ch];
+      }
+  }
+
   // number of elements in in_edge
   if (in_edge.size()>2)