Skip to content

Commit ad414a2

Browse files
keflavichbsipocz
authored andcommitted
remove "band" keyword argument as it is no longer used or supported
1 parent 9c20d54 commit ad414a2

File tree

1 file changed

+5
-32
lines changed

1 file changed

+5
-32
lines changed

astroquery/splatalogue/core.py

Lines changed: 5 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -48,28 +48,6 @@ class SplatalogueClass(BaseQuery):
4848
'Recombination', 'RFI')
4949
TOP20_LIST = ('comet', 'planet', 'top20', 'ism_hotcore', 'ism_darkcloud',
5050
'ism_diffusecloud')
51-
FREQUENCY_BANDS = {"any": "Any",
52-
"alma3": "ALMA Band 3 (84-116 GHz)",
53-
"alma4": " ALMA Band 4 (125-163 GHz)",
54-
"alma5": " ALMA Band 5 (163-211 GHz)",
55-
"alma6": "ALMA Band 6 (211-275 GHz)",
56-
"alma7": "ALMA Band 7 (275-373 GHz)",
57-
"alma8": "ALMA Band 8 (385-500 GHz)",
58-
"alma9": "ALMA Band 9 (602-720 GHz)",
59-
"alma10": "ALMA Band 10 (787-950 GHz)",
60-
"pf1": "GBT PF1 (0.29-0.92 GHz)",
61-
"pf2": "GBT PF2 (0.91-1.23 GHz)",
62-
"l": "GBT/VLA L (1-2 GHz)",
63-
"s": "GBT/VLA S (1.7-4 GHz)",
64-
"c": "GBT/VLA C (3.9-8 GHz)",
65-
"x": "GBT/VLA X (8-12 GHz)",
66-
"ku": " GBT/VLA Ku (12-18 GHz)",
67-
"kfpa": "GBT KFPA (18-27.5 GHz)",
68-
"k": "VLA K (18-26.5 GHz)",
69-
"ka": " GBT/VLA Ka (26-40 GHz)",
70-
"q": "GBT/VLA Q (38-50 GHz)",
71-
"w": "GBT W (67-93.3 GHz)",
72-
"mustang": "GBT Mustang (80-100 GHz)", }
7351

7452
def __init__(self, **kwargs):
7553
"""
@@ -176,7 +154,7 @@ def _default_kwargs(self):
176154
return json.loads(self._parse_kwargs(**kwargs)['body'])
177155

178156
def _parse_kwargs(self, *, min_frequency=None, max_frequency=None,
179-
band='any', top20=None, chemical_name=None,
157+
top20=None, chemical_name=None,
180158
chem_re_flags=0, energy_min=None, energy_max=None,
181159
energy_type=None, intensity_lower_limit=None,
182160
intensity_type=None, transition=None, version=None,
@@ -203,9 +181,6 @@ def _parse_kwargs(self, *, min_frequency=None, max_frequency=None,
203181
Minimum frequency (or any spectral() equivalent)
204182
max_frequency : `astropy.units`
205183
Maximum frequency (or any spectral() equivalent)
206-
band : str
207-
The observing band. If it is not 'any', it overrides
208-
minfreq/maxfreq.
209184
top20: str
210185
One of ``'comet'``, ``'planet'``, ``'top20'``, ``'ism_hotcore'``,
211186
``'ism_darkcloud'``, ``'ism_diffusecloud'``.
@@ -465,14 +440,12 @@ def _parse_kwargs(self, *, min_frequency=None, max_frequency=None,
465440
return payload
466441

467442
def _validate_kwargs(self, *, min_frequency=None, max_frequency=None,
468-
band='any', **kwargs):
443+
**kwargs):
469444
"""
470-
Check that either min_frequency + max_frequency or band are specified
445+
Check that min_frequency + max_frequency are specified
471446
"""
472-
if band == 'any':
473-
if min_frequency is None or max_frequency is None:
474-
raise ValueError("Must specify either min/max frequency or "
475-
"a valid Band.")
447+
if min_frequency is None or max_frequency is None:
448+
raise ValueError("Must specify min/max frequency")
476449

477450
@prepend_docstr_nosections("\n" + _parse_kwargs.__doc__)
478451
def query_lines_async(self, min_frequency=None, max_frequency=None, *,

0 commit comments

Comments
 (0)