Commits
301 301 | return stopreasons[stopflag - 1] |
302 302 | return None |
303 303 | |
304 304 | def hasConverged(self): |
305 305 | # Merge peak-res info from all fields to decide iteration parameters |
306 306 | time0 = time.time() |
307 307 | self.IBtool.resetminorcycleinfo() |
308 308 | for immod in range(0, self.NF): |
309 309 | initrec = self.SDtools[immod].initminorcycle() |
310 310 | # print('INIT Minor cycle dict {}'.format(initrec)) |
311 - | self.IBtool.mergeinitrecord(initrec) |
311 + | self.IBtool.mergeinitrecord(initrec, immod) |
312 312 | |
313 313 | # # Run interactive masking (and threshold/niter editors) |
314 314 | # self.runInteractiveGUI2() |
315 315 | |
316 316 | # Check with the iteration controller about convergence. |
317 317 | reachedNmajor = ( |
318 318 | self.iterpars["nmajor"] >= 0 and self.majorCnt >= self.iterpars["nmajor"] |
319 319 | ) |
320 320 | stopflag = self.IBtool.cleanComplete(reachedMajorLimit=reachedNmajor) |
321 321 | if stopflag > 0: |