Commits

Takahiro Tsutsumi authored 64ee5b6d399
Removed casa5 related imports and any use of is_CASA6/is_python3

from the code.

casatasks/src/private/mslisthelper.py

Modified
1 1 from __future__ import absolute_import
2 2
3 3 import os
4 4 import math
5 5 import numpy as np
6 6 import fnmatch
7 7
8 -from casatasks.private.casa_transition import is_CASA6
9 -if is_CASA6:
10 - import subprocess
11 - from collections import OrderedDict as odict
12 -
13 - ###some helper tools
14 - from casatasks import casalog
15 - from casatools import table, quanta, msmetadata
16 - from casatools import ms as mstool
17 -
18 - ms = mstool()
19 - tb = table()
20 - msmd = msmetadata()
21 -
22 -else:
23 - # possibly not an exact equivalent, but as used here it is
24 - import commands as subprocess
25 -
26 - import string
27 - from odict import odict
28 - from taskinit import *
29 - ###some helper tools
30 - from casac import *
31 - ms = casac.ms()
32 - tb = casac.table()
33 - msmd = casac.msmetadata()
8 +import subprocess
9 +from collections import OrderedDict as odict
10 +
11 +###some helper tools
12 +from casatasks import casalog
13 +from casatools import table, quanta, msmetadata
14 +from casatools import ms as mstool
15 +
16 +ms = mstool()
17 +tb = table()
18 +msmd = msmetadata()
34 19
35 20
36 21 def check_mslist(vis, ignore_tables=['SORTED_TABLE'], testcontent=True):
37 22 """
38 23 Check the consistency of the setup of the MSs in the list "vis"
39 24 Returns a dictionary describing the inconsistencies w.r.t. to the first MS in the list:
40 25 {'<vis 1>':
41 26 '<tablename1>': {'present_a': True/False,
42 27 'present_b': True/False,
43 28 'missingcol_a':[<column1>, <column2>,...],

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut