Merging in updated SOAR form

custom_code/facilities/lco_facility.py

@@ -435,12 +435,10 @@ def __init__(self, *args, **kwargs):
             self.initial['cadence_strategy'] = 'SnexRetryUntilDeadlineStrategy'
             self.initial['retry_until_obtained'] = True
 
-        self.fields['instrument_type'] = forms.ChoiceField(
-            choices=self.instrument_choices(),
-            required=False,
-            initial='2M0-FLOYDS-SCICAM',
-            widget=forms.HiddenInput()
-        )
+        self.fields['instrument_type'] = forms.ChoiceField(choices=self.instrument_choices(),
+                                                           required=False,
+                                                           initial='2M0-FLOYDS-SCICAM')
+        self.fields['instrument_type'].widget = forms.HiddenInput()
 
         self.fields['start'] = forms.CharField(widget=forms.TextInput(attrs={'type': 'date'}))
         self.fields['end'] = forms.CharField(widget=forms.TextInput(attrs={'type': 'date'}))
@@ -498,6 +496,9 @@ def __init__(self, *args, **kwargs):
             self.button_layout()
         )
 
+    def instrument_choices(self):
+        return [('2M0-FLOYDS-SCICAM', '2.0 meter FLOYDS')]
+
     def clean(self):
         cadence_value = self.cleaned_data.get('cadence_frequency_value')
         cadence_unit = (self.cleaned_data.get('cadence_frequency_unit') or '').lower()
@@ -639,4 +640,4 @@ class SnexLCOFacility(LCOFacility):
     }
 
     def __init__(self, facility_settings=LCOSettings('LCO')):
-        super().__init__(facility_settings=facility_settings)
+        super().__init__(facility_settings=facility_settings)