Changeset 370 for trunk/src

Timestamp:

02/06/05 19:46:16 (19 years ago)

Author:

vor010

Message:

LineFinder?: help is improved. Initial code for
automatic baseline fitter is written (not debugged yet)

Location:

trunk/src

Files:

• SDLineFinder.cc (modified) (5 diffs)
• SDLineFinder.h (modified) (3 diffs)
• python_SDLineFinder.cc (modified) (1 diff)

trunk/src/SDLineFinder.cc

@@ -673 +673 @@
 
 // search for spectral lines. Number of lines found is returned
-int SDLineFinder::findLines() throw(casa::AipsError)
+int SDLineFinder::findLines(const casa::uInt &whichRow) throw(casa::AipsError)
 { 
   const int minboxnchan=4;
@@ -685 +685 @@
       throw AipsError("SDLineFinder::findLines - box_size is too small");
 
-  scan->getSpectrum(spectrum);
+  scan->getSpectrum(spectrum, whichRow);
 
   lines.resize(0); // search from the scratch
+  last_row_used=whichRow;
   Vector<Bool> temp_mask(mask);
 
@@ -828 +829 @@
 }
 
-// get range for all lines found. If defunits is true (default), the
-// same units as used in the scan will be returned (e.g. velocity
-// instead of channels). If defunits is false, channels will be returned
-std::vector<int> SDLineFinder::getLineRanges(bool defunits)
+// get range for all lines found. The same units as used in the scan
+// will be returned (e.g. velocity instead of channels).
+std::vector<double> SDLineFinder::getLineRanges()
                              const throw(casa::AipsError)
+{
+  // convert to required abscissa units
+  std::vector<double> vel=scan->getAbcissa(last_row_used);
+  std::vector<int> ranges=getLineRangesInChannels();
+  std::vector<double> res(ranges.size());
+
+  std::vector<int>::const_iterator cri=ranges.begin();
+  std::vector<double>::iterator outi=res.begin();
+  for (;cri!=ranges.end() && outi!=res.end();++cri,++outi)
+       if (uInt(*cri)>=vel.size())
+          throw AipsError("SDLineFinder::getLineRanges - getAbcissa provided less channels than reqired");
+       else *outi=vel[*cri];
+  return res;
+}
+
+// The same as getLineRanges, but channels are always used to specify
+// the range
+std::vector<int> SDLineFinder::getLineRangesInChannels()
+                                   const throw(casa::AipsError)
 {
   try {
        if (scan.null())
-           throw AipsError("SDLineFinder::getLineRanges - a scan should be set first,"
+           throw AipsError("SDLineFinder::getLineRangesInChannels - a scan should be set first,"
                       " use set_scan followed by find_lines");
        DebugAssert(mask.nelements()==scan->nChan(), AipsError);
        
        if (!lines.size())
-           throw AipsError("SDLineFinder::getLineRanges - one have to search for "
+           throw AipsError("SDLineFinder::getLineRangesInChannels - one have to search for "
                            "lines first, use find_lines");
                            
-       // temporary
-       if (defunits)
-           throw AipsError("SDLineFinder::getLineRanges - sorry, defunits=true have not "
-                           "yet been implemented");
-       //
        std::vector<int> res(2*lines.size());
        // iterator through lines & result
@@ -857 +871 @@
             if (++ri!=res.end()) 
                 *ri=cli->second-1;          
-       }
+       }       
        return res;
   }
@@ -867 +881 @@
   }
 }
+
+
 
 // an auxiliary function to remove all lines from the list, except the

trunk/src/SDLineFinder.h

@@ -169 +169 @@
                 const boost::python::tuple &in_edge) throw(casa::AipsError);
 
-   // search for spectral lines. Number of lines found is returned
-   int findLines() throw(casa::AipsError);
+   // search for spectral lines for a row specified by whichRow and
+   // Beam/IF/Pol specified by current cursor set for the scantable
+   // Number of lines found is returned   
+   int findLines(const casa::uInt &whichRow = 0) throw(casa::AipsError);
 
    // get the mask to mask out all lines that have been found (default)
@@ -179 +181 @@
    std::vector<bool> getMask(bool invert=false) const throw(casa::AipsError);
 
-   // get range for all lines found. If defunits is true (default), the
-   // same units as used in the scan will be returned (e.g. velocity
-   // instead of channels). If defunits is false, channels will be returned
-   std::vector<int>   getLineRanges(bool defunits=true)
-                                const throw(casa::AipsError);
+   // get range for all lines found. The same units as used in the scan
+   // will be returned (e.g. velocity instead of channels).   
+   std::vector<double>   getLineRanges() const throw(casa::AipsError);
+   // The same as getLineRanges, but channels are always used to specify
+   // the range
+   std::vector<int> getLineRangesInChannels() const throw(casa::AipsError);
 protected:
    // auxiliary function to average adjacent channels and update the mask
@@ -236 +239 @@
                                            // adjacent channels to search
                                            // for broad lines. see setOptions
+   casa::uInt last_row_used;                // the Row number specified
+                                           // during the last findLines call
    std::list<std::pair<int, int> > lines;  // container of start and stop+1
                                            // channels of the spectral lines

trunk/src/python_SDLineFinder.cc

@@ -45 +45 @@
          .def("getmask",&SDLineFinder::getMask)
          .def("getlineranges",&SDLineFinder::getLineRanges)
+         .def("getlinerangesinchannels",&SDLineFinder::getLineRangesInChannels)
        ;
      };