Merge 13c4cb3 into feb345e

observatorycontrolsystem · Aug 12, 2019 · 3e96ed7 · 3e96ed7
2 parents feb345e + 13c4cb3
commit 3e96ed7
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/observation_portal/common/configdb.py b/observation_portal/common/configdb.py
@@ -251,7 +251,7 @@ def get_instrument_types_per_telescope(self, only_schedulable: bool = False) ->
             Available instrument types
         """
         if only_schedulable:
-            exclude_states = ['DISABLED', 'ENABLED', 'COMMISSIONING']
+            exclude_states = ['DISABLED', 'ENABLED', 'MANUAL', 'COMMISSIONING', 'STANDBY']
         telescope_instrument_types = {}
         for instrument in self.get_instruments(exclude_states=exclude_states):
             if instrument['telescope_key'] not in telescope_instrument_types:
@@ -313,7 +313,7 @@ def get_telescopes_per_instrument_type(self, instrument_type: str, only_schedula
              Telescope keys
         """
         if only_schedulable:
-            exclude_states = ['DISABLED', 'ENABLED', 'COMMISSIONING']
+            exclude_states = ['DISABLED', 'ENABLED', 'MANUAL', 'COMMISSIONING', 'STANDBY']
         instrument_telescopes = set()
         for instrument in self.get_instruments(exclude_states=exclude_states):
             if instrument['science_camera']['camera_type']['code'].upper() == instrument_type:
@@ -479,7 +479,7 @@ def get_active_instrument_types(self, location: dict) -> set:
             Available instrument_types (i.e. 1M0-SCICAM-SBIG, etc.)
         """
         instrument_types = set()
-        for instrument in self.get_instruments(exclude_states=['DISABLED', 'ENABLED', 'COMMISSIONING']):
+        for instrument in self.get_instruments(exclude_states=['DISABLED', 'ENABLED', 'MANUAL', 'COMMISSIONING', 'STANDBY']):
             split_string = instrument['__str__'].lower().split('.')
             if (location.get('site', '').lower() in split_string[0]
                     and location.get('enclosure', '').lower() in split_string[1]