Changeset 3106 for trunk/external-alma/components/SpectralComponents/SpectralElement.h

Timestamp:

10/04/16 18:20:50 (8 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes/No?

Interface Changes: Yes/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...

Check-in asap modifications from Jim regarding casacore namespace conversion.

File:

• trunk/external-alma/components/SpectralComponents/SpectralElement.h (modified) (10 diffs)

trunk/external-alma/components/SpectralComponents/SpectralElement.h

@@ -34 +34 @@
 #include <casa/Arrays/Vector.h>
 #include <casa/Containers/RecordInterface.h>
+
+using namespace casacore;
 
 namespace casa { //# NAMESPACE CASA - BEGIN
@@ -105 +107 @@
 
         // Evaluate the value of the element at x
-        virtual Double operator()(const Double x) const;
-
-        Bool operator==(const SpectralElement& other) const;
+        virtual casacore::Double operator()(const casacore::Double x) const;
+
+        casacore::Bool operator==(const SpectralElement& other) const;
 
         // Get parameter n
@@ -113 +115 @@
         //  <li> AipsError if illegal n
         // </thrown>
-        virtual Double operator[](const uInt n) const;
-
-        // Get all the types available as String and codes, and number available
-        static const String* allTypes(Int &nall,
+        virtual casacore::Double operator[](const uInt n) const;
+
+        // Get all the types available as casacore::String and codes, and number available
+        static const casacore::String* allTypes(Int &nall,
                         const SpectralElement::Types *&typ);
         // Get a string from the type
-        static const String &fromType(SpectralElement::Types tp);
-        // Get a type from a (non-case sensitive; minimum match) String
-        static Bool toType(SpectralElement::Types &tp,
-                        const String &typName);
+        static const casacore::String &fromType(SpectralElement::Types tp);
+        // Get a type from a (non-case sensitive; minimum match) casacore::String
+        static casacore::Bool toType(SpectralElement::Types &tp,
+                        const casacore::String &typName);
 
         // Get type of this element
@@ -128 +130 @@
 
         // Get all parameters
-        void get(Vector<Double>& params) const;
-
-        Vector<Double> get() const;
+        void get(casacore::Vector<casacore::Double>& params) const;
+
+        casacore::Vector<casacore::Double> get() const;
 
         // Get error estimates of parameters
-        void getError(Vector<Double> &err) const;
-        Vector<Double> getError() const;
+        void getError(casacore::Vector<casacore::Double> &err) const;
+        casacore::Vector<casacore::Double> getError() const;
 
         // Get the order (i.e. the number of parameters)
@@ -140 +142 @@
 
         // Set the error fields
-        virtual void setError(const Vector<Double> &err);
+        virtual void setError(const casacore::Vector<casacore::Double> &err);
 
         // Set fixed parameters (True) or unset them (False)
@@ -148 +150 @@
 
         // Fix/unfix all in one go
-        virtual void fix(const Vector<Bool>& fix);
+        virtual void fix(const casacore::Vector<casacore::Bool>& fix);
 
         // Get the fix state[s]
-        const Vector<Bool> &fixed() const;
+        const casacore::Vector<casacore::Bool> &fixed() const;
 
         // Save to a record.
-        virtual Bool toRecord(RecordInterface& out) const;
+        virtual casacore::Bool toRecord(RecordInterface& out) const;
 
         // set parameters
-        virtual void set(const Vector<Double>& params);
+        virtual void set(const casacore::Vector<casacore::Double>& params);
 
 protected:
@@ -163 +165 @@
         SpectralElement() {}
 
-        SpectralElement(Types type, const Vector<Double>& parms=Vector<Double>(0));
+        SpectralElement(Types type, const casacore::Vector<casacore::Double>& parms=casacore::Vector<casacore::Double>(0));
 
         SpectralElement(const SpectralElement& other);
@@ -169 +171 @@
         SpectralElement &operator=(const SpectralElement& other);
 
-        void _set(const Vector<Double>& params);
+        void _set(const casacore::Vector<casacore::Double>& params);
 
         void _setType(const Types type);
 
-        void _setFunction(const SHARED_PTR<Function<Double, Double> >& f);
-
-        virtual SHARED_PTR<Function<Double, Double> > _getFunction() const {
+        void _setFunction(const SHARED_PTR<Function<casacore::Double, casacore::Double> >& f);
+
+        virtual SHARED_PTR<Function<casacore::Double, casacore::Double> > _getFunction() const {
                 return _function;
         }
@@ -186 +188 @@
         // The parameters of the function. I.e. the polynomial coefficients;
         // amplitude, center and sigma of a Gaussian.
-        Vector<Double> _params;
+        casacore::Vector<casacore::Double> _params;
         // The errors of the parameters
-        Vector<Double> _errors;
+        casacore::Vector<casacore::Double> _errors;
         // The indication if the parameter has to be fixed (True) or solved (False).
         // Solved is the default.
-        Vector<Bool> _fixed;
-
-        SHARED_PTR<Function<Double, Double> > _function;
+        casacore::Vector<casacore::Bool> _fixed;
+
+        SHARED_PTR<Function<casacore::Double, casacore::Double> > _function;
 
 };
@@ -199 +201 @@
 ostream &operator<<(ostream& os, const SpectralElement& elem);
 
-Bool near(const SpectralElement& s1, const SpectralElement& s2, const Double tol);
-
-Bool nearAbs(const SpectralElement& s1, const SpectralElement& s2, const Double tol);
+casacore::Bool near(const SpectralElement& s1, const SpectralElement& s2, const casacore::Double tol);
+
+casacore::Bool nearAbs(const SpectralElement& s1, const SpectralElement& s2, const casacore::Double tol);