Changeset 2951 for trunk

Timestamp:

06/23/14 20:14:08 (10 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: Yes (CAS-5870)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs: sdplot with plottype='grid' and polaverage=True

Put in Release Notes: No

Module(s): sdplot, PlotHelper

Description: Fixed a bug reported by Shinya. There was an issue in auto center and cell size resolution when scantable has only one pointing.

File:

• trunk/src/PlotHelper.cpp (modified) (3 diffs)

trunk/src/PlotHelper.cpp

@@ -24 +24 @@
 #include "PlotHelper.h"
 
-//#ifndef KS_DEBUG
-//#define KS_DEBUG
-//#endif
+#define SMALL_ANGLE 1.0e-7
+
+// #ifndef KS_DEBUG
+// #define KS_DEBUG
+// #endif
 
 using namespace std ;
@@ -101 +103 @@
   incx = abs(xmax - xmin) / (double) nx * cos(centy);
   incy = abs(ymax - ymin) / (double) ny;
+  // Direction coordinate seems not work well with inc=0. set very small value.
+  if (incx == 0.) incx = SMALL_ANGLE;
+  if (incy == 0.) incy = SMALL_ANGLE;
   // Generate a temporal direction coordinte
   coord = DirectionCoordinate(mdt, ptype,
@@ -266 +271 @@
     cout << "- got centpix [" << centpix[0] << ", " << centpix[1] << "]" <<endl;
 #endif
-    Double wx = max( abs(stxmax-centpix[0]), abs(stxmin-centpix[0]) )
+    // Direction coordinate seems not work well with inc=0. set very small value. 
+    Double wx = max( max( abs(stxmax-centpix[0]), abs(stxmin-centpix[0]) ), 0.5 )
       * 2 * stincx.getValue("rad");
-    Double wy = max( abs(stymax-centpix[1]), abs(stymin-centpix[1]) )
+    Double wy = max( max( abs(stymax-centpix[1]), abs(stymin-centpix[1]) ), 0.5 )
       * 2 * stincy.getValue("rad");
     incx = wx / max(nx - 1., 1.);