use the Swifttools TOO()-supplied list of observation types

Author: phycodurus

tom_swift/swift.py

@@ -13,10 +13,10 @@
 from tom_swift import __version__
 from tom_swift.swift_api import (SwiftAPI,
                                  SWIFT_INSTRUMENT_CHOICES,
-                                 SWIFT_OBSERVATION_TYPE_CHOICES,
                                  SWIFT_TARGET_CLASSIFICATION_CHOICES,
                                  SWIFT_URGENCY_CHOICES,
-                                 SWIFT_XRT_MODE_CHOICES)
+                                 SWIFT_XRT_MODE_CHOICES,
+                                 get_observation_type_choices,
                                  get_monitoring_unit_choices,)
 
 logger = logging.getLogger(__name__)
@@ -91,9 +91,8 @@ class SwiftObservationForm(BaseObservationForm):
     obs_type = forms.ChoiceField(
         required=True,
         label='Observation Type',
-        choices=SWIFT_OBSERVATION_TYPE_CHOICES,
-        help_text='What is driving the exposure time?',
-        initial=SWIFT_OBSERVATION_TYPE_CHOICES[0])
+        choices=get_observation_type_choices(),
+        help_text='What is driving the exposure time?')
 
     #
     # Description of the source brightness for various instruments

tom_swift/swift_api.py

@@ -103,12 +103,17 @@ def resolve_target(self, target: Target):
 # Note that:
 # >>> TOO().obs_types
 # ['Spectroscopy', 'Light Curve', 'Position', 'Timing']
-SWIFT_OBSERVATION_TYPE_CHOICES = [
-    ('Spectroscopy', 'Spectroscopy'),
-    ('Light Curve', 'Light Curve'),
-    ('Position', 'Position'),
-    ('Timing', 'Timing'),
-]
+
+def get_observation_type_choices():
+    """Returns a list of tuples for the observation type choices.
+
+    Since the TOO() object has propperty describing the valid observation types,
+    use that to create the choices list of tuples (e.g. [('Spectroscopy', 'Spectroscopy'), ('Light Curve', 'Light Curve'), ...]).
+    """
+    observation_type_choices = []
+    for obs_type in TOO().obs_types:
+        observation_type_choices.append((obs_type, obs_type))
+    return observation_type_choices
 
 #
 # Instruments