Changeset 1757 for branches/alma/src/STMath.h

Timestamp:

06/09/10 19:03:06 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: Yes (CAS-2211)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: ASAP 3.0.0 interface changes

Test Programs:

Put in Release Notes: Yes

Module(s): all the CASA sd tools and tasks are affected.

Description: Merged ATNF-ASAP 3.0.0 developments to CASA (alma) branch.

Note you also need to update casa/code/atnf.

Location:

branches/alma

Files:

• . (modified) (2 props)
• src/STMath.h (modified) (5 diffs)

branches/alma/src/STMath.h

@@ -146 +146 @@
 
   casa::CountedPtr<Scantable>
-    binaryOperate( const casa::CountedPtr<Scantable>& left, 
-                   const casa::CountedPtr<Scantable>& right, 
+    binaryOperate( const casa::CountedPtr<Scantable>& left,
+                   const casa::CountedPtr<Scantable>& right,
                    const std::string& mode);
 
@@ -290 +290 @@
   casa::CountedPtr<Scantable>
     smooth(const casa::CountedPtr<Scantable>& in, const std::string& kernel,
-                      float width);
+                      float width, int order=2);
 
   casa::CountedPtr<Scantable>
@@ -302 +302 @@
 
   casa::CountedPtr<Scantable> opacity(const casa::CountedPtr<Scantable>& in,
-                                      float tau);
+                                      const std::vector<float>& tau);
 
   casa::CountedPtr<Scantable>
@@ -338 +338 @@
    */
   casa::CountedPtr<Scantable>
-    lagFlag( const casa::CountedPtr<Scantable>& in, double frequency,
-              double width);
+    lagFlag( const casa::CountedPtr<Scantable>& in, double start,
+             double end, const std::string& mode="frequency");
 
   // test for average spectra with different channel/resolution
@@ -374 +374 @@
                               bool tokelvin, float cfac);
 
-  casa::CountedPtr< Scantable > 
+  casa::CountedPtr< Scantable >
     smoothOther( const casa::CountedPtr< Scantable >& in,
                  const std::string& kernel,
-                 float width );
+                 float width, int order=2 );
 
   casa::CountedPtr< Scantable >