Changeset 924 for trunk

Timestamp:

03/24/06 13:33:17 (18 years ago)

Author:

mar637

Message:

fix for incorrect use of Scantable::nchan. Fix for std::vector / casa::Vector conusion

File:

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

trunk/src/STLineFinder.cpp

@@ -192 +192 @@
    void processCurLine(const casa::Vector<casa::Bool> &mask)
                                                  throw(casa::AipsError);
-   
+
    // get the sign of runningBox->aboveMean(). The RunningBox pointer
    // should be defined
@@ -519 +519 @@
            // os<<ch<<" "<<spectrum[ch]<<" "<<fabs(running_box->aboveMean())<<" "<<
            //   threshold*offline_variance<<endl;
-           
+
            const Float buf=running_box->aboveMean();
            if (buf>0) signs[ch]=1;
@@ -670 +670 @@
   scan=in_scan.getCP();
   AlwaysAssert(!scan.null(),AipsError);
- 
+
 }
 
@@ -688 +688 @@
       throw AipsError("STLineFinder::findLines - a scan should be set first,"
                       " use set_scan");
-  
+
+  uInt nchan = scan->nchan(scan->getIF(whichRow));
   // set up mask and edge rejection
-  mask=in_mask;
-  if (mask.nelements()!=scan->nchan(whichRow))
+  // no mask given...
+  if (in_mask.size() == 0) {
+    mask = Vector<Bool>(nchan,True);
+  } else {
+    // use provided mask
+    mask=Vector<Bool>(in_mask);
+  }
+  if (mask.nelements()!=nchan)
       throw AipsError("STLineFinder::findLines - in_scan and in_mask have different"
             "number of spectral channels.");
-
+  cout << mask.nelements() << endl;
   // number of elements in in_edge
   if (in_edge.size()>2)
@@ -702 +709 @@
            // all spectra, no rejection
            edge.first=0;
-           edge.second=scan->nchan(whichRow);
+           edge.second=nchan;
       } else {
            edge.first=in_edge[0];
@@ -708 +715 @@
                throw AipsError("STLineFinder::findLines - the in_edge parameter has a negative"
                                 "number of channels to drop");
-           if (edge.first>=scan->nchan(whichRow))
+           if (edge.first>=nchan)
                throw AipsError("STLineFinder::findLines - all channels are rejected by the in_edge parameter");
            if (in_edge.size()==2) {
@@ -715 +722 @@
                    throw AipsError("STLineFinder::findLines - the in_edge parameter has a negative"
                                    "number of channels to drop");
-               edge.second=scan->nchan(whichRow)-edge.second;
-           } else edge.second=scan->nchan(whichRow)-edge.first;
+               edge.second=nchan-edge.second;
+           } else edge.second=nchan-edge.first;
            if (edge.second<0 || (edge.first>=edge.second))
                throw AipsError("STLineFinder::findLines - all channels are rejected by the in_edge parameter");
        }
-     
+
   //
-  int max_box_nchan=int(scan->nchan(whichRow)*box_size); // number of channels in running
+  int max_box_nchan=int(nchan*box_size); // number of channels in running
                                                  // box
   if (max_box_nchan<2)
@@ -856 +863 @@
            throw AipsError("STLineFinder::getMask - a scan should be set first,"
                       " use set_scan followed by find_lines");
-       DebugAssert(mask.nelements()==scan->nchan(last_row_used), AipsError);
+       DebugAssert(mask.nelements()==scan->getChannels(last_row_used), AipsError);
        /*
        if (!lines.size())
@@ -915 +922 @@
            throw AipsError("STLineFinder::getLineRangesInChannels - a scan should be set first,"
                       " use set_scan followed by find_lines");
-       DebugAssert(mask.nelements()==scan->nchan(last_row_used), AipsError);
+       DebugAssert(mask.nelements()==scan->getChannels(last_row_used), AipsError);
 
        if (!lines.size())