diff options
| author | Eugeniy E. Mikhailov <evgmik@gmail.com> | 2021-12-05 12:53:17 -0500 |
|---|---|---|
| committer | Eugeniy E. Mikhailov <evgmik@gmail.com> | 2021-12-05 12:53:17 -0500 |
| commit | c5323dcc6a151616696eaa8dce5cf09f777a5f90 (patch) | |
| tree | 07d213ebb70aa56883884d1c337f0fcd296afac3 | |
| parent | c4ce398cb772da46658e942696f6ec9778ec5046 (diff) | |
| download | qolab-c5323dcc6a151616696eaa8dce5cf09f777a5f90.tar.gz qolab-c5323dcc6a151616696eaa8dce5cf09f777a5f90.zip | |
fixed unit change
| -rw-r--r-- | qolab/hardware/scope/sds1104x.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/qolab/hardware/scope/sds1104x.py b/qolab/hardware/scope/sds1104x.py index d5b109d..6285aef 100644 --- a/qolab/hardware/scope/sds1104x.py +++ b/qolab/hardware/scope/sds1104x.py @@ -89,7 +89,7 @@ class SDS1104X(ScopeSCPI): wfRaw=self.query_binary_values(qstr, datatype='b', header_fmt='ieee', container=np.array, chunk_size=(Npnts+100)) # expected full reply: 'C1:WF DAT2,#9000000140.........' trRaw = Trace(f'Ch{chNum}') - trRaw.values = wfRaw + trRaw.values = wfRaw.reshape(wfRaw.size,1) trRaw.unit = 'count' return(trRaw, availableNpnts, Npnts) @@ -128,6 +128,7 @@ class SDS1104X(ScopeSCPI): VoltsPerDiv = self.getChanVoltsPerDiv(chNum) tr = trRaw tr.values = trRaw.values * VoltsPerDiv * self.vertDivOnScreen/250 -VoltageOffset + tr.unit = 'Volt' tr.tags['VoltageOffset'] = VoltageOffset tr.tags['VoltsPerDiv'] = VoltsPerDiv return(tr, availableNpnts) @@ -143,7 +144,7 @@ class SDS1104X(ScopeSCPI): tval = np.arange(Npnts) / sampleRate * sparsing; tval = tval - timePerDiv * self.horizDivOnScreen/2 - trigDelay t = Trace('time') - t.values = tval + t.values = tval.reshape(tval.size,1) t.unit = 'S' t.tags['timePerDiv'] = timePerDiv t.tags['trigDelay'] = trigDelay |