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
fd4c19d6
Commit
fd4c19d6
authored
Jun 01, 2018
by
Peter Jansweijer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use SPEC in grandmaster mode with external reference oscillator
parent
2c4f1f20
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
12 deletions
+12
-12
pps_diff.py
sw/insitu_alpha/pps_diff.py
+9
-9
wr_serial.py
sw/insitu_alpha/wr_serial.py
+3
-3
No files found.
sw/insitu_alpha/pps_diff.py
View file @
fd4c19d6
...
...
@@ -157,8 +157,8 @@ def link_restart(ser_master,ser_slave, master_is_switch = True):
else
:
wr2wrpc
(
ser_master
,
"ptp stop
\r
"
,
"mst=>"
)
time
.
sleep
(
1
)
wr2wrpc
(
ser_master
,
"mode master
\r
"
,
"mst=>"
)
time
.
sleep
(
5
)
#wr2wrpc(ser_master,"mode gm
\r","mst=>")
#time.sleep (20
)
wr2wrpc
(
ser_master
,
"ptp start
\r
"
,
"mst=>"
)
time
.
sleep
(
1
)
...
...
@@ -309,9 +309,9 @@ def tic_init(counter):
counter
.
write
(
"SENSE:TINTerval:GATE:POLarity POSitive"
)
# Use external 10MHz reference
#
counter.write("ROSCillator:SOURce EXTernal")
counter
.
write
(
"ROSCillator:SOURce EXTernal"
)
# Use internal 10MHz reference
counter
.
write
(
"ROSCillator:SOURce INTernal"
)
#
counter.write("ROSCillator:SOURce INTernal")
# Disable timeout (otherwise we might loose measurements)
counter
.
write
(
"SYSTem:TIMeout INFinity"
)
...
...
@@ -409,9 +409,9 @@ def file_to_array(filename):
# Values of interest on one line are:
# # lambda-1[nm], ITU-ch, SPEC_alpha_3wl(lambda-1)
#
pair = float(line_lst[1]),float(line_lst[2])
pair
=
float
(
line_lst
[
1
]),
float
(
line_lst
[
2
])
# # lambda-1[nm], ITU-ch, alpha_sel(lambda-1)
pair
=
float
(
line_lst
[
1
]),
int
(
round
(
spec_alpha
(
float
(
line_lst
[
2
]))))
#
pair = float(line_lst[1]),int(round(spec_alpha(float(line_lst[2]))))
pairs
.
append
(
pair
)
arr_pair
=
numpy
.
array
(
pairs
)
...
...
@@ -561,9 +561,9 @@ if __name__ == "__main__":
ser_tunable
=
ser_slave
ser_tunable_str
=
"slv=>"
wr2wrpc
(
ser_master
,
"mode
master
\r
"
,
"mst=>"
)
wr2wrpc
(
ser_master
,
"mode
gm
\r
"
,
"mst=>"
)
wr2wrpc
(
ser_slave
,
"mode slave
\r
"
,
"slv=>"
)
time
.
sleep
(
5
)
time
.
sleep
(
20
)
timestamp
=
time
.
localtime
()
...
...
@@ -679,7 +679,7 @@ if __name__ == "__main__":
spool_temp
=
float
(
dmm
.
ask
(
"MEAS:TEMP? FRTD"
))
print
(
"delta delay: "
+
str
(
mean
)
+
" Std Deviation: "
+
str
(
sdev
)
+
" fiber-spool temp: "
+
str
(
spool_temp
))
data_file
.
write
(
str
(
mean
)
+
", "
+
str
(
sdev
)
+
", "
+
str
(
spool_temp
)
+
", "
+
tic_filename
"
\n
"
)
data_file
.
write
(
str
(
mean
)
+
", "
+
str
(
sdev
)
+
", "
+
str
(
spool_temp
)
+
", "
+
tic_filename
+
"
\n
"
)
except
:
print
(
"### exception during ddelay_measurements."
)
...
...
sw/insitu_alpha/wr_serial.py
View file @
fd4c19d6
...
...
@@ -153,8 +153,8 @@ def link_restart(ser_master,ser_slave, master_is_switch = True):
else
:
wr2wrpc
(
ser_master
,
"ptp stop
\r
"
,
"mst=>"
)
time
.
sleep
(
1
)
wr2wrpc
(
ser_master
,
"mode gm
\r
"
,
"mst=>"
)
time
.
sleep
(
5
)
#
wr2wrpc(ser_master,"mode gm\r","mst=>")
#time.sleep (20
)
wr2wrpc
(
ser_master
,
"ptp start
\r
"
,
"mst=>"
)
time
.
sleep
(
1
)
...
...
@@ -365,7 +365,7 @@ if __name__ == "__main__":
wr2wrpc
(
ser_master
,
"mode gm
\r
"
,
"mst=>"
)
wr2wrpc
(
ser_slave
,
"mode slave
\r
"
,
"slv=>"
)
time
.
sleep
(
5
)
time
.
sleep
(
20
)
# stop any pending ptp and or statistics output
wr2wrpc
(
ser_master
,
"stat off
\r
"
,
"mst=>"
)
...
...
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