casa6
Public
Commits
Srikrishna Sekhar authored and Ville Suoranta committed 40b0c6f9a39 Merge
| 293 293 | return stopreasons[stopflag - 1] |
| 294 294 | return None |
| 295 295 | |
| 296 296 | def hasConverged(self): |
| 297 297 | # Merge peak-res info from all fields to decide iteration parameters |
| 298 298 | time0 = time.time() |
| 299 299 | self.IBtool.resetminorcycleinfo() |
| 300 300 | for immod in range(0, self.NF): |
| 301 301 | initrec = self.SDtools[immod].initminorcycle() |
| 302 302 | # print('INIT Minor cycle dict {}'.format(initrec)) |
| 303 - | self.IBtool.mergeinitrecord(initrec) |
| 303 + | self.IBtool.mergeinitrecord(initrec, immod) |
| 304 304 | |
| 305 305 | # # Run interactive masking (and threshold/niter editors) |
| 306 306 | # self.runInteractiveGUI2() |
| 307 307 | |
| 308 308 | # Check with the iteration controller about convergence. |
| 309 309 | reachedNmajor = ( |
| 310 310 | self.iterpars["nmajor"] >= 0 and self.majorCnt >= self.iterpars["nmajor"] |
| 311 311 | ) |
| 312 312 | stopflag = self.IBtool.cleanComplete(reachedMajorLimit=reachedNmajor) |
| 313 313 | if stopflag > 0: |