Changeset 878 for trunk

Timestamp:

03/06/06 12:23:21 (19 years ago)

Author:

mar637

Message:

SDAttr->STAttr name change

Location:

trunk/src

Files:

• STAttr.cpp (modified) (14 diffs)
• STAttr.h (modified) (3 diffs)
• STFiller.cpp (modified) (2 diffs)
• STMath.cpp (modified) (6 diffs)
• Scantable.cpp (modified) (2 diffs)

trunk/src/STAttr.cpp

@@ -1 +1 @@
 //#---------------------------------------------------------------------------
-//# SDAttr.cc: A collection of attributes for different telescopes
+//# STAttr.cc: A collection of attributes for different telescopes
 //#---------------------------------------------------------------------------
 //# Copyright (C) 2004
@@ -42 +42 @@
 #include <scimath/Mathematics/InterpolateArray1D.h>
 
-#include "SDAttr.h"
+#include "STAttr.h"
 
 using namespace casa;
 using namespace asap;
 
-SDAttr::SDAttr()
+STAttr::STAttr()
 {
    initData();
 }
 
-SDAttr::SDAttr(const SDAttr& other)
+STAttr::STAttr(const STAttr& other)
 {
    initData();                     // state just private 'static' data
 }
 
-SDAttr& SDAttr::operator=(const SDAttr& other) 
+STAttr& STAttr::operator=(const STAttr& other) 
 {
   if (this != &other) {
@@ -65 +65 @@
 }
 
-SDAttr::~SDAttr()
+STAttr::~STAttr()
 {;}
 
 
-Float SDAttr::diameter(Instrument inst)  const
+Float STAttr::diameter(Instrument inst)  const
 {
    Float D = 1.0;
@@ -107 +107 @@
 }
 
-Vector<Float> SDAttr::beamEfficiency(Instrument inst, const MEpoch& dateObs, 
+Vector<Float> STAttr::beamEfficiency(Instrument inst, const MEpoch& dateObs, 
                                       const Vector<Float>& freqs) const
 {
@@ -140 +140 @@
 }
 
-Vector<Float> SDAttr::apertureEfficiency(Instrument inst, 
+Vector<Float> STAttr::apertureEfficiency(Instrument inst, 
                                          const MEpoch& dateObs, 
                                          const Vector<Float>& freqs) const
@@ -177 +177 @@
 }
 
-Vector<Float> SDAttr::JyPerK(Instrument inst, const MEpoch& dateObs,
+Vector<Float> STAttr::JyPerK(Instrument inst, const MEpoch& dateObs,
                              const Vector<Float>& freqs) const
 {
@@ -187 +187 @@
    Vector<Float> facs(freqs.nelements(),1.0);
    for (uInt i=0; i<freqs.nelements(); i++) {
-     facs(i) = SDAttr::findJyPerK(etaAp(i), D);
+     facs(i) = STAttr::findJyPerK(etaAp(i), D);
    }
    return facs;
@@ -193 +193 @@
 
 
-Float SDAttr::findJyPerK(Float etaAp, Float D)
+Float STAttr::findJyPerK(Float etaAp, Float D)
   //
   // Converts K -> Jy
@@ -205 +205 @@
 
 
-Vector<Float> SDAttr::gainElevationPoly(Instrument inst) const
+Vector<Float> STAttr::gainElevationPoly(Instrument inst) const
 {
 
@@ -223 +223 @@
 }
 
-FeedPolType SDAttr::feedPolType(Instrument inst) const
+FeedPolType STAttr::feedPolType(Instrument inst) const
 {
   FeedPolType type = UNKNOWNFEED;
@@ -249 +249 @@
 
 // Private
-Vector<Float> SDAttr::interp(const Vector<Float>& xOut,
+Vector<Float> STAttr::interp(const Vector<Float>& xOut,
                              const Vector<Float>& xIn, 
                              const Vector<Float>& yIn) const
@@ -266 +266 @@
 }
 
-void SDAttr::initData() 
+void STAttr::initData() 
   //
   // Mopra data from Mopra web page
@@ -316 +316 @@
 
 
-Instrument SDAttr::convertInstrument(const String& instrument,
+Instrument STAttr::convertInstrument(const String& instrument,
                                      Bool throwIt)
 {
@@ -322 +322 @@
   t.upcase();
   
-  // The strings are what SDReader returns, after cunning
+  // The strings are what STReader returns, after cunning
   // interrogation of station names... :-(
   Instrument inst = asap::UNKNOWNINST;

trunk/src/STAttr.h

@@ -1 +1 @@
 //#---------------------------------------------------------------------------
-//# SDAttr.h: Return known attributes about telescopes
+//# STAttr.h: Return known attributes about telescopes
 //#---------------------------------------------------------------------------
 //# Copyright (C) 2004
@@ -36 +36 @@
 #include <casa/Utilities/CountedPtr.h>
 
-#include "SDLog.h"
+#include "STLog.h"
 #include "STDefs.h"
 
@@ -44 +44 @@
 namespace asap {
 
-class SDAttr : public SDLog {
+class STAttr : public STLog {
 
  public:
 
   // Constructor
-  SDAttr();
+  STAttr();
   
   // Destructor
-  ~SDAttr();
+  ~STAttr();
   
   // Copy Constructor (copy semantics)
-  SDAttr(const SDAttr& other);
+  STAttr(const STAttr& other);
   
   // Assignment  (copy semantics)
-  SDAttr &operator=(const SDAttr& other);
+  STAttr &operator=(const STAttr& other);
   
   // Telescope diameter(m). Throws exception if unknown.

trunk/src/STFiller.cpp

@@ -27 +27 @@
 
 #include "STDefs.h"
-#include "SDAttr.h"
+#include "STAttr.h"
 
 #include "STFiller.h"
@@ -133 +133 @@
 
   Bool throwIt = False;
-  Instrument inst = SDAttr::convertInstrument(header_->antennaname, throwIt);
+  Instrument inst = STAttr::convertInstrument(header_->antennaname, throwIt);
   header_->fluxunit = "Jy";
   if (inst==ATMOPRA || inst==TIDBINBILLA) {

trunk/src/STMath.cpp

@@ -36 +36 @@
 #include "MathUtils.h"
 #include "RowAccumulator.h"
-#include "SDAttr.h"
+#include "STAttr.h"
 #include "STMath.h"
 
@@ -536 +536 @@
     Bool throwit = True;
     Instrument inst =
-      SDAttr::convertInstrument(tab.keywordSet().asString("AntennaName"),
+      STAttr::convertInstrument(tab.keywordSet().asString("AntennaName"),
                                 throwit);
 
@@ -548 +548 @@
       msg = String("user");
     } else {
-      SDAttr sdAttr;
+      STAttr sdAttr;
       coeff = sdAttr.gainElevationPoly(inst);
       ppoly = new Polynomial<Float>(3);
@@ -689 +689 @@
   } else if ( etaap > 0.0) {
     Instrument inst =
-      SDAttr::convertInstrument(tab.keywordSet().asString("AntennaName"), True);
-    SDAttr sda;
+      STAttr::convertInstrument(tab.keywordSet().asString("AntennaName"), True);
+    STAttr sda;
     if (d < 0) d = sda.diameter(inst);
-    Float jyPerk = SDAttr::findJyPerK(etaap, d);
+    Float jyPerk = STAttr::findJyPerK(etaap, d);
     ostringstream oss;
     oss << "Jy/K = " << jyperk;
@@ -721 +721 @@
   Table& table = in->table();
   Instrument inst =
-    SDAttr::convertInstrument(table.keywordSet().asString("AntennaName"), True);
+    STAttr::convertInstrument(table.keywordSet().asString("AntennaName"), True);
   TableIterator iter(table, "FREQ_ID");
   STFrequencies stfreqs = in->frequencies();
-  SDAttr sdAtt;
+  STAttr sdAtt;
   while (!iter.pastEnd()) {
     Table tab = iter.table();
@@ -734 +734 @@
     uInt freqid; freqidCol.get(0, freqid);
     Vector<Float> tmpspec; specCol.get(0, tmpspec);
-    // SDAttr.JyPerK has a Vector interface... change sometime.
+    // STAttr.JyPerK has a Vector interface... change sometime.
     Vector<Float> freqs(1,stfreqs.getRefFreq(freqid, tmpspec.nelements()));
     for ( uInt i=0; i<tab.nrow(); ++i) {

trunk/src/Scantable.cpp

@@ -54 +54 @@
 
 #include "Scantable.h"
-#include "SDAttr.h"
+#include "STAttr.h"
 
 using namespace casa;
@@ -377 +377 @@
 {
   bool throwIt = true;
-  Instrument ins = SDAttr::convertInstrument(name, throwIt);
+  Instrument ins = STAttr::convertInstrument(name, throwIt);
   String nameU(name);
   nameU.upcase();