Changeset 2568 for branches

Timestamp:

06/14/12 11:41:35 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-2813

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Reuse AipsError object for nominal exception throw.
AipsError object is defined as a class member since the object should
be reused in all findLine call.

Location:

branches/hpc33/src

Files:

• STLineFinder.cpp (modified) (3 diffs)
• STLineFinder.h (modified) (3 diffs)

branches/hpc33/src/STLineFinder.cpp

@@ -884 +884 @@
 //
 
-STLineFinder::STLineFinder() throw() : edge(0,0)
+STLineFinder::STLineFinder() throw() : edge(0,0), err("spurious")
 {
   setOptions();
@@ -1048 +1048 @@
                      // presence of spectral lines
 
-  AipsError spuriousError("spurious") ;
-  
   while (true) {
      // a buffer for new lines found at this iteration
@@ -1064 +1062 @@
 //               throw AipsError("spurious"); // nothing new - use the same
 //                                            // code as for a real exception
-              throw spuriousError; // nothing new - use the same
-                                   // code as for a real exception
+              throw err; // nothing new - use the same
+                         // code as for a real exception
      }
      catch(const AipsError &ae) {

branches/hpc33/src/STLineFinder.h

@@ -48 +48 @@
 #include "ScantableWrapper.h"
 #include "Scantable.h"
+#include "STFitter.h"
 
 namespace asap {
@@ -161 +162 @@
                    const casa::Float &in_noise_box=-1.,
                    const casa::Bool &in_median = casa::False) throw();
+
+   void setDetailedOptions( const casa::Int &order=9 ) ;
 
    // set the scan to work with (in_scan parameter)
@@ -266 +269 @@
    // scantable (default = true)
    bool useScantable;
+
+   // shared object for nominal throw
+   casa::AipsError err ;
 };