Skip to content
Snippets Groups Projects
Commit d780e957 authored by David Hammer's avatar David Hammer
Browse files

Merge branch 'fix/karabo-2-11-compat' into devel

parents cba9684c 3cd475c6
No related branches found
No related tags found
2 merge requests!12Snapshot: field test deployed version as of end of run 202201,!3Base correction device, CalCat interaction, DSSC and AGIPD devices
...@@ -774,16 +774,17 @@ class DsscCorrection(calibrationBase.CalibrationReceiverBaseDevice): ...@@ -774,16 +774,17 @@ class DsscCorrection(calibrationBase.CalibrationReceiverBaseDevice):
""" """
self.log.INFO("Updating the output schema based on actual outgoing data") self.log.INFO("Updating output schema")
my_schema = self.getFullSchema() my_schema_update = Schema()
data_schema = hashToSchema.HashToSchema(data).schema data_schema = hashToSchema.HashToSchema(data).schema
OUTPUT_CHANNEL(my_schema).key("dataOutput").dataSchema(data_schema).commit() (
my_config = copy.copy(self.getCurrentConfiguration()) OUTPUT_CHANNEL(my_schema_update)
self.updateSchema(my_schema) .key("dataOutput")
self.log.INFO("Re-applying backed up config") .dataSchema(data_schema)
self.set(my_config) .commit()
)
self.updateSchema(my_schema_update)
self._has_set_output_schema = True self._has_set_output_schema = True
self.log.INFO("Ready to continue")
def _update_pulse_filter(self, filter_string): def _update_pulse_filter(self, filter_string):
"""Called whenever the pulse filter changes, typically followed by """Called whenever the pulse filter changes, typically followed by
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment