Skip to content

Commit

Permalink
Merge 6367689 into d717c76
Browse files Browse the repository at this point in the history
  • Loading branch information
@adampbeardsley
adampbeardsley committed Jul 10, 2018
2 parents d717c76 + 6367689 commit 6781771
Show file tree
Hide file tree
Showing 4 changed files with 166 additions and 73 deletions.
18 changes: 18 additions & 0 deletions pyuvdata/tests/test_utils.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,3 +189,21 @@ def test_jones_num_funcs():
nt.assert_raises(KeyError, uvutils.jstr2num, 'foo')
nt.assert_raises(ValueError, uvutils.jstr2num, 1)
nt.assert_raises(ValueError, uvutils.jnum2str, 7.3)


def test_conj_pol():
""" Test function to conjugate pols """

pol_nums = [-8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4]
cpol_nums = [-7, -8, -6, -5, -3, -4, -2, -1, 1, 2, 3, 4]
nt.assert_equal(pol_nums, uvutils.conj_pol(cpol_nums))
nt.assert_equal(uvutils.conj_pol(pol_nums), cpol_nums)
pol_str = ['YX', 'XY', 'YY', 'XX', 'LR', 'RL', 'LL', 'RR', 'pI', 'pQ', 'pU', 'pV']
cpol_str = ['XY', 'YX', 'YY', 'XX', 'RL', 'LR', 'LL', 'RR', 'pI', 'pQ', 'pU', 'pV']
nt.assert_equal(pol_str, uvutils.conj_pol(cpol_str))
nt.assert_equal(uvutils.conj_pol(pol_str), cpol_str)
nt.assert_equal([pol_str, pol_nums], uvutils.conj_pol([cpol_str, cpol_nums]))
jstr = ['jyx', 'jxy', 'jyy', 'jxx', 'jlr', 'jrl', 'jll', 'jrr']
cjstr = ['jxy', 'jyx', 'jyy', 'jxx', 'jrl', 'jlr', 'jll', 'jrr']
nt.assert_equal(jstr, uvutils.conj_pol(cjstr))
nt.assert_equal(uvutils.conj_pol(jstr), uvutils.conj_pol(jstr))
59 changes: 32 additions & 27 deletions pyuvdata/tests/test_uvdata.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1403,64 +1403,64 @@ def test_key2inds():
ind1, ind2, indp = uv._key2inds((ant1, ant2, pol))
nt.assert_true(np.array_equal(bltind, ind1))
nt.assert_true(np.array_equal(np.array([]), ind2))
nt.assert_true(np.array_equal([0], indp))
nt.assert_true(np.array_equal([0], indp[0]))
# Any of these inputs can also be a tuple of a tuple, so need to be checked twice.
ind1, ind2, indp = uv._key2inds(((ant1, ant2, pol)))
nt.assert_true(np.array_equal(bltind, ind1))
nt.assert_true(np.array_equal(np.array([]), ind2))
nt.assert_true(np.array_equal([0], indp))
nt.assert_true(np.array_equal([0], indp[0]))

# Combo with pol as string
ind1, ind2, indp = uv._key2inds((ant1, ant2, uvutils.polnum2str(pol)))
nt.assert_true(np.array_equal([0], indp))
nt.assert_true(np.array_equal([0], indp[0]))
ind1, ind2, indp = uv._key2inds(((ant1, ant2, uvutils.polnum2str(pol))))
nt.assert_true(np.array_equal([0], indp))
nt.assert_true(np.array_equal([0], indp[0]))

# Check conjugation
ind1, ind2, indp = uv._key2inds((ant2, ant1, pol))
nt.assert_true(np.array_equal(bltind, ind2))
nt.assert_true(np.array_equal(np.array([]), ind1))
nt.assert_true(np.array_equal([0], indp))
nt.assert_true(np.array_equal([0], indp[1]))

