Changeset 338 for trunk/src

Timestamp:

01/31/05 20:54:05 (20 years ago)

Author:

kil064

Message:

add brightness unit to constructor

Location:

trunk/src

Files:

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

trunk/src/SDReader.cc

@@ -32 +32 @@
 #include <casa/OS/Path.h>
 #include <casa/OS/File.h>
+#include <casa/Quanta/Unit.h>
 #include <atnf/PKSIO/PKSreader.h>
 
@@ -45 +46 @@
   cursor_ = 0;
 }
-SDReader::SDReader(const std::string& filename, int whichIF, int whichBeam) :
+SDReader::SDReader(const std::string& filename, const std::string& unit,
+                   int whichIF, int whichBeam) :
   reader_(0),
   table_(new SDMemTable()) {
   cursor_ = 0;
-  open(filename, whichIF, whichBeam);
+  open(filename, unit, whichIF, whichBeam);
 }
 
@@ -86 +88 @@
 
 
-void SDReader::open(const std::string& filename, int whichIF, int whichBeam) {
+void SDReader::open(const std::string& filename, const std::string& unit, 
+                    int whichIF, int whichBeam) {
   if (reader_) delete reader_; reader_ = 0;
   Bool   haveBase, haveSpectra, haveXPol;
@@ -146 +149 @@
 // Determine Telescope and set units...
 
-  Bool throwIt = False;
-  Instrument inst = SDMemTable::convertInstrument (header_.antennaname, throwIt);
-  header_.fluxunit = "Jy";
-  if (inst==ATMOPRA || inst==TIDBINBILLA) {
-     header_.fluxunit = "K";
-  }
-  cerr << "Assuming brightness units are " << header_.fluxunit << endl;
+  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"));
+      }
+   }
 //
   header_.nif = nIF_;

trunk/src/SDReader.h

@@ -51 +51 @@
 public:
   SDReader();
-  SDReader(const std::string& filename, int whichIF=-1,
-          int whichBeam=-1);
+  SDReader(const std::string& filename, const std::string& unit, 
+           int whichIF=-1, int whichBeam=-1);
   SDReader(casa::CountedPtr<SDMemTable> tbl);
   virtual ~SDReader();
 
   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, int ifSel=-1, int beamSel=-1) : SDReader(filename,ifSel,beamSel) {;}
+  SDReaderWrapper(const std::string& filename, const std::string& unit,
+                  int ifSel=-1, int beamSel=-1) : SDReader(filename,unit,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, int, int > () )
+        .def( init < std::string, string, int, int > () )
         .def("open", &SDReaderWrapper::open)
         .def("read", &SDReaderWrapper::read)