Changeset 3029 for trunk/src/STLineFinder.h

Timestamp:

03/03/15 18:26:31 (9 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: Yes (CAS-6929)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s): asap as a whole

Description: committing Darrell's changes to make asap work with merged casacore.

File:

• trunk/src/STLineFinder.h (modified) (12 diffs)

trunk/src/STLineFinder.h

@@ -62 +62 @@
    // the new line
    static void addNewSearchResult(const std::list<std::pair<int, int> >
-                  &newlines, std::list<std::pair<int, int> > &lines_list)
-                           throw(casa::AipsError);
+                  &newlines, std::list<std::pair<int, int> > &lines_list);
 
    // extend all line ranges to the point where a value stored in the
@@ -73 +72 @@
                        const casa::Vector<casa::Int> &signs,
                        const casa::Vector<casa::Bool> &mask,
-                       const std::pair<int,int> &edge)
-                           throw(casa::AipsError);
+                       const std::pair<int,int> &edge);
 protected:
 
@@ -86 +84 @@
         // return true if line2 intersects with line1 with at least one
         // common channel, and false otherwise
-        bool operator()(const std::pair<int,int> &line2) const throw();
+        bool operator()(const std::pair<int,int> &line2) const;
    };
 
@@ -98 +96 @@
         // update temp_line with a union of temp_line and new_line
         // provided there is no gap between the lines
-        void operator()(const std::pair<int,int> &new_line) throw();
+        void operator()(const std::pair<int,int> &new_line);
         // return the result (temp_line)
-        const std::pair<int,int>& result() const throw();
+        const std::pair<int,int>& result() const;
    };
 
@@ -113 +111 @@
         // return true if line2 should be placed later than line1
         // in the ordered list (so, it is at greater channel numbers)
-        bool operator()(const std::pair<int,int> &line2) const throw();
+        bool operator()(const std::pair<int,int> &line2) const;
    };
 
@@ -129 +127 @@
 
 struct STLineFinder : protected LFLineListOperations {
-   STLineFinder() throw();
-   virtual ~STLineFinder() throw(casa::AipsError);
+   STLineFinder();
+   virtual ~STLineFinder();
 
    // set the parameters controlling algorithm
@@ -160 +158 @@
                    const casa::Float &in_box_size=0.2,
                    const casa::Float &in_noise_box=-1.,
-                   const casa::Bool &in_median = casa::False) throw();
+                   const casa::Bool &in_median = casa::False);
 
    void setDetailedOptions( const casa::Int &order=9 ) ;
 
    // set the scan to work with (in_scan parameter)
-   void setScan(const ScantableWrapper &in_scan) throw(casa::AipsError);
+   void setScan(const ScantableWrapper &in_scan);
 
    // set spectrum data to work with. this is a method to allow linefinder work 
@@ -182 +180 @@
    int findLines(const std::vector<bool> &in_mask,
                  const std::vector<int> &in_edge = std::vector<int>(),
-                 const casa::uInt &whichRow = 0) throw(casa::AipsError);
+                 const casa::uInt &whichRow = 0);
 
    // get the mask to mask out all lines that have been found (default)
@@ -189 +187 @@
    //       in setScan) or dropped out by the edge parameter (in_edge
    //       in setScan) are still excluded regardless on the invert option
-   std::vector<bool> getMask(bool invert=false) const throw(casa::AipsError);
+   std::vector<bool> getMask(bool invert=false) const;
 
    // 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);
+   std::vector<double>   getLineRanges() const;
    // The same as getLineRanges, but channels are always used to specify
    // the range
-   std::vector<int> getLineRangesInChannels() const throw(casa::AipsError);
+   std::vector<int> getLineRangesInChannels() const;
 protected:
    // auxiliary function to average adjacent channels and update the mask
@@ -205 +203 @@
    // boxsize - a number of adjacent channels to average
    void averageAdjacentChannels(casa::Vector<casa::Bool> &mask2update,
-                               const casa::Int &boxsize)
-                               throw(casa::AipsError);
+                               const casa::Int &boxsize);
 
    // auxiliary function to fit and subtract a polynomial from the current
@@ -212 +209 @@
    // reducing the spectral resolution if the baseline shape is bad
    void subtractBaseline(const casa::Vector<casa::Bool> &temp_mask,
-                         const casa::Int &order) throw(casa::AipsError);
+                         const casa::Int &order);
 
    // an auxiliary function to remove all lines from the list, except the
@@ -229 +226 @@
    void keepStrongestOnly(const casa::Vector<casa::Bool> &temp_mask,
                           std::list<std::pair<int, int> > &lines2update,
-                          int max_box_nchan)
-                                      throw (casa::AipsError);
+                          int max_box_nchan);
 private:
    casa::CountedPtr<Scantable> scan; // the scan to work with