Changeset 1148

Timestamp:

08/16/06 13:14:25 (18 years ago)

Author:

mar637

Message:

use get*nos instead of n* (* can be scan, beam etc.). This showed a bug in c+ which was fixed.

Location:

trunk

Files:

• python/asapplotter.py (modified) (2 diffs)
• src/Scantable.cpp (modified) (2 diffs)

trunk/python/asapplotter.py

@@ -474 +474 @@
              'i': scan.getif, 'p': scan.getpol, 't': scan._gettime }
 
-        polmodes = dict(zip(self._selection.get_pols(),self._selection.get_poltypes()))
-        n,nstack = self._get_selected_n(scan)
+        polmodes = dict(zip(self._selection.get_pols(),
+                            self._selection.get_poltypes()))
+        # this returns either a tuple of numbers or a length  (ncycles)
+        # convert this into lengths
+        n0,nstack0 = self._get_selected_n(scan)
+        n = len(n0)
+        if isinstance(n0, int): n = n0
+        nstack = len(nstack0)
+        if isinstance(nstack0, int): nstack = nstack0
         maxpanel, maxstack = 16,8
         if n > maxpanel or nstack > maxstack:
             from asap import asaplog
+            maxn = 0
+            if nstack > maxstack: maxn = maxstack
+            if n > maxpanel: maxn = maxpanel
             msg ="Scan to be plotted contains more than %d selections.\n" \
-                  "Selecting first %d selections..." % (maxpanel,maxpanel)
+                  "Selecting first %d selections..." % (maxn, maxn)
             asaplog.push(msg)
             print_log()
             n = min(n,maxpanel)
             nstack = min(nstack,maxstack)
-
         if n > 1:
             ganged = rcParams['plotter.ganged']
@@ -598 +607 @@
 
     def _get_selected_n(self, scan):
-        d1 = {'b': scan.nbeam, 's': scan.nscan,
-             'i': scan.nif, 'p': scan.npol, 't': scan.ncycle }
-        d2 = { 'b': len(self._selection.get_beams()),
-               's': len(self._selection.get_scans()),
-               'i': len(self._selection.get_ifs()),
-               'p': len(self._selection.get_pols()),
-               't': len(self._selection.get_cycles()) }
+        d1 = {'b': scan.getbeamnos, 's': scan.getscannos,
+             'i': scan.getifnos, 'p': scan.getpolnos, 't': scan.ncycle }
+        d2 = { 'b': self._selection.get_beams(),
+               's': self._selection.get_scans(),
+               'i': self._selection.get_ifs(),
+               'p': self._selection.get_pols(),
+               't': self._selection.get_cycles() }
         n =  d2[self._panelling] or d1[self._panelling]()
         nstack = d2[self._stacking] or d1[self._stacking]()

trunk/src/Scantable.cpp

@@ -529 +529 @@
 int Scantable::nscan() const {
   Vector<uInt> scannos(scanCol_.getColumn());
-  uInt nout = GenSort<uInt>::sort( scannos, Sort::Ascending,
+  uInt nout = genSort( scannos, Sort::Ascending,
                        Sort::QuickSort|Sort::NoDuplicates );
   return int(nout);
@@ -547 +547 @@
 {
   Vector<uInt> nos(col.getColumn());
-  GenSort<uInt>::sort( nos, Sort::Ascending,
-                       Sort::QuickSort|Sort::NoDuplicates );
+  uInt n = genSort( nos, Sort::Ascending, Sort::QuickSort|Sort::NoDuplicates );
+  nos.resize(n, True);
   std::vector<uint> stlout;
   nos.tovector(stlout);