Commits

Srikrishna Sekhar authored 14242198798 
CAS-13872 : Enable mt-mfs in task_deconvolve

The changes made in 8caf97da75b0a68fb and prior commits to fix the minor
cycle residual calculation in mtmfs have been checked, and the
corresponding MT-MFS tests in `task_deconvolve` have been enabled.

The deconvolve XML has been edited to remove the warning related to
MT-MFS, and the full description put in (from task_tclean).

The warnings in `task_deconvolve.py` have also been edited to allow
usage of MT-MFS.
No tags
6e469956d22
master

casatasks/src/private/task_deconvolve.py

Modified
132 132 return sm_modim_map
133 133 ​
134 134 def deconvolve(
135 135 ####### Data Selection
136 136 imagename,#='',
137 137 startmodel,#='',
138 138 ​
139 139 ####### Deconvolution parameters
140 140 deconvolver,#='hogbom',
141 141 scales,#=[],
142 - # TODO in CAS-13570: uncomment once test_multirun_mtmfs3x passes
143 - # nterms,#=1,
142 + nterms,#=1,
144 143 smallscalebias,#=0.0
145 144 # TODO in CAS-13570: uncomment once asp is working
146 145 # fusedthreshold,#=0.0
147 146 # largestscale,#=-1
148 147 ​
149 148 ### restoration options
150 149 restoration,#=True,
151 150 restoringbeam,#=[],
152 151 ​
153 152 ##### Iteration control
191 190 # clean input
192 191 inp=locals().copy()
193 192 inp['msname'] = '' # -> no 'vis' parameter for minor cycle only
194 193 inp['cycleniter'] = inp['niter']
195 194 inp['loopgain'] = inp.pop('gain')
196 195 inp['scalebias'] = inp.pop('smallscalebias')
197 196 ​
198 197 # TODO in CAS-13570: fix asp description and allow asp value once asp is working
199 198 if deconvolver.lower() == "asp":
200 199 raise RuntimeError("The "+deconvolver+" deconvolver currently has incorrect end-of-minor-cycle residual calculations and is therefore disabled. Please choose a different deconvolver.")
201 - # TODO in CAS-13570: fix mtmfs description and allow mtmfs value once test_multirun_mtmfs3x passes
202 - if deconvolver.lower() == "mtmfs":
203 - raise RuntimeError("The "+deconvolver+" deconvolver currently has issues with the deconvolve task and is therefore disabled. Please choose a different deconvolver.")
204 200 ​
205 201 #####################################################
206 202 #### Construct ImagerParameters
207 203 #####################################################
208 204 ​
209 205 # Make sure that we have all the necessary images and that the startmodel is valid.
210 206 # Note: cpp code should check that .residual and .psf exist, but current tests indicate that it doesn't do that.
211 207 check_requiredmask_exists(usemask, mask)
212 208 check_requiredimgs_exist(imagename, inp)
213 209 check_starmodel_model_collisions(startmodel, imagename, deconvolver)

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

Add shortcut