Skip to content

Commit

Permalink
smurf: Correct waveband comparison message
Browse files Browse the repository at this point in the history
  • Loading branch information
David Berry committed Feb 15, 2013
1 parent 55f7fa7 commit 4bc6c84
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions applications/smurf/scripts/configmeld.py
Expand Up @@ -173,7 +173,6 @@ def cleanup():
else:
waveband1 = None


# Get the second config string.
config2 = parsys["CONFIG2"].value

Expand Down Expand Up @@ -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.
Expand All @@ -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.
Expand Down

0 comments on commit 4bc6c84

Please sign in to comment.