Changeset 476 for trunk/src

Timestamp:

02/18/05 11:53:33 (20 years ago)

Author:

kil064

Message:

move function convertInstrument to SDAttr

Location:

trunk/src

Files:

• SDMemTable.cc (modified) (3 diffs)
• SDMemTable.h (modified) (1 diff)

trunk/src/SDMemTable.cc

@@ -63 +63 @@
 #include "MathUtils.h"
 #include "SDPol.h"
+#include "SDAttr.h"
 
 #include "SDMemTable.h"
@@ -1359 +1360 @@
 {
   Bool throwIt = True;
-  Instrument ins = convertInstrument(name, throwIt);
+  Instrument ins = SDAttr::convertInstrument(name, throwIt);
   String nameU(name);
   nameU.upcase();
@@ -1581 +1582 @@
 
 
-Instrument SDMemTable::convertInstrument(const String& instrument,
-                                         Bool throwIt)
-{
-   String t(instrument);
-   t.upcase();
-
-   // The strings are what SDReader returns, after cunning interrogation
-   // of station names... :-(
-   Instrument inst = asap::UNKNOWN;
-   if (t==String("DSS-43")) {                
-      inst = TIDBINBILLA;
-   } else if (t==String("ATPKSMB")) {
-      inst = ATPKSMB;
-   } else if (t==String("ATPKSHOH")) {
-      inst = ATPKSHOH;
-   } else if (t==String("ATMOPRA")) {
-      inst = ATMOPRA;
-   } else if (t==String("CEDUNA")) {
-      inst = CEDUNA;
-   } else if (t==String("HOBART")) {
-      inst = HOBART;
-   } else {
-     if (throwIt) {
-       throw AipsError("Unrecognized instrument - use function scan.set_instrument to set");
-     }
-   }
-   return inst;
-}
-
 Bool SDMemTable::setRestFreqs(const Vector<Double>& restFreqsIn, 
                               const String& sUnit,

trunk/src/SDMemTable.h

@@ -248 +248 @@
   casa::MPosition getAntennaPosition() const;
 
-// Helper function to check instrument (antenna) name and give enum
-  static Instrument convertInstrument(const casa::String& instrument,
-                                      casa::Bool throwIt);
-  
   bool putSDFitTable(const SDFitTable& sdft);
   SDFitTable getSDFitTable() const;