Pull request #1055: CAS-14430
Merge in CASA/casa6 from CAS-14430 to master
* commit '0c4da0be7d119cd0bc22330490f7acbe3227f017':
[CAS-14430] remove comment that is now misleading
[CAS-14430] fix problem generating plot file WITHOUT showing the plot
remove line duplication (found in code review) [CAS-14430]
plotcomp: resurrect, update simulator use, clean up plot, patch back into predictcomp [CAS-14430]
fix errors signaled by the python interpreter [CAS-14430] like: ---------------------------------------------------------------------- casatasks/private/task_gencal.py:99: SyntaxWarning: "is not" with 'str' literal. Did you mean "!="? if infile is not 'None' and infile is not '': casatasks/private/task_gencal.py:99: SyntaxWarning: "is not" with 'str' literal. Did you mean "!="? if infile is not 'None' and infile is not '': casatasks/private/task_gencal.py:100: SyntaxWarning: "is not" with 'str' literal. Did you mean "!="? if antenna is not '' or pol is not '' or len(parameter) != 0: casatasks/private/task_gencal.py:100: SyntaxWarning: "is not" with 'str' literal. Did you mean "!="? if antenna is not '' or pol is not '' or len(parameter) != 0:
changes to resolve warnings about invalid escape sequences in strings [CAS-14430] like: ----------------------------------------------------------------------------------- casatasks/private/task_simalma.py:385: SyntaxWarning: invalid escape sequence '\d' q = re.compile('CYCLE\d?\d')
