From 4bc6c84a1c5631e75b6bd3e40b93b3fdc3d2dc1b Mon Sep 17 00:00:00 2001 From: David Berry Date: Fri, 15 Feb 2013 09:36:27 +0000 Subject: [PATCH] smurf: Correct waveband comparison message --- applications/smurf/scripts/configmeld.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/applications/smurf/scripts/configmeld.py b/applications/smurf/scripts/configmeld.py index 42503ed4fce..631a04a475c 100755 --- a/applications/smurf/scripts/configmeld.py +++ b/applications/smurf/scripts/configmeld.py @@ -173,7 +173,6 @@ def cleanup(): else: waveband1 = None - # Get the second config string. config2 = parsys["CONFIG2"].value @@ -206,9 +205,6 @@ def cleanup(): raise starutil.InvalidParameterError("Unexpected value '{0}' found " "for SUBARRAY FITS Header in {1}.".format(subarray,config2)) else: - - - waveband2 = None # If config1 is an ndf but config2 is not, use the waveband from config1. @@ -224,9 +220,8 @@ def cleanup(): waveband2 = parsys["WAVEBAND"].value waveband1 = waveband2 -# If both are ndfs, but for different wavebands, issue a warning (even -# if the ilevel is not set) - else: +# If both are ndfs, but for different wavebands, issue a critical warning. + elif waveband1 != waveband2: msg_out( "\n Supplied NDFs are for different wavebands", starutil.CRITICAL ) # Tell the user what wavebands are being used.