Changeset 1068 for trunk/src

Timestamp:

07/04/06 11:27:03 (18 years ago)

Author:

mar637

Message:

added Scantable::getDirectionString; added Scantable::setSourceType

Location:

trunk/src

Files:

• Scantable.cpp (modified) (3 diffs)
• Scantable.h (modified) (4 diffs)
• ScantableWrapper.h (modified) (2 diffs)
• python_Scantable.cpp (modified) (3 diffs)

trunk/src/Scantable.cpp

@@ -256 +256 @@
   timeCol_.attach(table_, "TIME");
   srcnCol_.attach(table_, "SRCNAME");
+  srctCol_.attach(table_, "SRCTYPE");
   specCol_.attach(table_, "SPECTRA");
   flagsCol_.attach(table_, "FLAGTRA");
@@ -321 +322 @@
   table_.keywordSet().get("POLTYPE", sdh.poltype);
   return sdh;
+}
+
+void asap::Scantable::setSourceType( int stype )
+{
+  if ( stype < 0 || stype > 1 )
+    throw(AipsError("Illegal sourcetype."));
+  TableVector<Int> tabvec(table_, "SRCTYPE");
+  tabvec = Int(stype);
 }
 
@@ -826 +835 @@
 }
 
+std::string Scantable::getDirectionString(int whichrow) const
+{
+  return formatDirection(getDirection(uInt(whichrow)));
+}
+
 std::vector< double > asap::Scantable::getAbcissa( int whichrow ) const
 {

trunk/src/Scantable.h

@@ -129 +129 @@
    */
   STHeader getHeader( ) const;
+
   /**
    * Checks if the "other" Scantable is conformant with this,
@@ -138 +139 @@
 
   /**
+   *
+   * @param stype The type of the source, 0 = on, 1 = off
+   */
+  void setSourceType(int stype);
+
+
+  /**
    * return the number of scans in the table
    * @return number of scans in the table
@@ -152 +160 @@
 
   casa::MDirection getDirection( int whichrow ) const;
+
+  std::string getDirectionString( int whichrow ) const;
 
   void setDirectionRefString(const std::string& refstr="");
@@ -396 +406 @@
   casa::ScalarColumn<casa::String> srcnCol_, fldnCol_;
   casa::ScalarColumn<casa::uInt> scanCol_, beamCol_, ifCol_, polCol_, cycleCol_;
-  casa::ScalarColumn<casa::Int> rbeamCol_;
+  casa::ScalarColumn<casa::Int> rbeamCol_, srctCol_;
   casa::ArrayColumn<casa::Float> specCol_, tsysCol_;
   casa::ArrayColumn<casa::uChar> flagsCol_;

trunk/src/ScantableWrapper.h

@@ -85 +85 @@
     { return table_->getTime(whichrow); }
 
+  std::string getDirectionString(int whichrow=0) const
+    { return table_->getDirectionString(whichrow); }
+
   std::string getFluxUnit() const { return table_->getFluxUnit(); }
 
@@ -135 +138 @@
   void makePersistent(const std::string& fname)
     { table_->makePersistent(fname); }
+
+  void setSourceType(int stype)
+    { table_->setSourceType(stype); }
 
   void setRestFrequencies(double rf, const std::string& unit)

trunk/src/python_Scantable.cpp

@@ -27 +27 @@
 //#                        AUSTRALIA
 //#
-//# $Id:$
+//# $Id$
 //#---------------------------------------------------------------------------
 #include <vector>
@@ -92 +92 @@
     .def("_gettime", &ScantableWrapper::getTime,
          (boost::python::arg("whichrow")=0) )
+    .def("_getdirection", &ScantableWrapper::getDirectionString,
+         (boost::python::arg("whichrow")=0) )
     .def("_flag", &ScantableWrapper::flag)
     .def("_save",  &ScantableWrapper::makePersistent)
@@ -109 +111 @@
     .def("_getfit", &ScantableWrapper::getFit)
     .def("_recalcazel", &ScantableWrapper::calculateAZEL)
+    .def("_setsourcetype", &ScantableWrapper::setSourceType)
   ;
 };