Use configured bands for script choices.

jason-neal · Aug 3, 2018 · b94067e · b94067e
1 parent f3c2f66
commit b94067e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/eniric_scripts/aces_precision.py b/eniric_scripts/aces_precision.py
@@ -82,7 +82,7 @@ def _parser():
         "--bands",
         type=str,
         default="J",
-        choices=["ALL", "VIS", "GAP", "Z", "Y", "J", "H", "K", "None"],
+        choices=eniric.bands["all"],
         help="Wavelength bands to select. Default=J.",
         nargs="+",
     )
@@ -103,7 +103,7 @@ def _parser():
         "--ref_band",
         help="SNR reference band. Default=J. (Default=100). "
         "'self' scales each band relative to the SNR itself.",
-        choices=["SELF", "self", "VIS", "GAP", "Z", "Y", "J", "H", "K"],
+        choices=["SELF", "self"].extend(eniric.bands["all"]),
         default="J",
         type=str,
     )

diff --git a/eniric_scripts/doppler_shift_atmosphere.py b/eniric_scripts/doppler_shift_atmosphere.py
@@ -8,7 +8,7 @@
 import sys
 
 import numpy as np
-
+import eniric
 import eniric.atmosphere as atm
 import eniric.IOmodule as io
 
@@ -19,15 +19,15 @@ def _parser():
     :returns: the args
     """
     parser = argparse.ArgumentParser(
-        description=("Calculate radial velocity" "precision of model spectra.")
+        description=("Calculate radial velocity precision of model spectra.")
     )
 
     parser.add_argument(
         "-b",
         "--bands",
         type=str,
         default="J",
-        choices=["ALL", "VIS", "GAP", "Z", "Y", "J", "H", "K", None, "visible"],
+        choices=eniric.bands["all"],
         help="Wavelength bands to select. Default=J.",
         nargs="+",
     )

diff --git a/eniric_scripts/nIR_precision.py b/eniric_scripts/nIR_precision.py
@@ -35,7 +35,7 @@ def _parser():
         "--bands",
         type=str,
         default="J",
-        choices=["ALL", "VIS", "GAP", "Z", "Y", "J", "H", "K", "None"],
+        choices=eniric.bands["all"],
         help="Wavelength bands to select. Default=J.",
         nargs="+",
     )
@@ -56,7 +56,7 @@ def _parser():
         "--ref_band",
         help="SNR reference band. Default=J. (Default=100). "
         "'self' scales each band relative to the SNR itself.",
-        choices=["self", "VIS", "GAP", "Z", "Y", "J", "H", "K"],
+        choices=["SELF","self"].extend(eniric.bands["all"]),
         default="J",
         type=str,
     )

diff --git a/eniric_scripts/nIR_run.py b/eniric_scripts/nIR_run.py
@@ -39,7 +39,7 @@ def _parser():
         "--band",
         type=str,
         default="ALL",
-        choices=["ALL", "VIS", "GAP", "Z", "Y", "J", "H", "K"],
+        choices=eniric.bands["all"],
         help="Wavelength band to select",
         nargs="+",
     )

diff --git a/eniric_scripts/split_atmmodel.py b/eniric_scripts/split_atmmodel.py
@@ -34,7 +34,7 @@ def _parser():
         type=str,
         default=None,
         nargs="+",
-        choices=["ALL", "VIS", "GAP", "Z", "Y", "J", "H", "K"],
+        choices=eniric.bands["all"],
         help="Wavelength band to select, Default='All'",
     )
     parser.add_argument(