# Antpair only
ind1, ind2, indp = uv._key2inds((ant1, ant2))
nt.assert_true(np.array_equal(bltind, ind1))
nt.assert_true(np.array_equal(np.array([]), ind2))
nt.assert_true(np.array_equal(np.arange(uv.Npols), indp))
nt.assert_true(np.array_equal(np.arange(uv.Npols), indp[0]))
ind1, ind2, indp = uv._key2inds(((ant1, ant2)))
nt.assert_true(np.array_equal(bltind, ind1))
nt.assert_true(np.array_equal(np.array([]), ind2))
nt.assert_true(np.array_equal(np.arange(uv.Npols), indp))
nt.assert_true(np.array_equal(np.arange(uv.Npols), indp[0]))

# Baseline number only
ind1, ind2, indp = uv._key2inds(uv.antnums_to_baseline(ant1, ant2))
nt.assert_true(np.array_equal(bltind, ind1))
nt.assert_true(np.array_equal(np.array([]), ind2))
nt.assert_true(np.array_equal(np.arange(uv.Npols), indp))
nt.assert_true(np.array_equal(np.arange(uv.Npols), indp[0]))
ind1, ind2, indp = uv._key2inds((uv.antnums_to_baseline(ant1, ant2)))
nt.assert_true(np.array_equal(bltind, ind1))
nt.assert_true(np.array_equal(np.array([]), ind2))
nt.assert_true(np.array_equal(np.arange(uv.Npols), indp))
nt.assert_true(np.array_equal(np.arange(uv.Npols), indp[0]))

# Pol number only
ind1, ind2, indp = uv._key2inds(pol)
nt.assert_true(np.array_equal(np.arange(uv.Nblts), ind1))
nt.assert_true(np.array_equal(np.array([]), ind2))
nt.assert_true(np.array_equal(np.array([0]), indp))
nt.assert_true(np.array_equal(np.array([0]), indp[0]))
ind1, ind2, indp = uv._key2inds((pol))
nt.assert_true(np.array_equal(np.arange(uv.Nblts), ind1))
nt.assert_true(np.array_equal(np.array([]), ind2))
nt.assert_true(np.array_equal(np.array([0]), indp))
nt.assert_true(np.array_equal(np.array([0]), indp[0]))

# Pol string only
ind1, ind2, indp = uv._key2inds('LL')
nt.assert_true(np.array_equal(np.arange(uv.Nblts), ind1))
nt.assert_true(np.array_equal(np.array([]), ind2))
nt.assert_true(np.array_equal(np.array([1]), indp))
nt.assert_true(np.array_equal(np.array([1]), indp[0]))
ind1, ind2, indp = uv._key2inds(('LL'))
nt.assert_true(np.array_equal(np.arange(uv.Nblts), ind1))
nt.assert_true(np.array_equal(np.array([]), ind2))
nt.assert_true(np.array_equal(np.array([1]), indp))
nt.assert_true(np.array_equal(np.array([1]), indp[0]))

# Test invalid keys
nt.assert_raises(KeyError, uv._key2inds, 'I') # pol str not in data
Expand Down Expand Up @@ -1489,7 +1489,7 @@ def test_smart_slicing():
ind1 = 10 * np.arange(9)
ind2 = []
indp = [0, 1]
d = uv._smart_slicing(uv.data_array, ind1, ind2, indp)
d = uv._smart_slicing(uv.data_array, ind1, ind2, (indp, []))
dcheck = uv.data_array[ind1, :, :, :]
dcheck = np.squeeze(dcheck[:, :, :, indp])
nt.assert_true(np.all(d == dcheck))
Expand All @@ -1499,7 +1499,7 @@ def test_smart_slicing():
nt.assert_equal(d[1, 0, 0], uv.data_array[ind1[1], 0, 0, indp[0]])

