Changeset 2686 for trunk

Timestamp:

11/15/12 23:28:32 (12 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: run sdgrid task with plot=True

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Fix for plotter failure.

Location:

trunk

Files:

• python/asapgrid.py (modified) (5 diffs)
• src/STGrid.cpp (modified) (1 diff)
• src/STGrid.h (modified) (1 diff)
• src/python_STGrid.cpp (modified) (1 diff)

trunk/python/asapgrid.py

@@ -306 +306 @@
         storg = rcParams['scantable.storage']
         rcParams['scantable.storage'] = 'disk'
-        plotter = _SDGridPlotter( self.infile, self.outfile, self.ifno )
+        [nx,ny] = self.gridder._get_resultant_map_size()
+        [cellx,celly] = self.gridder._get_resultant_cell_size()
+        plotter = _SDGridPlotter( self.infile, self.outfile, self.ifno,
+                                  nx=nx, ny=ny, cellx=cellx, celly=celly )
         plotter.plot( chan=plotchan, pol=plotpol, plotobs=plotobs, plotgrid=plotgrid )
         # back to original setup
@@ -376 +379 @@
 
 class _SDGridPlotter:
-    def __init__( self, infile, outfile=None, ifno=-1 ):
+    def __init__( self, infile, outfile=None, ifno=-1, nx=-1, ny=-1, cellx=0.0, celly=0.0 ):
         if isinstance( infile, str ):
             self.infile = [infile]
@@ -384 +387 @@
         if self.outfile is None:
             self.outfile = self.infile[0].rstrip('/')+'.grid'
-        self.nx = -1
-        self.ny = -1
+        self.nx = nx
+        self.ny = ny if ny > 0 else nx
         self.nchan = 0
         self.npol = 0
         self.pollist = []
-        self.cellx = 0.0
-        self.celly = 0.0
+        self.cellx = cellx
+        self.celly = celly if celly > 0.0 else cellx
         self.center = [0.0,0.0]
         self.nonzero = [[0.0],[0.0]]
@@ -414 +417 @@
         #print 'nrow=',nrow
 
-        idx = 1
-        d0 = s.get_direction( 0 ).split()[-2]
-        d = s.get_direction(self.npol*idx)
-        while( d is not None \
-               and d.split()[-2] != d0):
-            idx += 1
+        if self.nx <= 0 or self.ny <= 0:
+            idx = 1
+            d0 = s.get_direction( 0 ).split()[-2]
             d = s.get_direction(self.npol*idx)
+            while( d is not None \
+                   and d.split()[-2] != d0):
+                idx += 1
+                d = s.get_direction(self.npol*idx)
         
-        self.nx = idx
-        self.ny = nrow / (self.npol * idx )
-        #print 'nx,ny=',self.nx,self.ny
+            self.nx = idx
+            self.ny = nrow / (self.npol * idx )
+            #print 'nx,ny=',self.nx,self.ny
 
         self.blc = s.get_directionval( 0 )
@@ -430 +434 @@
         #print self.blc
         #print self.trc
-        if nrow > 1:
-            incrx = s.get_directionval( self.npol )
-            incry = s.get_directionval( self.nx*self.npol )
-        else:
-            incrx = [0.0,0.0]
-            incry = [0.0,0.0]
-        self.cellx = abs( self.blc[0] - incrx[0] )
-        self.celly = abs( self.blc[1] - incry[1] )
-        #print 'cellx,celly=',self.cellx,self.celly
+
+        if self.cellx <= 0.0 or self.celly <= 0.0:
+            if nrow > 1:
+                incrx = s.get_directionval( self.npol )
+                incry = s.get_directionval( self.nx*self.npol )
+            else:
+                incrx = [0.0,0.0]
+                incry = [0.0,0.0]
+            self.cellx = abs( self.blc[0] - incrx[0] )
+            self.celly = abs( self.blc[1] - incry[1] )
+            #print 'cellx,celly=',self.cellx,self.celly
 
     def plot( self, chan=-1, pol=-1, plotobs=False, plotgrid=False ):

trunk/src/STGrid.cpp

@@ -2084 +2084 @@
 }
 
+vector<int> STGrid::getResultantMapSize()
+{
+  vector<int> r(2);
+  r[0] = nx_;
+  r[1] = ny_;
+  return r;
+}
+
+vector<double> STGrid::getResultantCellSize()
+{
+  vector<double> r(2);
+  r[0] = cellx_;
+  r[1] = celly_;
+  return r;
+}
+
 // STGrid2
 STGrid2::STGrid2()

trunk/src/STGrid.h

@@ -77 +77 @@
   // support function to know how grid function looks like
   vector<float> getConvFunc();
+
+  // for plotting
+  vector<int> getResultantMapSize();
+  vector<double> getResultantCellSize();
 
 //private:

trunk/src/python_STGrid.cpp

@@ -43 +43 @@
     .def("_save", &STGrid::saveData)
     .def("_getfunc", &STGrid::getConvFunc)
+    .def("_get_resultant_map_size", &STGrid::getResultantMapSize)
+    .def("_get_resultant_cell_size", &STGrid::getResultantCellSize)
     ;