Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
W
White Rabbit Calibration
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
White Rabbit Calibration
Commits
7a5ba699
Commit
7a5ba699
authored
Jul 25, 2018
by
Peter Jansweijer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
get rid of docopt
parent
2b34b56c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
115 additions
and
51 deletions
+115
-51
tic_gui.py
sw/ab_cal_scripts/tic_gui.py
+53
-21
Keysight_53230A.py
sw/lib/Keysight_53230A.py
+62
-30
No files found.
sw/ab_cal_scripts/tic_gui.py
View file @
7a5ba699
...
...
@@ -34,23 +34,21 @@ The same reference clock mentioned above should also have been used for the
Time Interval Counter measurement!
Usage:
tic_gui.py <tic_file> <wr
_
gui_file>
tic_gui.py <tic_file>
<"tic">
tic_gui.py <wr
_gui_file> <"t1_4">
tic_gui.py <tic_file> <wrgui_file>
tic_gui.py <tic_file>
-type 'tic'
tic_gui.py <wr
gui_file> -type 't1_4'
tic_gui.py -h | --help
<tic_file> <type 'str'> file name that contains the Time Interval
measurements between pps_o and either tx_ts or rx_ts output
<wr_gui_file> <type 'str'> name of file containing the Time Interval
measurements between pps_o and either tx_ts or rx_ts output
<
meas_type>
<type 'str'> either
Options:
<tic_file> <type 'str'> file name that contains the Time Interval Counter
measurements between PPS output and either abscal_txts ouput
<wrgui_file> <type 'str'> name of file containing the WR GUI t1, t4p measurments
<
-type>
<type 'str'> either
"" -> (measured TIC for PPS->abscal_txts) - (WR_GUI t1) and
(measured TIC for PPS->abscal_txts) - (WR_GUI t4p)
"t1_4" -> (WR_GUI t4) - (WR_GUI t1)
"tic" -> histogram just the time interval measurements
Options:
-h --help Show this screen.
--version Show version.
"""
import
os
...
...
@@ -72,7 +70,6 @@ lib_path = os.path.join(lib_path,"..")
sys
.
path
.
insert
(
0
,
lib_path
)
# private imports:
from
lib.docopt
import
docopt
import
lib.Keysight_53230A
as
tic
############################################################################
...
...
@@ -171,23 +168,58 @@ def plot_hist(t_hist, hist_tic):
##
## If run from commandline, we can test the library
##
"""
Usage:
tic_gui.py <tic_file> <wrgui_file>
tic_gui.py <tic_file> -type 'tic'
tic_gui.py <wrgui_file> -type 't1_4'
tic_gui.py -h | --help
Options:
<tic_file> <type 'str'> file name that contains the Time Interval Counter
measurements between PPS output and either abscal_txts ouput
<wrgui_file> <type 'str'> name of file containing the WR GUI t1, t4p measurments
<-type> <type 'str'> either
"" -> (measured TIC for PPS->abscal_txts) - (WR_GUI t1) and
(measured TIC for PPS->abscal_txts) - (WR_GUI t4p)
"t1_4" -> (WR_GUI t4) - (WR_GUI t1)
"tic" -> histogram just the time interval measurements
-h --help Show this screen.
"""
if
__name__
==
"__main__"
:
arguments
=
docopt
(
__doc__
,
version
=
'Keysight DSO-S 254A version 01'
)
if
len
(
sys
.
argv
)
!=
3
:
print
(
"### wrong number of input arguments"
)
import
argparse
parser
=
argparse
.
ArgumentParser
()
parser
.
add_argument
(
"-tic_file"
,
help
=
"file containing TIC measurements"
)
parser
.
add_argument
(
"-wrgui_file"
,
help
=
"file containing WR GUI measurements"
)
parser
.
add_argument
(
"-type"
,
help
=
"measurement type, either: 'tic' or 't1_4,"
,
default
=
''
)
args
=
parser
.
parse_args
()
tic_file
=
args
.
tic_file
wr_gui_file
=
args
.
wrgui_file
meas_type
=
args
.
type
if
tic_file
==
""
and
meas_type
==
"tic"
:
print
(
"### no TIC file specified!"
)
sys
.
exit
()
elif
wr_gui_file
==
""
and
meas_type
==
"t1_4"
:
print
(
"### no WR GUI file specified!"
)
sys
.
exit
()
elif
sys
.
argv
[
2
]
==
"tic"
:
elif
tic_file
==
""
and
wr_gui_file
==
""
:
print
(
"### Specify TIC and WR GUI file!"
)
sys
.
exit
()
if
meas_type
==
"tic"
:
print
(
"Time Interval Counter skew"
)
tic_file
=
sys
.
argv
[
1
]
print
(
"Using TIC file: "
,
tic_file
)
tic_data
=
tic
.
file_to_scipy_array
(
tic_file
)
num
=
len
(
tic_data
[
0
])
# x-axis in [0]
t_hist
=
tic_data
[
1
]
# y-axis in [1]
hist_tic
=
plt
.
figure
(
"Time Interval Counter skew"
)
plot_hist
(
t_hist
,
hist_tic
)
elif
sys
.
argv
[
2
]
==
"t1_4"
:
wr_gui_file
=
sys
.
argv
[
1
]
elif
meas_type
==
"t1_4"
:
print
(
"Using WR GUI file: "
,
wr_gui_file
)
gui_data
=
wr_abs_cal_gui_file_to_scipy_array
(
wr_gui_file
)
print
(
"Histogram difference WR (t4p-t1)"
)
t_hist
=
gui_data
[
"t4"
]
-
gui_data
[
"t1"
]
...
...
@@ -196,9 +228,9 @@ if __name__ == "__main__":
hist_tic
=
plt
.
figure
(
"Histogram difference WR GUI (t4-t1)"
)
plot_hist
(
t_hist
,
hist_tic
)
else
:
tic_file
=
sys
.
argv
[
1
]
print
(
"Using TIC file: "
,
tic_file
)
print
(
"Using WR GUI file: "
,
wr_gui_file
)
tic_data
=
tic
.
file_to_scipy_array
(
tic_file
)
wr_gui_file
=
sys
.
argv
[
2
]
gui_data
=
wr_abs_cal_gui_file_to_scipy_array
(
wr_gui_file
)
num_tic
=
len
(
tic_data
[
0
])
# x-axis in [0]
num_gui
=
len
(
gui_data
[
"t1"
])
...
...
sw/lib/Keysight_53230A.py
View file @
7a5ba699
...
...
@@ -22,21 +22,21 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
-------------------------------------------------------------------------------
Usage:
Keysight_53230A.py
<IP#> [--meas=<number
>]
Keysight_53230A.py
IP# [-i1=<float>] [-i2=<float>] [-m=<int
>]
Keysight_53230A.py -h | --help
IP IP number of the Frequency Counter/Timer
(for example: 192.168.32.251 which is its DevNet IP number)
Options:
-h --help Show this screen.
--version Show version.
-m --meas=<number> number of measurements to be taken [default: 1]
IP IP number of the instrument [default 192.168.32.251]
-in1 <float> trigger level input 1 [default 0.15]
-in2 <float> trigger level input 2 [default 0.3]
-m <int> number of measurements to be taken [default: 1]
-h, --help Show this screen.
"""
from
docopt
import
docopt
import
sys
import
time
import
scipy
...
...
@@ -154,15 +154,44 @@ def file_to_scipy_array(filename):
##
## If run from commandline, we can test the library
##
"""
Usage:
Keysight_53230A.py IP# [-i1=<float>] [-i2=<float>] [-m=<int>]
Keysight_53230A.py -h | --help
IP IP number of the Frequency Counter/Timer
(for example: 192.168.32.251 which is its DevNet IP number)
Options:
IP IP number of the instrument [default 192.168.32.251]
-in1 <float> trigger level input 1 [default 0.15]
-in2 <float> trigger level input 2 [default 0.3]
-m <int> number of measurements to be taken [default: 1]
-h, --help Show this screen.
"""
if
__name__
==
"__main__"
:
arguments
=
docopt
(
__doc__
,
version
=
'Keysight DSO-S 254A version 01'
)
import
argparse
parser
=
argparse
.
ArgumentParser
()
parser
.
add_argument
(
"IP"
,
help
=
"IP number of the instrument"
,
default
=
"192.168.32.251"
)
parser
.
add_argument
(
"-i1"
,
help
=
"in1 trigger level"
,
default
=
0.15
)
parser
.
add_argument
(
"-i2"
,
help
=
"in2 trigger level"
,
default
=
0.30
)
parser
.
add_argument
(
"-m"
,
help
=
"number of measurements"
,
default
=
1
)
args
=
parser
.
parse_args
()
IP
=
args
.
IP
in1
=
float
(
args
.
i1
)
in2
=
float
(
args
.
i2
)
num_meas
=
int
(
args
.
m
)
num_meas
=
1
print
(
"trigger level in1: "
,
in1
)
print
(
"trigger level in2: "
,
in2
)
print
(
"number of measurements: "
,
num_meas
)
if
len
(
sys
.
argv
)
>=
2
:
# just IP number
freq_cnt
=
vxi11
.
Instrument
(
sys
.
argv
[
1
])
#freq_cnt = vxi11.Instrument("192.168.32.251")
freq_cnt
=
vxi11
.
Instrument
(
IP
)
# Put the device in a known state
freq_cnt
.
write
(
"*RST"
)
...
...
@@ -171,10 +200,6 @@ if __name__ == "__main__":
print
(
freq_cnt
.
ask
(
"*IDN?"
))
# Returns 'Agilent Technologies,53230A,MY50001484,02.05-1519.666-1.19-4.15-127-155-35'
if
len
(
sys
.
argv
)
>=
3
:
# There are more arguments...
num_meas
=
int
(
sys
.
argv
[
2
]
.
split
(
'='
)[
1
])
print
(
"num_meas"
,
num_meas
)
# Setup Time Interval measurment from channel 1 -> 2
freq_cnt
.
write
(
"CONFigure:TINTerval (@1),(@2)"
)
...
...
@@ -183,7 +208,12 @@ if __name__ == "__main__":
freq_cnt
.
write
(
"SENSE:TINTerval:GATE:POLarity POSitive"
)
# Use external 10MHz reference
freq_cnt
.
write
(
"ROSCillator:SOURce EXTernal"
)
#freq_cnt.write("ROSCillator:SOURce EXTernal")
# Use internal reference
# forward Keysight 53230A 10MHz reference output to Keysight
# Waveform Generator 33600A reference 10MHz input).
# Keysight 33600A generated 10 MHz and PPS for mode abscal.
freq_cnt
.
write
(
"ROSCillator:SOURce INTernal"
)
# Disable timeout (otherwise we might loose measurements)
freq_cnt
.
write
(
"SYSTem:TIMeout INFinity"
)
...
...
@@ -196,16 +226,17 @@ if __name__ == "__main__":
# A fixed trigger level is important for proper timing measurement
# MiniCircuits Splitters ZFRSC-123+ have ~ 6 + 3,75 dB attenuation (~ factor 3).
# A 2,4 V signal split once results in 0,8 V, slit twice in 260 mV.
# A 2,4 V signal split once results in 0,8 V, s
p
lit twice in 260 mV.
use_power_splitter_ch1
=
False
use_power_splitter_ch2
=
True
#
use_power_splitter_ch1 = False
#
use_power_splitter_ch2 = True
freq_cnt
.
write
(
"INP1:IMP 50"
)
if
use_power_splitter_ch1
:
freq_cnt
.
write
(
"INP1:LEV 0.15"
)
else
:
freq_cnt
.
write
(
"INP1:LEV 0.3"
)
freq_cnt
.
write
(
"INP1:LEV "
+
str
(
float
(
in1
)))
#if use_power_splitter_ch1:
# freq_cnt.write("INP1:LEV 0.15")
#else:
# freq_cnt.write("INP1:LEV 0.3")
# Channel 2 setup:
freq_cnt
.
write
(
"INP2:COUP DC"
)
...
...
@@ -215,15 +246,16 @@ if __name__ == "__main__":
# A fixed trigger level is important for proper timing measurement
# MiniCircuits Splitters ZFRSC-123+ have ~ 6 + 3,75 dB attenuation (~ factor 3).
# A 2,4 V signal split once results in 0,8 V, slit twice in 260 mV.
# A 2,4 V signal split once results in 0,8 V, s
p
lit twice in 260 mV.
freq_cnt
.
write
(
"INP2:IMP 50"
)
if
use_power_splitter_ch2
:
freq_cnt
.
write
(
"INP2:LEV 0.15"
)
else
:
freq_cnt
.
write
(
"INP2:LEV 0.3"
)
freq_cnt
.
write
(
"INP2:LEV "
+
str
(
float
(
in2
)))
#if use_power_splitter_ch2:
# freq_cnt.write("INP2:LEV 0.15")
#else:
# freq_cnt.write("INP2:LEV 0.3")
# initialize and wait for initialisatio to complete
# initialize and wait for initialisatio
n
to complete
freq_cnt
.
write
(
"INIT"
)
freq_cnt
.
write
(
"*WAI"
)
...
...
@@ -236,4 +268,4 @@ if __name__ == "__main__":
#plt.plot(x,y)
#plt.show()
sys
.
exit
()
sys
.
exit
()
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment