Changeset 2718

Timestamp:

01/09/13 14:27:57 (11 years ago)

Author:

Kana Sugimoto

Message:

New Development: No (a bug fix)

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s): asapplotter and sdplot

Description:

fixed a bug in increment.
better log messages.

Location:

trunk

Files:

• python/asapplotter.py (modified) (1 diff)
• src/PlotHelper.cpp (modified) (12 diffs)

trunk/python/asapplotter.py

@@ -1837 +1837 @@
             asaplog.post("WARN")
 
-#         # Center and spacing
-#         dirarr = array(self._data.get_directionval()).transpose()
-#         print "Pointing range: (x, y) = (%f - %f, %f - %f)" %\
-#               (dirarr[0].min(),dirarr[0].max(),dirarr[1].min(),dirarr[1].max())
-#         dircent = [0.5*(dirarr[0].max() + dirarr[0].min()),
-#                    0.5*(dirarr[1].max() + dirarr[1].min())]
-#         del dirarr
-#         if center is None:
-#             #asaplog.post()
-#             asaplog.push("Grid center is not specified. Automatically calculated from pointing center.")
-#             #asaplog.post("WARN")
-#             #center = [dirarr[0].mean(), dirarr[1].mean()]
-#             center = dircent
-#         elif (type(center) in (list, tuple)) and len(center) > 1:
-#             from numpy import pi
-#             # make sure center_x is in +-pi of pointing center
-#             # (assumes dirs are in rad)
-#             rotnum = round(abs(center[0] - dircent[0])/(2*pi))
-#             if center[0] < dircent[0]: rotnum *= -1
-#             cenx = center[0] - rotnum*2*pi
-#             center = [cenx, center[1]]
-#         else:
-#             msg = "Direction of grid center should be a list of float (R.A., Dec.)"
-#             raise ValueError, msg
-#         asaplog.push("Grid center: (%f, %f) " % (center[0],center[1]))
-
-#         if spacing is None:
-#             #asaplog.post()
-#             asaplog.push("Grid spacing not specified. Automatically calculated from map coverage")
-#             #asaplog.post("WARN")
-#             # automatically get spacing
-#             dirarr = array(self._data.get_directionval()).transpose()
-#             wx = 2. * max(abs(dirarr[0].max()-center[0]),
-#                           abs(dirarr[0].min()-center[0]))
-#             wy = 2. * max(abs(dirarr[1].max()-center[1]),
-#                           abs(dirarr[1].min()-center[1]))
-#             ## slightly expand area to plot the edges
-#             #wx *= 1.1
-#             #wy *= 1.1
-#             xgrid = wx/max(self._cols-1.,1.)
-#             #xgrid = wx/float(max(self._cols,1.))
-#             xgrid *= cos(center[1])
-#             ygrid = wy/max(self._rows-1.,1.)
-#             #ygrid = wy/float(max(self._rows,1.))
-#             # single pointing (identical R.A. and/or Dec. for all spectra.)
-#             if xgrid == 0:
-#                 xgrid = 1.
-#             if ygrid == 0:
-#                 ygrid = 1.
-#             # spacing should be negative to transpose plot
-#             spacing = [- xgrid, - ygrid]
-#             del dirarr, xgrid, ygrid
-#         #elif isinstance(spacing, str):
-#         #    # spacing is a quantity
-#         elif (type(spacing) in (list, tuple)) and len(spacing) > 1:
-#             for i in xrange(2):
-#                 val = spacing[i]
-#                 if not isinstance(val, float):
-#                     raise TypeError("spacing should be a list of float")
-#                 if val > 0.:
-#                     spacing[i] = -val
-#             spacing = spacing[0:2]
-#         else:
-#             msg = "Invalid spacing."
-#             raise TypeError(msg)
-#         asaplog.push("Spacing: (%f, %f) (projected)" % (spacing[0],spacing[1]))
-
         # Prepare plotter
         self._assert_plotter(action="reload")

trunk/src/PlotHelper.cpp

@@ -74 +74 @@
 {
   LogIO os(LogOrigin("PlotHelper","getSTCoord()", WHERE));
-  os << "Start getSTCoord()" << LogIO::POST;
+  os << "Getting pointing information of the scantable." << LogIO::POST;
   if (data_p->nrow() < 1)
     throw AipsError("Scantable is not set. Please set a scantable first.");
@@ -107 +107 @@
 #ifdef KS_DEBUG
   {//Debug outputs
-    cout << "Generating a coordinate from DIRECTIONs in a scantable: " << endl;
+    cout << "Generated a temporal direction coordinate of a scantable: " << endl;
     Vector<String> units = coord.worldAxisUnits();
     Vector<Double> refv = coord.referenceValue();
@@ -126 +126 @@
 {
   LogIO os(LogOrigin("PlotHelper","setGridParam()", WHERE));
-  os << "Start setGridParam()" << LogIO::POST;
   // Value check of nx and ny
   if (nx < 1)
@@ -193 +192 @@
   }
 
+  os << "Setting grid parameters" << LogIO::POST;
   // Now, define direction coordinate from input parameters (in radian)
   Double incx, incy;
@@ -199 +199 @@
   // center
   if (center.empty()){
+    os << "center is not specified. Using pointing center of the scantable." << LogIO::POST;
     if (!stset)
       throw AipsError("Scantable is not set. Could not resolve map center.");
-#ifdef KS_DEBUG
-    cout << "Using pointing center from DIRECTION column" << endl;
-#endif
+
     centx = stcent.getAngle("rad").getValue()[0];
     centy = stcent.getAngle("rad").getValue()[1];
     mdt = stdt;
   } else {
-#ifdef KS_DEBUG
-    cout << "Using user defined grid center" << endl;
-#endif
+    os << "Using user defined center" << LogIO::POST;
     // Parse center string
     string::size_type pos0 = center.find(" ");
@@ -230 +227 @@
     if (!MDirection::getType(mdt,sepoch))
       throw AipsError("Invalid direction reference in center");
-    if (stset && mdt != stdt)
+    if (stset && (mdt != stdt))
       throw AipsError("Direction reference of center should be the same as input scantable");
     QuantumHolder qh ;
@@ -248 +245 @@
     }
   }
-#ifdef KS_DEBUG
-  cout << "The center direction of plotting grids: [" << centx  << ", " << centy << "] (rad)" <<endl;
-#endif
+  os << "Grid center: ( "  << centx  << " rad , " << centy << " rad ) " << LogIO::POST;
 
   // cell
   if (cellx.empty() && celly.empty()){
+    os << "cell size is not specified. Using cell size to cover all pointings in the scantable." << LogIO::POST;
     if (!stset)
       throw AipsError("Scantable is not set. Could not resolve cell size.");
-#ifdef KS_DEBUG
-    cout << "Using cell size defined from DIRECTION column" << endl;
-#endif
+
     Vector<Double> centpix;
     MDirection centmd = MDirection(Quantum<Double>(centx, "rad"),
@@ -273 +267 @@
     incy = wy / max(ny - 1., 1.);
   } else {
-#ifdef KS_DEBUG
-    cout << "Using user defined cell size" << endl;
-#endif
+    os << "Using user defined cell size" << LogIO::POST;
     Quantum<Double> qcellx, qcelly;
     if (!cellx.empty() && !celly.empty()){
@@ -290 +282 @@
     incy = qcelly.getValue("rad");
   }
-#ifdef KS_DEBUG
-  cout << "The cell size of plotting grids: [" << incx << ", " << incy << "] (rad)" <<endl;
-#endif
+  // inc should be negative to transpose plot
+  incx = -abs(incx);
+  incy = -abs(incy);
+
+  os << "Spacing: ( " << abs(incx) << " rad , " << abs(incy) << " rad )" <<endl;
 
   Matrix<Double> xform(2,2) ;
@@ -302 +296 @@
                                       0.5*Double(nx), 
                                       0.5*Double(ny)) ; // pixel at center
-  os << "Successfully finished generation of Direction Coordinate" << LogIO::POST;
+  {//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;
+  }
 };
 
@@ -309 +314 @@
                                  const double centx, const double centy,
                                  const string epoch, const string projname){
+  LogIO os(LogOrigin("PlotHelper","setGridParamVal()", WHERE));
   // Value check of nx and ny
   if (nx < 1)
@@ -343 +349 @@
 //                                    0.5*Double(nx-1), 
 //                                    0.5*Double(ny-1)) ; // pixel at grid
-#ifdef KS_DEBUG
-  {//Debug outputs
-  cout << "Direction coordinate is set: " << endl;
-  Vector<String> units = dircoord_->worldAxisUnits();
-  Vector<Double> refv = dircoord_->referenceValue();
-  cout <<"Reference: " << MDirection::showType(dircoord_->directionType()) << " " << refv[0] << units[0] << " " << refv[1] << units[1]  << endl;
-  Vector<Double> refpix = dircoord_->referencePixel();
-  cout <<"Reference Pixel: [" << refpix[0] << ", " << refpix[1] << "]" << endl;
-  Vector<Double> inc = dircoord_->increment();
-  cout <<"Increments: [" << inc[0] << ", " << inc[1] << "]" << endl;
-  cout <<"Projection: " << dircoord_->projection().name() << endl;
-  }
-#endif
+  {//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;
+  }
 };