Changeset 890 for trunk/src/STAttr.h

Timestamp:

03/08/06 13:32:27 (18 years ago)

Author:

mar637

Message:

asap2 naming changes

File:

• trunk/src/STAttr.h (modified) (5 diffs)

trunk/src/STAttr.h

@@ -27 +27 @@
 //#                        AUSTRALIA
 //#
-//# $Id:$
+//# $Id$
 //#---------------------------------------------------------------------------
 #ifndef STATTR_H
@@ -44 +44 @@
 namespace asap {
 
-class STAttr : public SDLog {
+class STAttr : public Logger {
 
  public:
@@ -50 +50 @@
   // Constructor
   STAttr();
-  
+
   // Destructor
   ~STAttr();
-  
+
   // Copy Constructor (copy semantics)
   STAttr(const STAttr& other);
-  
+
   // Assignment  (copy semantics)
   STAttr &operator=(const STAttr& other);
-  
+
   // Telescope diameter(m). Throws exception if unknown.
   casa::Float diameter(Instrument inst) const;
-  
+
   // Beam efficiency.  Frequency in Hz.  Returns 1 if unknown.
-  casa::Vector<casa::Float> 
-  beamEfficiency(Instrument instr, const casa::MEpoch& dateObs, 
+  casa::Vector<casa::Float>
+  beamEfficiency(Instrument instr, const casa::MEpoch& dateObs,
                  const casa::Vector<casa::Float>& freqs) const;
-  
+
   // Aperture efficiency. Frequency in Hz.  Returns 1 if unknown.
-  casa::Vector<casa::Float> 
-  apertureEfficiency(Instrument instr, 
-                     const casa::MEpoch& dateObs, 
+  casa::Vector<casa::Float>
+  apertureEfficiency(Instrument instr,
+                     const casa::MEpoch& dateObs,
                      const casa::Vector<casa::Float>& freqs) const;
-  
+
   // Find factor to convert Jy -> K for this telescope, date of
   // observation and frequency (Hz)
-  casa::Vector<casa::Float> JyPerK(Instrument instr, 
-                                   const casa::MEpoch& dateObs, 
-                                   const casa::Vector<casa::Float>& freqs) 
+  casa::Vector<casa::Float> JyPerK(Instrument instr,
+                                   const casa::MEpoch& dateObs,
+                                   const casa::Vector<casa::Float>& freqs)
     const;
 
@@ -88 +88 @@
   // from the data themselves
   FeedPolType feedPolType(Instrument) const;
-  
+
   // Helper function to check instrument (antenna) name and give enum
-  static Instrument convertInstrument(const casa::String& instrument, 
+  static Instrument convertInstrument(const casa::String& instrument,
                                       casa::Bool throwIt);
-  
+
   // Helper function.  Finds factor to convert K -> Jy. Provide
   // aperture efficiency and dish geometric diameter (m)
   static casa::Float findJyPerK(casa::Float etaAp, casa::Float D);
-  
+
 private:
-  
-  // Static data  
+
+  // Static data
   casa::Vector<casa::Float> MopEtaBeamX_;     // Beam efficiency
   casa::Vector<casa::Float> MopEtaBeam2003Y_;
@@ -111 +111 @@
 
   casa::Vector<casa::Float> TidGainElPoly_;   // Gain-el correction poly coeffs
-  
+
   // Init private data
   void initData();
 
   // Linear interpolation
-  casa::Vector<casa::Float> interp(const casa::Vector<casa::Float>& xOut, 
+  casa::Vector<casa::Float> interp(const casa::Vector<casa::Float>& xOut,
                                    const casa::Vector<casa::Float>& xIn,
                                    const casa::Vector<casa::Float>& yIn) const;