# force copy
d = uv._smart_slicing(uv.data_array, ind1, ind2, indp, force_copy=True)
d = uv._smart_slicing(uv.data_array, ind1, ind2, (indp, []), force_copy=True)
dcheck = uv.data_array[ind1, :, :, :]
dcheck = np.squeeze(dcheck[:, :, :, indp])
nt.assert_true(np.all(d == dcheck))
Expand All @@ -1512,7 +1512,7 @@ def test_smart_slicing():
ind1 = 10 * np.arange(9)
ind2 = []
indp = [0, 1, 3]
d = uv._smart_slicing(uv.data_array, ind1, ind2, indp)
d = uv._smart_slicing(uv.data_array, ind1, ind2, (indp, []))
dcheck = uv.data_array[ind1, :, :, :]
dcheck = np.squeeze(dcheck[:, :, :, indp])
nt.assert_true(np.all(d == dcheck))
Expand All @@ -1525,7 +1525,7 @@ def test_smart_slicing():
ind1 = [0, 4, 5]
ind2 = []
indp = [0, 1]
d = uv._smart_slicing(uv.data_array, ind1, ind2, indp)
d = uv._smart_slicing(uv.data_array, ind1, ind2, (indp, []))
dcheck = uv.data_array[ind1, :, :, :]
dcheck = np.squeeze(dcheck[:, :, :, indp])
nt.assert_true(np.all(d == dcheck))
Expand All @@ -1538,7 +1538,7 @@ def test_smart_slicing():
ind1 = [0, 4, 5]
ind2 = []
indp = [0, 1, 3]
d = uv._smart_slicing(uv.data_array, ind1, ind2, indp)
d = uv._smart_slicing(uv.data_array, ind1, ind2, (indp, []))
dcheck = uv.data_array[ind1, :, :, :]
dcheck = np.squeeze(dcheck[:, :, :, indp])
nt.assert_true(np.all(d == dcheck))
Expand All @@ -1552,7 +1552,7 @@ def test_smart_slicing():
ind1 = []
ind2 = 10 * np.arange(9)
indp = [0, 1]
d = uv._smart_slicing(uv.data_array, ind1, ind2, indp)
d = uv._smart_slicing(uv.data_array, ind1, ind2, ([], indp))
dcheck = uv.data_array[ind2, :, :, :]
dcheck = np.squeeze(np.conj(dcheck[:, :, :, indp]))
nt.assert_true(np.all(d == dcheck))
Expand All @@ -1561,7 +1561,7 @@ def test_smart_slicing():
ind1 = []
ind2 = 10 * np.arange(9)
indp = [0, 1, 3]
d = uv._smart_slicing(uv.data_array, ind1, ind2, indp)
d = uv._smart_slicing(uv.data_array, ind1, ind2, ([], indp))
dcheck = uv.data_array[ind2, :, :, :]
dcheck = np.squeeze(np.conj(dcheck[:, :, :, indp]))
nt.assert_true(np.all(d == dcheck))
Expand All @@ -1570,7 +1570,7 @@ def test_smart_slicing():
ind1 = []
ind2 = [1, 4, 5, 10]
indp = [0, 1]
d = uv._smart_slicing(uv.data_array, ind1, ind2, indp)
d = uv._smart_slicing(uv.data_array, ind1, ind2, ([], indp))
dcheck = uv.data_array[ind2, :, :, :]
dcheck = np.squeeze(np.conj(dcheck[:, :, :, indp]))
nt.assert_true(np.all(d == dcheck))
Expand All @@ -1579,7 +1579,7 @@ def test_smart_slicing():
ind1 = []
ind2 = [1, 4, 5, 10]
indp = [0, 1, 3]
d = uv._smart_slicing(uv.data_array, ind1, ind2, indp)
d = uv._smart_slicing(uv.data_array, ind1, ind2, ([], indp))
dcheck = uv.data_array[ind2, :, :, :]
dcheck = np.squeeze(np.conj(dcheck[:, :, :, indp]))
nt.assert_true(np.all(d == dcheck))
Expand All @@ -1588,7 +1588,7 @@ def test_smart_slicing():
ind1 = np.arange(20)
ind2 = np.arange(30, 40)
indp = [0, 1]
d = uv._smart_slicing(uv.data_array, ind1, ind2, indp)
d = uv._smart_slicing(uv.data_array, ind1, ind2, (indp, indp))
dcheck = np.append(uv.data_array[ind1, :, :, :],
np.conj(uv.data_array[ind2, :, :, :]), axis=0)
dcheck = np.squeeze(dcheck[:, :, :, indp])
Expand All @@ -1598,7 +1598,7 @@ def test_smart_slicing():
ind1 = np.arange(20)
ind2 = np.arange(30, 40)
indp = [0, 1, 3]
d = uv._smart_slicing(uv.data_array, ind1, ind2, indp)
d = uv._smart_slicing(uv.data_array, ind1, ind2, (indp, indp))
dcheck = np.append(uv.data_array[ind1, :, :, :],
np.conj(uv.data_array[ind2, :, :, :]), axis=0)
dcheck = np.squeeze(dcheck[:, :, :, indp])
Expand All @@ -1608,7 +1608,7 @@ def test_smart_slicing():
ind1 = [45]
ind2 = []
indp = [0, 1]
d = uv._smart_slicing(uv.data_array, ind1, ind2, indp)
d = uv._smart_slicing(uv.data_array, ind1, ind2, (indp, []))
dcheck = uv.data_array[ind1, :, :, :]
dcheck = np.squeeze(dcheck[:, :, :, indp], axis=1)
nt.assert_true(np.all(d == dcheck))
Expand All @@ -1617,14 +1617,14 @@ def test_smart_slicing():
ind1 = []
ind2 = [45]
indp = [0, 1]
d = uv._smart_slicing(uv.data_array, ind1, ind2, indp)
d = uv._smart_slicing(uv.data_array, ind1, ind2, ([], indp))
nt.assert_true(np.all(d == np.conj(dcheck)))

