Commits

Srikrishna Sekhar authored 523dab0dc51
CAS-13901 : Enable asp plumbing in deconvolve

The asp deconvolver was disabled in task_deconvolve. This set of changes just uncomments the relevant lines to re-enable it.

casatasks/src/private/task_deconvolve.py

Modified
126 126 ####### Data Selection
127 127 imagename,#='',
128 128 startmodel,#='',
129 129
130 130 ####### Deconvolution parameters
131 131 deconvolver,#='hogbom',
132 132 scales,#=[],
133 133 nterms,#=1,
134 134 smallscalebias,#=0.0
135 135 # TODO in CAS-13570: uncomment once asp is working
136 - # fusedthreshold,#=0.0
137 - # largestscale,#=-1
136 + fusedthreshold,#=0.0
137 + largestscale,#=-1
138 138
139 139 ### restoration options
140 140 restoration,#=True,
141 141 restoringbeam,#=[],
142 142
143 143 ##### Iteration control
144 144 niter,#=0,
145 145 gain,#=0.1,
146 146 threshold,#=0.0,
147 147 nsigma,#=0.0
179 179 startmodel = list(filter(lambda v: len(v) > 0, startmodel))
180 180
181 181 # clean input
182 182 inp=locals().copy()
183 183 inp['msname'] = '' # -> no 'vis' parameter for minor cycle only
184 184 inp['cycleniter'] = inp['niter']
185 185 inp['loopgain'] = inp.pop('gain')
186 186 inp['scalebias'] = inp.pop('smallscalebias')
187 187
188 188 # TODO in CAS-13570: fix asp description and allow asp value once asp is working
189 - if deconvolver.lower() == "asp":
190 - raise RuntimeError("The "+deconvolver+" deconvolver currently has incorrect end-of-minor-cycle residual calculations and is therefore disabled. Please choose a different deconvolver.")
189 + #if deconvolver.lower() == "asp":
190 + # raise RuntimeError("The "+deconvolver+" deconvolver currently has incorrect end-of-minor-cycle residual calculations and is therefore disabled. Please choose a different deconvolver.")
191 191
192 192 #####################################################
193 193 #### Construct ImagerParameters
194 194 #####################################################
195 195
196 196 # Make sure that we have all the necessary images and that the startmodel is valid.
197 197 # Note: cpp code should check that .residual and .psf exist, but current tests indicate that it doesn't do that.
198 198 check_requiredmask_exists(usemask, mask)
199 199 check_requiredimgs_exist(imagename, inp)
200 200 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