Changeset 987 for trunk/src

Timestamp:

04/05/06 14:30:35 (19 years ago)

Author:

mar637

Message:

added direction reference conversions as in Ticket #13

Location:

trunk/src

Files:

• Scantable.cpp (modified) (9 diffs)
• Scantable.h (modified) (3 diffs)
• ScantableWrapper.h (modified) (2 diffs)
• python_Scantable.cpp (modified) (1 diff)

trunk/src/Scantable.cpp

@@ -219 +219 @@
   // the TableMeasDesc gives the column a type
   TableMeasDesc<MDirection> mdirCol(tmvdMDir, mdirRef);
+  // a uder set table type e.g. GALCTIC, B1950 ...
+  td.rwKeywordSet().define("DIRECTIONREF", String("J2000"));
   // writing create the measure column
   mdirCol.write(td);
@@ -352 +354 @@
   MVAngle mvLon(t[0]);
   String sLon = mvLon.string(MVAngle::TIME,prec);
+  uInt tp = md.getRef().getType();
+  if (tp == MDirection::GALACTIC ||
+      tp == MDirection::SUPERGAL ) {
+    sLon = mvLon(0.0).string(MVAngle::ANGLE_CLEAN,prec);
+  }
   MVAngle mvLat(t[1]);
   String sLat = mvLat.string(MVAngle::ANGLE+MVAngle::DIG2,prec);
@@ -550 +557 @@
   for (uInt i=0; i<nrow(); ++i) {
     MEpoch me = timeCol(i);
-    MDirection md = dirCol_(i);
-    dirCol_.get(i,md);
+    MDirection md = getDirection(i);
     oss  << " Time: " << formatTime(me,False) << " Direction: " << formatDirection(md)
          << endl << "     => ";
@@ -717 +723 @@
   // main table
   String dirtype = "Position ("
-                  + MDirection::showType(dirCol_.getMeasRef().getType())
+                  + getDirectionRefString()
                   + ")";
   oss << setw(5) << "Scan" << setw(15) << "Source"
@@ -750 +756 @@
       Table bsubt = biter.table();
       ROTableRow brow(bsubt);
-      MDirection::ROScalarColumn bdirCol(bsubt,"DIRECTION");
       const TableRecord& brec = brow.get(0);
+      uInt row0 = bsubt.rowNumbers()[0];
       oss << setw(5) << "" <<  setw(4) << std::right << brec.asuInt("BEAMNO")<< std::left;
-      oss  << setw(4) << ""  << formatDirection(bdirCol(0)) << endl;
+      oss  << setw(4) << ""  << formatDirection(getDirection(row0)) << endl;
       TableIterator iiter(bsubt, "IFNO");
       while (!iiter.pastEnd()) {
@@ -801 +807 @@
 
   const MPosition& mp = getAntennaPosition();
-  const MDirection& md = dirCol_(whichrow);
+  const MDirection& md = getDirection(whichrow);
   const MEpoch& me = timeCol_(whichrow);
   Double rf = moleculeTable_.getRestFrequency(mmolidCol_(whichrow));
@@ -822 +828 @@
   return stlout;
 }
+void asap::Scantable::setDirectionRefString( const std::string & refstr )
+{
+  MDirection::Types mdt;
+  if (refstr != "" && !MDirection::getType(mdt, refstr)) {
+    throw(AipsError("Illegal Direction frame."));
+  }
+  if ( refstr == "" ) {
+    String defaultstr = MDirection::showType(dirCol_.getMeasRef().getType());
+    table_.rwKeywordSet().define("DIRECTIONREF", defaultstr);
+  } else {
+    table_.rwKeywordSet().define("DIRECTIONREF", String(refstr));
+  }
+}
+
+std::string asap::Scantable::getDirectionRefString( ) const
+{
+  return table_.keywordSet().asString("DIRECTIONREF");
+}
+
+MDirection Scantable::getDirection(int whichrow ) const
+{
+  String usertype = table_.keywordSet().asString("DIRECTIONREF");
+  String type = MDirection::showType(dirCol_.getMeasRef().getType());
+  if ( usertype != type ) {
+    MDirection::Types mdt;
+    if (!MDirection::getType(mdt, usertype)) {
+      throw(AipsError("Illegal Direction frame."));
+    }
+    return dirCol_.convert(uInt(whichrow), mdt);
+  } else {
+    return dirCol_(uInt(whichrow));
+  }
+}
 
 std::string Scantable::getAbcissaLabel( int whichrow ) const
@@ -827 +866 @@
   if ( whichrow > table_.nrow() ) throw(AipsError("Illegal ro number"));
   const MPosition& mp = getAntennaPosition();
-  const MDirection& md = dirCol_(whichrow);
+  const MDirection& md = getDirection(whichrow);
   const MEpoch& me = timeCol_(whichrow);
   const Double& rf = mmolidCol_(whichrow);
@@ -902 +941 @@
 }
 
-} //namespace asap
+
+}
+ //namespace asap

trunk/src/Scantable.h

@@ -143 +143 @@
   int nscan() const;
 
-  //casa::MDirection::Types getDirectionReference() const;
   casa::MEpoch::Types getTimeReference() const;
 
@@ -151 +150 @@
    */
   casa::MPosition getAntennaPosition() const;
+
+  casa::MDirection getDirection( int whichrow ) const;
+
+  void setDirectionRefString(const std::string& refstr="");
+
+  std::string getDirectionRefString() const;
 
   /**
@@ -300 +305 @@
   void setRestFrequencies(double rf, const std::string& = "Hz");
   void setRestFrequencies(const std::string& name);
+
+  void convertDirection(const std::string& newframe);
 
   STFrequencies& frequencies() { return freqTable_; }

trunk/src/ScantableWrapper.h

@@ -131 +131 @@
   int nrow() const {return table_->nrow();}
   int ncycle(int scanno) const {return table_->ncycle(scanno);}
-  ///@todo int nstokes() {return table_->nStokes();}
 
   void makePersistent(const std::string& fname)
@@ -153 +152 @@
     return table_->getCoordInfo();
   }
+
+  void setDirection(const std::string& refstr="")
+    { table_->setDirectionRefString(refstr); }
 
   casa::CountedPtr<Scantable> getCP() const {return table_;}

trunk/src/python_Scantable.cpp

@@ -99 +99 @@
     .def("_setcoordinfo", &ScantableWrapper::setCoordInfo)
     .def("_getcoordinfo", &ScantableWrapper::getCoordInfo)
+    .def("set_dirframe", &ScantableWrapper::setDirection,
+         (boost::python::arg("refstr")="") )
     .def("_gethistory", &ScantableWrapper::getHistory)
     .def("_addhistory", &ScantableWrapper::addHistory)