Commits
Laszlo Szucs authored 3997a95e16f
163 163 | maxEDR_used = True |
164 164 | |
165 165 | if new_threshold != old_threshold: |
166 166 | LOG.info('DR heuristic: Modified threshold from %.3g Jy to %.3g Jy based on dirty dynamic range calculated' |
167 167 | ' from dirty peak / final theoretical sensitivity: %.1f' |
168 168 | '' % (old_threshold, new_threshold, dirty_dynamic_range)) |
169 169 | DR_correction_factor = new_threshold / old_threshold |
170 170 | |
171 171 | return '%.3gJy' % (new_threshold), DR_correction_factor, maxEDR_used |
172 172 | |
173 - | def niter_correction(self, niter, cell, imsize, synthesized_beam, residual_max, threshold, mask_frac_rad=0.0): |
173 + | def niter_correction(self, niter, cell, imsize, residual_max, threshold, mask_frac_rad=0.0): |
174 174 | """Adjustment of number of cleaning iterations due to mask size. |
175 175 | |
176 176 | See base class method for parameter description.""" |
177 177 | if mask_frac_rad == 0.0: |
178 178 | mask_frac_rad = 0.45 # ALMA specific parameter |
179 179 | |
180 - | return super().niter_correction(niter, cell, imsize, synthesized_beam, residual_max, |
181 - | threshold, mask_frac_rad=mask_frac_rad) |
180 + | return super().niter_correction(niter, cell, imsize, residual_max, threshold, |
181 + | mask_frac_rad=mask_frac_rad) |
182 182 | |
183 183 | def calc_percentile_baseline_length(self, percentile): |
184 184 | """Calculate percentile baseline length for the vis list used in this heuristics instance.""" |
185 185 | |
186 186 | min_diameter = 1.e9 |
187 187 | percentileBaselineLengths = [] |
188 188 | for msname in self.vislist: |
189 189 | ms_do = self.observing_run.get_ms(msname) |
190 190 | min_diameter = min(min_diameter, min([antenna.diameter for antenna in ms_do.antennas])) |
191 191 | percentileBaselineLengths.append( |