Skip to content

W
White Rabbit Calibration
Commit fd4c19d6 authored by Peter Jansweijer's avatar Peter Jansweijer
Browse files
Options

use SPEC in grandmaster mode with external reference oscillator

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