Changeset 342 for trunk/src/SDReader.cc

Timestamp:

02/01/05 13:15:36 (19 years ago)

Author:

kil064

Message:

Take unit out of interface again, Handled at python levek now

File:

• trunk/src/SDReader.cc (modified) (3 diffs)

trunk/src/SDReader.cc

@@ -46 +46 @@
   cursor_ = 0;
 }
-SDReader::SDReader(const std::string& filename, const std::string& unit,
+SDReader::SDReader(const std::string& filename, 
                    int whichIF, int whichBeam) :
   reader_(0),
   table_(new SDMemTable()) {
   cursor_ = 0;
-  open(filename, unit, whichIF, whichBeam);
+  open(filename, whichIF, whichBeam);
 }
 
@@ -88 +88 @@
 
 
-void SDReader::open(const std::string& filename, const std::string& unit, 
+void SDReader::open(const std::string& filename, 
                     int whichIF, int whichBeam) {
   if (reader_) delete reader_; reader_ = 0;
@@ -146 +146 @@
     nIF_ = 1;
   }
-//
-// Determine Telescope and set units...
-
-  String sUnit(unit);
-  if (sUnit.empty()) {
-     Bool throwIt = False;
-     Instrument inst = SDMemTable::convertInstrument (header_.antennaname, throwIt);
-     header_.fluxunit = "Jy";
-     if (inst==ATMOPRA || inst==TIDBINBILLA) {
-        header_.fluxunit = "K";
-     }
-     cerr << "Assuming brightness unit is " << header_.fluxunit << endl;
-   } else {
-      Unit u(sUnit);
-      if (u==Unit("Jy") || u==Unit("K")) {
-         header_.fluxunit = unit;
-         cerr << "Setting brightness unit to " << header_.fluxunit << endl;
-      } else {
-         throw(AipsError("Specified brightness unit is illegal - must be consistent with Jy or K"));
-      }
-   }
+
+// Determine Telescope and set brightness unit
+
+  Bool throwIt = False;
+  Instrument inst = SDMemTable::convertInstrument (header_.antennaname, throwIt);
+  header_.fluxunit = "Jy";
+  if (inst==ATMOPRA || inst==TIDBINBILLA) {
+     header_.fluxunit = "K";
+  }
 //
   header_.nif = nIF_;