Merge pull request #507 from bryanmiller/GSCHED-745

Gsched 745: Update some resource definitions in the providers
gemini-hlsw · Sep 11, 2024 · d096715 · d096715
2 parents 7b41dad + 46c62b5
commit d096715
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/scheduler/core/programprovider/gpp/gppprogramprovider.py b/scheduler/core/programprovider/gpp/gppprogramprovider.py
@@ -788,7 +788,7 @@ def determine_mode(inst: str) -> ObservationMode:
         qa_states = []
         prev_atom_id = -1
         n_atom = 0
-        instrument_resources = frozenset([self._sources.origin.resource.lookup_resource(instrument)])
+        instrument_resources = frozenset([self._sources.origin.resource.lookup_resource(instrument, resource_type=ResourceType.INSTRUMENT)])
         for step in sequence:
             if step[GppProgramProvider._AtomKeys.OBS_CLASS] != 'ACQUISITION':
                 next_atom = False
@@ -813,7 +813,8 @@ def determine_mode(inst: str) -> ObservationMode:
                             GppProgramProvider._fpu_to_barcode[instrument][fpu], description=fpu)
                             for fpu in fpus])
                         disperser_resources = frozenset(
-                            [self._sources.origin.resource.lookup_resource(disperser.split('_')[0])
+                            [self._sources.origin.resource.lookup_resource(disperser.split('_')[0],
+                                                                           resource_type=ResourceType.DISPERSER)
                              for disperser in dispersers])
                     resources = frozenset([r for r in fpu_resources | disperser_resources | instrument_resources])
 

diff --git a/scheduler/core/programprovider/ocs/ocsprogramprovider.py b/scheduler/core/programprovider/ocs/ocsprogramprovider.py
@@ -769,7 +769,7 @@ def autocorr_lag(x):
 
         # Transform Resources.
         # TODO: For now, we focus on instruments, and GMOS FPUs and dispersers exclusively.
-        instrument_resources = frozenset([self._sources.origin.resource.lookup_resource(instrument)])
+        instrument_resources = frozenset([self._sources.origin.resource.lookup_resource(instrument, resource_type=ResourceType.INSTRUMENT)])
         if 'GMOS' in instrument:
             # Convert FPUs and dispersers to barcodes. Note that None might be contained in some of these
             # sets, but we filter below to remove them.

diff --git a/scheduler/pickles/ocsenv.pickle b/scheduler/pickles/ocsenv.pickle