Commits

R. V. Urvashi authored 51df99972cf Merge
Merge branch 'master' into CAS-13618

casa5/gcwrap/python/scripts/imagerhelpers/input_parameters.py

Modified
524 524
525 525 # Bother checking only if deconvolution iterations are requested
526 526 if self.iterpars['niter']>0:
527 527 # Make sure cycleniter is less than or equal to niter.
528 528 if self.iterpars['cycleniter']<=0 or self.iterpars['cycleniter'] > self.iterpars['niter']:
529 529 if self.iterpars['interactive']==False:
530 530 self.iterpars['cycleniter'] = self.iterpars['niter']
531 531 else:
532 532 self.iterpars['cycleniter'] = min(self.iterpars['niter'] , 100)
533 533
534 - # saving model is done separately outside of iter. control for interactive clean and or automasking cases
535 - if self.iterpars['savemodel']!='none':
536 - if self.iterpars['interactive']==True or self.alldecpars['0']['usemask']=='auto-multithresh' or \
537 - self.alldecpars['0']['nsigma']>0.0:
538 - self.iterpars['savemodel']='none'
539 - self.allselpars['ms0']['readonly']=True
540 - self.allselpars['ms0']['usescratch']=False
534 + # saving model is done separately outside of iter. control for interactive clean and or automasking cases
535 + if self.iterpars['savemodel']!='none':
536 + if self.iterpars['interactive']==True or self.alldecpars['0']['usemask']=='auto-multithresh' or \
537 + self.alldecpars['0']['nsigma']>0.0:
538 + self.iterpars['savemodel']='none'
539 + self.allselpars['ms0']['readonly']=True
540 + self.allselpars['ms0']['usescratch']=False
541 541
542 542 return errs
543 543
544 544 def checkAndFixNormPars(self):
545 545 errs=""
546 546
547 547 # for modelid in self.allnormpars.keys():
548 548 # if len(self.allnormpars[modelid]['workdir'])==0:
549 549 # self.allnormpars[modelid]['workdir'] = self.allnormpars['0']['imagename'] + '.workdir'
550 550

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

Add shortcut