Changeset 981 for trunk/python

Timestamp:

04/04/06 11:58:41 (19 years ago)

Author:

mar637

Message:

Removed align option from average in c++ as it is buggy.
python is now applying it.

Location:

trunk/python

Files:

• asapmath.py (modified) (2 diffs)
• scantable.py (modified) (2 diffs)

trunk/python/asapmath.py

@@ -41 +41 @@
     varlist = vars()
     if isinstance(args[0],list):
-        lst = tuple(args[0])
+        lst = args[0]
     elif isinstance(args[0],tuple):
-        lst = args[0]
+        lst = list(args[0])
     else:
-        lst = tuple(args)
+        lst = list(args)
 
     del varlist["kwargs"]
     varlist["args"] = "%d scantables" % len(lst)
-    # need special formatting her for history...
+    # need special formatting here for history...
 
     from asap._asap import stmath
@@ -63 +63 @@
     if scanav: scanav = "SCAN"
     else: scanav = "NONE"
-    s = scantable(stm._average(lst, mask, weight, scanav, align))
+    alignedlst = []
+    if align:
+        refepoch = lst[0].get_time(0)
+        for scan in lst:
+            alignedlst.append(scan.freq_align(refepoch,insitu=False))
+    else:
+        aligendlst = lst
+    s = scantable(stm._average(alignedlst, mask, weight, scanav))
     s._add_history("average_time",varlist)
     print_log()

trunk/python/scantable.py

@@ -757 +757 @@
         if mask is None: mask = ()
         if scanav:
-          scanav = "SCAN"
-        else:
-          scanav = "NONE"
-        s = scantable(self._math._average((self,), mask, weight.upper(),
-                      scanav, align))
+            scanav = "SCAN"
+        else:
+            scanav = "NONE"
+        scan = (self,)
+        if align:
+            scan = (self.freq_align(insitu=False),)
+        s = scantable(self._math._average(scan, mask, weight.upper(),
+                      scanav))
         s._add_history("average_time",varlist)
         print_log()
@@ -1446 +1449 @@
             tbl = r._getdata()
             if average:
-                tbl = self._math._average((tbl,),(),'NONE','SCAN', False)
+                tbl = self._math._average((tbl,),(),'NONE','SCAN')
                 #tbl = tbl2
             if not first: