Changeset 343 for trunk/src/SDLineFinder.h

Timestamp:

02/01/05 13:21:27 (19 years ago)

Author:

vor010

Message:

SDLineFinder - now algorithm does many iterations
to ensure that weak lines, which are close to the strong ones, are also found

File:

• trunk/src/SDLineFinder.h (modified) (1 diff)

trunk/src/SDLineFinder.h

@@ -87 +87 @@
 protected:
    // concatenate two lists preserving the order. If two lines appear to
-   // be adjacent, they are joined into the new one
+   // be adjacent or have a non-void intersection, they are joined into 
+   // the new line
    void addNewSearchResult(const std::list<std::pair<int, int> > &newlines)
                            throw(casa::AipsError);
+                           
+   // An auxiliary object function to test whether two lines have a non-void
+   // intersection
+   class IntersectsWith : public std::unary_function<pair<int,int>, bool> {
+       std::pair<int,int> line1;           // range of the first line
+                                           // start channel and stop+1
+   public:
+        IntersectsWith(const std::pair<int,int> &in_line1);
+        // 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();
+   };
+
+   // An auxiliary object function to build a union of several lines
+   // to account for a possibility of merging the nearby lines
+   class BuildUnion {
+       std::pair<int,int> temp_line;       // range of the first line
+                                           // start channel and stop+1
+   public:
+        BuildUnion(const std::pair<int,int> &line1);
+        // 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();
+        // return the result (temp_line)
+        const std::pair<int,int>& result() const throw();
+   };
+   
+   // An auxiliary object function to test whether a specified line
+   // is at lower spectral channels (to preserve the order in the line list)
+   class LaterThan : public std::unary_function<pair<int,int>, bool> {
+       std::pair<int,int> line1;           // range of the first line
+                                           // start channel and stop+1
+   public:
+        LaterThan(const std::pair<int,int> &in_line1);
+
+        // 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();
+   }; 
+   
 private:
    casa::CountedConstPtr<SDMemTable> scan; // the scan to work with