Changeset 1594 for trunk

Timestamp:

07/06/09 11:12:38 (15 years ago)

Author:

Malte Marquarding

Message:

More tidy up. factored out copy for localised selection

File:

• trunk/python/scantable.py (modified) (4 diffs)

trunk/python/scantable.py

@@ -171 +171 @@
             else: raise
         try:
-            bsel = self.get_selection()
             sel = selector(scans=allscans)
-            self.set_selection(bsel+sel)
-            scopy = self._copy()
-            self.set_selection(bsel)
-            return scantable(scopy)
+            return self._select_copy(sel)
         except RuntimeError:
             if rcParams['verbose']:
@@ -182 +178 @@
             else:
                 raise
+
+    def _select_copy(self, selection):
+        orig = self.get_selection()
+        self.set_selection(orig+selection)
+        cp = self.copy()
+        self.set_selection(orig)
+        return cp
 
     def get_scan(self, scanid=None):
@@ -214 +217 @@
             if type(scanid) is str:
                 sel.set_name(scanid)
-                self.set_selection(bsel+sel)
-                scopy = self._copy()
-                self.set_selection(bsel)
-                return scantable(scopy)
+                return self._select_copy(sel)
             elif type(scanid) is int:
                 sel.set_scans([scanid])
-                self.set_selection(bsel+sel)
-                scopy = self._copy()
-                self.set_selection(bsel)
-                return scantable(scopy)
+                return self._select_copy(sel)
             elif type(scanid) is list:
                 sel.set_scans(scanid)
-                self.set_selection(sel)
-                scopy = self._copy()
-                self.set_selection(bsel)
-                return scantable(scopy)
+                return self._select_copy(sel)
             else:
                 msg = "Illegal scanid type, use 'int' or 'list' if ints."
@@ -510 +504 @@
         """
         Get a list of Positions on the sky (direction) for the observations.
-        Return a float for each integration in the scantable.
+        Return a string for each integration in the scantable.
         Parameters:
             row:    row no of integration. Default -1 return all rows