casa / casa6 / d5dfe3b2756

Commits

Ville Suoranta authored d5dfe3b2756 Merge 09 Mar 2022

Merge pull request #539 in CASA/casa6 from CAS-13775 to master

* commit '80e5b96e2bbbb018c986dee64fc163b0aab75085':
  CAS-13775 fix SyntaxWarning

Modified


187 187	if len(sel_ids['channel']) > 0:
188 188	spwid = [ chanarr[0] for chanarr in sel_ids['channel'] ]
189 189	elif spw=="": # No spw selection
190 190	my_ms.open(vis)
191 191	try: spwinfo = my_ms.getspectralwindowinfo()
192 192	except: raise
193 193	finally: my_ms.close()
194 194
195 195	spwid = [int(idx) for idx in spwinfo.keys()]
196 196	else:
197 -	raise RuntimeError("Invalid spw selction, %s ,for MS %d" (str(spw), file_idx))
197 +	raise RuntimeError("Invalid spw selction, %s ,for MS %d" % (str(spw), file_idx))
198 198
199 199	return {'field': fieldid, 'spw': spwid, 'baseline': baseline, 'scan': scanid, 'intent': intent, 'antenna1': sel_ids['antenna1']}
200 200	else:
201 201	raise ValueError("Invalid file index, %d" % file_idx)
202 202
203 203	def format_ac_baseline(self, in_antenna):
204 204	""" format auto-correlation baseline string from antenna idx list """
205 205	# exact match string
206 206	if is_string_type(in_antenna):
207 207	if (len(in_antenna) != 0) and (in_antenna.find('&') == -1) \