# Full squeeze
ind1 = [45]
ind2 = []
indp = [0, 1]
d = uv._smart_slicing(uv.data_array, ind1, ind2, indp, squeeze='full')
d = uv._smart_slicing(uv.data_array, ind1, ind2, (indp, []), squeeze='full')
dcheck = uv.data_array[ind1, :, :, :]
dcheck = np.squeeze(dcheck[:, :, :, indp])
nt.assert_true(np.all(d == dcheck))
Expand All @@ -1651,6 +1651,11 @@ def test_get_data():
d = uv.get_data(ant2, ant1, pol)
nt.assert_true(np.all(dcheck == np.conj(d)))

# Check cross pol conjugation
d = uv.get_data(ant2, ant1, uv.polarization_array[2])
d1 = uv.get_data(ant1, ant2, uv.polarization_array[3])
nt.assert_true(np.all(d == np.conj(d1)))

# Antpair only
dcheck = np.squeeze(uv.data_array[bltind, :, :, :])
d = uv.get_data(ant1, ant2)
Expand Down
29 changes: 29 additions & 0 deletions pyuvdata/utils.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,35 @@ def jnum2str(jnum):
return out


def conj_pol(pol):
"""
Returns the polarization for the conjugate baselineself.
For example, (1, 2, 'XY') = conj(2, 1, 'YX').
Args:
pol: Polarization (str or int)
Returns:
cpol: Polarization as if X and Y are swapped (type matches input)
"""
cpol_dict = {'XX': 'XX', 'YY': 'YY', 'XY': 'YX', 'YX': 'XY',
'JXX': 'jxx', 'JYY': 'jyy', 'JXY': 'jyx', 'JYX': 'jxy',
'RR': 'RR', 'LL': 'LL', 'RL': 'LR', 'LR': 'RL',
'JRR': 'jrr', 'JLL': 'jll', 'JRL': 'jlr', 'JLR': 'jrl',
'I': 'I', 'Q': 'Q', 'U': 'U', 'V': 'V',
'PI': 'pI', 'PQ': 'pQ', 'PU': 'pU', 'PV': 'pV'}

if isinstance(pol, str):
cpol = cpol_dict[pol.upper()]
elif isinstance(pol, collections.Iterable):
cpol = [conj_pol(p) for p in pol]
elif isinstance(pol, six.integer_types + (np.int32, np.int64)):
cpol = polstr2num(cpol_dict[polnum2str(pol).upper()])
else:
raise ValueError('Polarization cannot be conjugated.')
return cpol


def check_history_version(history, version_string):
if (version_string.replace(' ', '') in history.replace('\n', '').replace(' ', '')):
return True
Expand Down

0 comments on commit 6781771

Please sign in to comment.