Merging master
This commit is contained in:
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user