Changeset 342

Timestamp:

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

Author:

kil064

Message:

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

Location:

trunk/src

Files:

• SDReader.cc (modified) (3 diffs)
• SDReader.h (modified) (2 diffs)
• SDReaderWrapper.h (modified) (1 diff)
• python_SDReader.cc (modified) (1 diff)

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_;

trunk/src/SDReader.h

@@ -51 +51 @@
 public:
   SDReader();
-  SDReader(const std::string& filename, const std::string& unit, 
+  SDReader(const std::string& filename, 
            int whichIF=-1, int whichBeam=-1);
   SDReader(casa::CountedPtr<SDMemTable> tbl);
@@ -57 +57 @@
 
   void open(const std::string& filename,
-            const std::string& unit,
             int whichIF=-1,
             int whichBeam=-1);

trunk/src/SDReaderWrapper.h

@@ -43 +43 @@
 public:
   SDReaderWrapper() {;}
-  SDReaderWrapper(const std::string& filename, const std::string& unit,
-                  int ifSel=-1, int beamSel=-1) : SDReader(filename,unit,ifSel,beamSel) {;}
+  SDReaderWrapper(const std::string& filename, int ifSel=-1, int beamSel=-1) : 
+     SDReader(filename,ifSel,beamSel) {;}
   SDReaderWrapper(SDMemTableWrapper tbl) :
     SDReader(tbl.getCP()){;}

trunk/src/python_SDReader.cc

@@ -40 +40 @@
     void python_SDReader() {
       class_<SDReaderWrapper>("sdreader")
-        .def( init < std::string, string, int, int > () )
+        .def( init < std::string, int, int > () )
         .def("open", &SDReaderWrapper::open)
         .def("read", &SDReaderWrapper::read)