Merging master

This commit is contained in:
gac-x05la
2024-10-01 17:36:11 +02:00
parent 8c3690a0eb
commit 7bf96d0461
+1 -1
View File
@@ -252,7 +252,7 @@ class SimpleStepScanBase(TemplatedScanBase):
# PsoHsInp1_rise = 4
# PsoHsInp1_fall = 5
parameter['kwargs']['daqname'] = "es1_ddaq"
parameter['kwargs']['daqcfg'] = {'ntotal': self.scan_ntotal, 'trigger': 2}
parameter['kwargs']['daqcfg'] = {'ntotal': self.scan_ntotal, 'trigger': 1}
# Gigafrost config
parameter['kwargs']['camcfg'] = {
"ntotal": self.scan_ntotal,