Changeset 2719 for trunk/src

Timestamp:

01/09/13 18:16:07 (12 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: added two new methods, get_gref() and get_gcellval() in plothelper class.

Test Programs: test_sdplot[sdplot_gridTest]

Put in Release Notes: No

Module(s): asapplotter and sdplot

Description:

Added two new methods in plothelper class to get grid center
and spacings of plot grids.

• get_gref(): returns the reference direction (grid center) of grid (a string)
• get_gcellval(): returns the absolute increment (in radian) of grid (a double vector)

Location:

trunk/src

Files:

• PlotHelper.cpp (modified) (11 diffs)
• PlotHelper.h (modified) (2 diffs)
• python_PlotHelper.cpp (modified) (1 diff)

trunk/src/PlotHelper.cpp

@@ -15 +15 @@
 #include <casa/Quanta/Quantum.h>
 #include <casa/Quanta/QuantumHolder.h>
+#include <casa/Quanta/MVAngle.h>
 #include <casa/Logging/LogIO.h>
 
@@ -33 +34 @@
 namespace asap {
 
-PlotHelper::PlotHelper() : dircoord_(0) 
+PlotHelper::PlotHelper() : dircoord_p(0) 
 {
 #ifdef KS_DEBUG
@@ -40 +41 @@
 };
 
-PlotHelper::PlotHelper( const ScantableWrapper &s) : dircoord_(0)
+PlotHelper::PlotHelper( const ScantableWrapper &s) : dircoord_p(0)
 {
 #ifdef KS_DEBUG
@@ -52 +53 @@
   cout << "Called PlotHelper destructor" << endl;
 #endif
-  if (dircoord_){
-#ifdef KS_DEBUG
-    cout << "Destructing dircoord_" << endl;
-#endif
-    delete dircoord_;
-    dircoord_ = 0;
+  if (dircoord_p){
+#ifdef KS_DEBUG
+    cout << "Destructing dircoord_p" << endl;
+#endif
+    delete dircoord_p;
+    dircoord_p = 0;
   }
 };
@@ -132 +133 @@
     throw(AipsError("ny should be > 0"));
   // Destroy old coord
-  if (dircoord_){
-#ifdef KS_DEBUG
-    cout << "Destructing dircoord_" << endl;
-#endif
-    delete dircoord_;
-    dircoord_ = 0;
+  if (dircoord_p){
+#ifdef KS_DEBUG
+    cout << "Destructing old dircoord_p" << endl;
+#endif
+    delete dircoord_p;
+    dircoord_p = 0;
   }
 
@@ -227 +228 @@
     if (!MDirection::getType(mdt,sepoch))
       throw AipsError("Invalid direction reference in center");
-    if (stset && (mdt != stdt))
-      throw AipsError("Direction reference of center should be the same as input scantable");
+    if (stset){
+      if ( !needst &&
+           !MDirection::getType( stdt, data_p->getDirectionRefString() ) )
+        throw AipsError("Failed to get direction reference from scantable.");
+      if (mdt != stdt)
+        throw AipsError("Direction reference of center should be the same as input scantable");
+    }
     QuantumHolder qh ;
     String err ;
@@ -288 +294 @@
   os << "Spacing: ( " << abs(incx) << " rad , " << abs(incy) << " rad )" <<endl;
 
-  Matrix<Double> xform(2,2) ;
-  xform = 0.0 ;
-  xform.diagonal() = 1.0 ;
-  dircoord_ = new DirectionCoordinate(mdt, projtype,
-                                      centx, centy, incx, incy,
-                                      xform,
-                                      0.5*Double(nx), 
-                                      0.5*Double(ny)) ; // pixel at center
-  {//Summary
-    os << "Successfully generated grid coordinate:" << LogIO::POST;
-    Vector<String> units = dircoord_->worldAxisUnits();
-    Vector<Double> refv = dircoord_->referenceValue();
-    os <<"- Reference Direction : " << MDirection::showType(dircoord_->directionType())
-       << " " << refv[0] << units[0] << " " << refv[1] << units[1]  << LogIO::POST;
-    Vector<Double> refpix = dircoord_->referencePixel();
-    os <<"- Reference Pixel     : [" << refpix[0] << ", " << refpix[1] << "]" << LogIO::POST;
-    Vector<Double> inc = dircoord_->increment();
-    os <<"- Increments          : [" << inc[0] << ", " << inc[1] << "]" << LogIO::POST;
-    os <<"- Projection Type     : " << dircoord_->projection().name() << LogIO::POST;
-  }
+  setupCoord(mdt, projtype, centx, centy, incx, incy,
+             0.5*Double(nx), 0.5*Double(ny)) ; // pixel at center)
+
 };
 
@@ -321 +310 @@
     throw(AipsError("ny should be > 0"));
   // Destroy old coord
-  if (dircoord_){
-#ifdef KS_DEBUG
-    cout << "Destructing dircoord_" << endl;
-#endif
-    delete dircoord_;
-    dircoord_ = 0;
+  if (dircoord_p){
+#ifdef KS_DEBUG
+    cout << "Destructing old dircoord_p" << endl;
+#endif
+    delete dircoord_p;
+    dircoord_p = 0;
   }
 
@@ -339 +328 @@
   Projection::Type projType(Projection::type(String(projname)));
 
+  setupCoord(mdt, projType, centX, centY, incX, incY,
+             0.5*Double(nx), 0.5*Double(ny)) ; // pixel at center
+//           0.5*Double(nx-1), 0.5*Double(ny-1)) ; // pixel at grid
+
+};
+
+
+void PlotHelper::setupCoord(const MDirection::Types mdt,
+                            const Projection::Type pjt,
+                            const Double centx, const Double centy,
+                            const Double incx, const Double incy,
+                            const Double refx, const Double refy)
+{
+  LogIO os(LogOrigin("PlotHelper","setupCoord()", WHERE));
+  // Destroy old coord
+  if (dircoord_p){
+#ifdef KS_DEBUG
+    cout << "Destructing old dircoord_p" << endl;
+#endif
+    delete dircoord_p;
+    dircoord_p = 0;
+  }
+
   Matrix<Double> xform(2,2) ;
   xform = 0.0 ;
   xform.diagonal() = 1.0 ;
-  dircoord_ = new DirectionCoordinate(mdt, projType,
-                                      centX, centY, incX, incY,
-                                      xform,
-                                      0.5*Double(nx), 
-                                      0.5*Double(ny)) ; // pixel at center
-//                                    0.5*Double(nx-1), 
-//                                    0.5*Double(ny-1)) ; // pixel at grid
+  dircoord_p = new DirectionCoordinate(mdt, pjt, centx, centy, incx, incy,
+                                      xform, refx, refy);
   {//Summary
     os << "Successfully generated grid coordinate:" << LogIO::POST;
-    Vector<String> units = dircoord_->worldAxisUnits();
-    Vector<Double> refv = dircoord_->referenceValue();
-    os <<"- Reference Direction : " << MDirection::showType(dircoord_->directionType())
-       << " " << refv[0] << units[0] << " " << refv[1] << units[1]  << LogIO::POST;
-    Vector<Double> refpix = dircoord_->referencePixel();
+    Vector<String> units = dircoord_p->worldAxisUnits();
+    Vector<Double> refv = dircoord_p->referenceValue();
+    os <<"- Reference Direction : "
+       << MDirection::showType(dircoord_p->directionType())
+       << " " << refv[0] << units[0] << " " << refv[1] << units[1] << LogIO::POST;
+    Vector<Double> refpix = dircoord_p->referencePixel();
     os <<"- Reference Pixel     : [" << refpix[0] << ", " << refpix[1] << "]" << LogIO::POST;
-    Vector<Double> inc = dircoord_->increment();
+    Vector<Double> inc = dircoord_p->increment();
     os <<"- Increments          : [" << inc[0] << ", " << inc[1] << "]" << LogIO::POST;
-    os <<"- Projection Type     : " << dircoord_->projection().name() << LogIO::POST;
-  }
-};
-
-vector<double>  PlotHelper::getGridPixel(const int whichrow){
+    os <<"- Projection Type     : " << dircoord_p->projection().name() << LogIO::POST;
+  }
+};
+
+vector<double>  PlotHelper::getGridPixel(const int whichrow)
+{
   if (data_p->nrow() < 1)
     throw AipsError("Scantable is not set. Could not get direction.");
   else if (whichrow > int(data_p->nrow()) - 1)
     throw AipsError("Row index out of range.");
-  if (!dircoord_)
+  if (!dircoord_p)
     throw AipsError("Direction coordinate is not defined.");
 
@@ -378 +387 @@
   cout << "searching pixel position (world = " << data_p->getDirectionString(whichrow) << " = [" << world.getAngle("rad").getValue()[0] << ", " << world.getAngle("rad").getValue()[1] << "])" << endl;
 #endif
-  dircoord_->toPixel(pixel, world);
+  dircoord_p->toPixel(pixel, world);
 #ifdef KS_DEBUG
   cout << "got pixel = [" << pixel[0] << ", " << pixel[1] << "]" << endl;
@@ -387 +396 @@
 };
 
+string PlotHelper::getGridRef()
+{
+  if (!dircoord_p)
+    throw AipsError("Direction coordinate is not defined. Please set it first.");
+
+  string outref;
+
+  Vector<String> units = dircoord_p->worldAxisUnits();
+  Vector<Double> refv = dircoord_p->referenceValue();
+  MVAngle lon( Quantum<Double>(refv[0], units[0]) );
+  MVAngle lat ( Quantum<Double>(refv[1], units[1]) );
+  outref = MDirection::showType(dircoord_p->directionType()) + " "
+    + lon(0.0).string(MVAngle::TIME, 9) + " "
+    + lat.string(MVAngle::ANGLE+MVAngle::DIG2, 9);
+
+  return outref;
+};
+
+vector<double>  PlotHelper::getGridCellVal()
+{
+  if (!dircoord_p)
+    throw AipsError("Direction coordinate is not defined. Please set it first.");
+
+  vector<double> outinc(2);
+  Vector<Double> inc = dircoord_p->increment();
+  Vector<String> units = dircoord_p->worldAxisUnits();
+  MVAngle qincx( Quantum<Double>(inc[0], units[0]) );
+  MVAngle qincy( Quantum<Double>(inc[1], units[1]) );
+  outinc[0] = (double) abs(qincx.radian());
+  outinc[1] = (double) abs(qincy.radian());
+
+  return outinc;
+};
+
+
 } //namespace asap

trunk/src/PlotHelper.h

@@ -38 +38 @@
   virtual ~PlotHelper();
   /**
-   * Set scantable for automatic resolution of grid parameter
+   * Set scantable
    **/
   void setScantable( const ScantableWrapper &s ) ;
@@ -58 +58 @@
 
   /**
-   * Get Pixel position of a row
+   * Get Pixel position of a row in the scantable
    **/
   vector<double> getGridPixel(const int whichrow=0);
 
+  /**
+   * Get the reference direction of grid coordinate (grid center)
+   **/
+  string getGridRef();
+
+  /**
+   * Get the cell size (>0) of the grid coordinate (in radian)
+   **/
+  vector<double> getGridCellVal();
+
+
 private:
+  /** Generate temporal coordinate from the DIRECTION column of a scantable**/
   casa::DirectionCoordinate getSTCoord(const int nx, const int ny,
                                        const casa::Projection::Type ptype);
 
-  casa::DirectionCoordinate *dircoord_;
+  /** Generation of direction coordinate **/
+  void setupCoord(const casa::MDirection::Types mdt,
+                  const casa::Projection::Type pjt,
+                  const casa::Double centx, const casa::Double centy,
+                  const casa::Double incx, const casa::Double incy,
+                  const casa::Double refx, const casa::Double refy);
+
+  casa::DirectionCoordinate *dircoord_p;
   casa::CountedPtr<Scantable> data_p;
 

trunk/src/python_PlotHelper.cpp

@@ -33 +33 @@
     .def("get_gpos", &PlotHelper::getGridPixel,
          (boost::python::arg("whichrow")=0) )
+    //
+    .def("get_gref", &PlotHelper::getGridRef)
+    .def("get_gcellval", &PlotHelper::getGridCellVal)
     /** TODO
+    .def("get_gcell", &PlotHelper::getGridCell)
     .def("get_gdir", &PlotHelper::getGridDirection)
     .def("get_gdirval", &PlotHelper::getGridWorld)