Skip to content

W
wr-calibration
Commit 1cbcd9cb authored by Peter Jansweijer's avatar Peter Jansweijer
Browse files
Options

Merge branch 'proposed_master' into Keysight_53230A_Issue

parents 18fa7541 086bad01
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 0 deletions
sw/ab_cal_scripts/edge_edge.py
View file @ 1cbcd9cb
......@@ -24,6 +24,9 @@ import scipy
import numpy
import matplotlib.pyplot as plt
# Add parent directory (containing 'lib') to the module search path
sys.path.insert(0,'..')
# private imports:
from lib.docopt import docopt
import lib.LeCroy8254 as DSO
......
sw/ab_cal_scripts/edge_sfd.py
View file @ 1cbcd9cb
......@@ -56,6 +56,9 @@ import scipy
import numpy
import matplotlib.pyplot as plt
# Add parent directory (containing 'lib') to the module search path
sys.path.insert(0,'..')
# private imports:
from lib.docopt import docopt
import lib.LeCroy8254 as DSO
......
sw/ab_cal_scripts/tic_gui.py
View file @ 1cbcd9cb
......@@ -45,6 +45,9 @@ import scipy
import numpy
import matplotlib.pyplot as plt
# Add parent directory (containing 'lib') to the module search path
sys.path.insert(0,'..')
# private imports:
from lib.docopt import docopt
import lib.Keysight_53230A as tic
......
sw/ab_cal_scripts/lib/LeCroy8254.py → sw/lib/LeCroy8254.py
View file @ 1cbcd9cb
......@@ -640,13 +640,16 @@ def osc_init(scope, time_base = 50.0e-9):
scope.write("C1:COUPLING D50")
scope.write("C1:OFFSET 0.0")
scope.write("VBS 'app.Acquisition.C1.InterpolateType = \"sinxx\"'")
scope.write("C3:COUPLING D50")
scope.write("C3:OFFSET 0.0")
scope.write("C3:Volt_DIV 0.25")
scope.write("VBS 'app.Acquisition.C3.InterpolateType = \"sinxx\"'")
scope.write("C4:COUPLING D50")
scope.write("C4:OFFSET 0.0")
scope.write("C4:Volt_DIV 0.25")
scope.write("VBS 'app.Acquisition.C4.InterpolateType = \"sinxx\"'")
# Trigger in the centre of the screen; important for maximum estimations
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment