aboutsummaryrefslogtreecommitdiff
path: root/qolab/hardware
diff options
context:
space:
mode:
authorEugeniy E. Mikhailov <evgmik@gmail.com>2024-07-21 00:36:47 -0400
committerEugeniy E. Mikhailov <evgmik@gmail.com>2024-07-21 00:36:47 -0400
commit4c9a14fa848f2340d297affbeb7f6d5af4b045e3 (patch)
tree77ddbff6257f1ef76dd6c70132ac1a54cc5daed4 /qolab/hardware
parentb8911a3a85f1a24e5da804d9c9a5d35f10c3e175 (diff)
downloadqolab-4c9a14fa848f2340d297affbeb7f6d5af4b045e3.tar.gz
qolab-4c9a14fa848f2340d297affbeb7f6d5af4b045e3.zip
Trig delay to time trace config
Diffstat (limited to 'qolab/hardware')
-rw-r--r--qolab/hardware/scope/rigolds1054z.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/qolab/hardware/scope/rigolds1054z.py b/qolab/hardware/scope/rigolds1054z.py
index d3dbd3c..edca970 100644
--- a/qolab/hardware/scope/rigolds1054z.py
+++ b/qolab/hardware/scope/rigolds1054z.py
@@ -284,7 +284,7 @@ class RigolDS1054z(ScopeSCPI):
def getTimeTrace(self, rawChanCfg):
# sampleRate = self.getSampleRate()
timePerDiv = self.getTimePerDiv()
- # trigDelay = self.getTrigDelay()
+ trigDelay = self.getTrigDelay()
availableNpnts = rawChanCfg["availableNpnts"]
sparsing = rawChanCfg["sparsing"]
Npnts = rawChanCfg["Npnts"]
@@ -296,7 +296,7 @@ class RigolDS1054z(ScopeSCPI):
t.values = tval.reshape(tval.size, 1)
t.config["unit"] = "S"
t.config["tags"]["TimePerDiv"] = timePerDiv
- # t.config["tags"]["TrigDelay"] = trigDelay
+ t.config["tags"]["TrigDelay"] = trigDelay
# t.config["tags"]["SampleRate"] = sampleRate
t.config["tags"]["AvailableNPnts"] = availableNpnts
t.config["tags"]["Npnts"] = Npnts