Commits

Akeem Wells authored c140203c354 Merge
Merge branch 'master' into CAS-14026
No tags

casatasks/src/private/imagerhelpers/_gclean.py

Modified
209 209 """
210 210 if self._niter < 1:
211 211 print("warning, nothing to run, niter == %s" % self._niter)
212 212 return self._convergence_result
213 213 else:
214 214 if self._convergence_result[0] is None:
215 215 # initial call to tclean(...) creates the initial dirty image with niter=0
216 216 tclean_ret = self._tclean( vis=self._vis, imagename=self._imagename, imsize=self._imsize, cell=self._cell,
217 217 specmode=self._specmode, interpolation=self._interpolation, nchan=self._nchan,
218 218 start=self._start, width=self._width, pblimit=self._pblimit, deconvolver=self._deconvolver,
219 - cyclefactor=self._cyclefactor, scales=self._scales, interactive=0,
219 + cyclefactor=self._cyclefactor, scales=self._scales, interactive=False,
220 220
221 221 niter=1, gain=0.000001 )
222 222 else:
223 223 tclean_ret = self._tclean( vis=self._vis, imagename=self._imagename, imsize=self._imsize, cell=self._cell,
224 224 specmode=self._specmode, interpolation=self._interpolation, nchan=self._nchan,
225 225 start=self._start, width=self._width, pblimit=self._pblimit, deconvolver=self._deconvolver,
226 - cyclefactor=self._cyclefactor, scales=self._scales, interactive=0,
226 + cyclefactor=self._cyclefactor, scales=self._scales, interactive=False,
227 227
228 228 niter=self._niter, restart=True, calcpsf=False, calcres=False,
229 229 threshold=self._threshold, cycleniter=self._cycleniter, nmajor=self._nmajor,
230 230 maxpsffraction=1, minpsffraction=0, mask=self._mask )
231 231
232 232 new_summaryminor_rec = gclean.__filter_convergence(tclean_ret['summaryminor'])
233 233 self._convergence_result = ( tclean_ret['stopcode'] if 'stopcode' in tclean_ret else 0,
234 234 gclean.__update_convergence(self._convergence_result[1],new_summaryminor_rec) )
235 235 return self._convergence_result
236 236

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

Add shortcut