Commit a779408d authored by Matthieu Cattin's avatar Matthieu Cattin

fmc_adc: Move timetag core to fmc_adc class.

parent ea23d039
This diff is collapsed.
......@@ -194,10 +194,10 @@ def poll_timer_cb():
temp = "%3.3f"%fmc.get_temp()
temp += u'\u00B0'+'C'
m.mezz_temp.setText(temp)
trig_tag = carrier.get_utc_trig_tag()
start_tag = carrier.get_utc_start_tag()
stop_tag = carrier.get_utc_stop_tag()
end_tag = carrier.get_utc_end_tag()
trig_tag = fmc.get_utc_trig_tag()
start_tag = fmc.get_utc_start_tag()
stop_tag = fmc.get_utc_stop_tag()
end_tag = fmc.get_utc_end_tag()
trig_tag_s = "%09d.%010d s"%(trig_tag[2],(trig_tag[3]*8))
start_tag_s = "%09d.%010d s"%(start_tag[2],(start_tag[3]*8))
stop_tag_s = "%09d.%010d s"%(stop_tag[2],(stop_tag[3]*8))
......@@ -239,11 +239,11 @@ if __name__ == "__main__":
# Set UTC
current_time = time.time()
utc_seconds = int(current_time)
carrier.set_utc_second_cnt(utc_seconds)
#print('UTC core seconds counter: %d')%carrier.get_utc_second_cnt()
fmc.set_utc_second_cnt(utc_seconds)
#print('UTC core seconds counter: %d')%fmc.get_utc_second_cnt()
utc_coarse = int((current_time - utc_seconds)/8E-9)
carrier.set_utc_coarse_cnt(utc_coarse)
#print('UTC core coarse counter: %d')%carrier.get_utc_coarse_cnt()
fmc.set_utc_coarse_cnt(utc_coarse)
#print('UTC core coarse counter: %d')%fmc.get_utc_coarse_cnt()
# Variables from GUI
ch_range = [m.ch1_range, m.ch2_range, m.ch3_range, m.ch4_range]
......
......@@ -196,12 +196,12 @@ def main (default_directory='.'):
# Set UTC
current_time = time.time()
utc_seconds = int(current_time)
carrier.set_utc_second_cnt(utc_seconds)
print "UTC core seconds counter initialised to : %d" % carrier.get_utc_second_cnt()
fmc.set_utc_second_cnt(utc_seconds)
print "UTC core seconds counter initialised to : %d" % fmc.get_utc_second_cnt()
utc_coarse = int((current_time - utc_seconds)/8E-9)
carrier.set_utc_coarse_cnt(utc_coarse)
print "UTC core coarse counter initialised to : %d" % carrier.get_utc_coarse_cnt()
fmc.set_utc_coarse_cnt(utc_coarse)
print "UTC core coarse counter initialised to : %d" % fmc.get_utc_coarse_cnt()
# Print configuration
fmc.print_adc_core_config()
......@@ -243,15 +243,17 @@ def main (default_directory='.'):
acq_data = acq_channels(fmc, carrier, ADC_FS[IN_RANGE], ACQ_PAUSE)
channels_data[ch] = acq_data[ch::4]
# Get time-tags
trig_tag = carrier.get_utc_trig_tag()
start_tag = carrier.get_utc_start_tag()
stop_tag = carrier.get_utc_stop_tag()
end_tag = carrier.get_utc_end_tag()
trig_tag = fmc.get_utc_trig_tag()
start_tag = fmc.get_utc_start_tag()
stop_tag = fmc.get_utc_stop_tag()
end_tag = fmc.get_utc_end_tag()
print('Acq stop time-tag : %10.10f [s]')%(stop_tag[2]+(stop_tag[3]*8E-9))
print('Acq start time-tag : %10.10f [s]')%(start_tag[2]+(start_tag[3]*8E-9))
print('Trigger time-tag : %10.10f [s]')%(trig_tag[2]+(trig_tag[3]*8E-9))
print('Acq end time-tag : %10.10f [s]')%(end_tag[2]+(end_tag[3]*8E-9))
fmc.print_utc_core_regs()
# Calculate mean for each channel data
ch_mean = []
for ch in range(NB_CHANNELS):
......
......@@ -169,12 +169,12 @@ def main (default_directory='.'):
# Set UTC
current_time = time.time()
utc_seconds = int(current_time)
spec_fmc.set_utc_second_cnt(utc_seconds)
print('UTC core seconds counter: %d')%spec_fmc.get_utc_second_cnt()
fmc.set_utc_second_cnt(utc_seconds)
print('UTC core seconds counter: %d')%fmc.get_utc_second_cnt()
utc_coarse = int((current_time - utc_seconds)/8E-9)
spec_fmc.set_utc_coarse_cnt(utc_coarse)
print('UTC core coarse counter: %d')%spec_fmc.get_utc_coarse_cnt()
fmc.set_utc_coarse_cnt(utc_coarse)
print('UTC core coarse counter: %d')%fmc.get_utc_coarse_cnt()
# Set sine params
sine.frequency = 1E6
......@@ -213,10 +213,10 @@ def main (default_directory='.'):
# Print time-tags
print('UTC time-tags:')
trig_tag = spec_fmc.get_utc_trig_tag()
start_tag = spec_fmc.get_utc_start_tag()
stop_tag = spec_fmc.get_utc_stop_tag()
end_tag = spec_fmc.get_utc_end_tag()
trig_tag = fmc.get_utc_trig_tag()
start_tag = fmc.get_utc_start_tag()
stop_tag = fmc.get_utc_stop_tag()
end_tag = fmc.get_utc_end_tag()
print trig_tag
print start_tag
print stop_tag
......
......@@ -224,11 +224,11 @@ def main (default_directory='.'):
# Set UTC
current_time = time.time()
utc_seconds = int(current_time)
spec_fmc.set_utc_second_cnt(utc_seconds)
print "\nUTC core seconds counter: %d"%spec_fmc.get_utc_second_cnt()
fmc.set_utc_second_cnt(utc_seconds)
print "\nUTC core seconds counter: %d"%fmc.get_utc_second_cnt()
utc_coarse = int((current_time - utc_seconds)/8E-9)
spec_fmc.set_utc_coarse_cnt(utc_coarse)
print "UTC core coarse counter: %d"%spec_fmc.get_utc_coarse_cnt()
fmc.set_utc_coarse_cnt(utc_coarse)
print "UTC core coarse counter: %d"%fmc.get_utc_coarse_cnt()
# Connects channel 1 to AWG
ch = 1
......@@ -333,10 +333,10 @@ def main (default_directory='.'):
# Print time-tags
print "\nUTC time-tags:"
trig_tag = spec_fmc.get_utc_trig_tag()
start_tag = spec_fmc.get_utc_start_tag()
stop_tag = spec_fmc.get_utc_stop_tag()
end_tag = spec_fmc.get_utc_end_tag()
trig_tag = fmc.get_utc_trig_tag()
start_tag = fmc.get_utc_start_tag()
stop_tag = fmc.get_utc_stop_tag()
end_tag = fmc.get_utc_end_tag()
print "Trigger time-tag : %10.10f [s]"%(trig_tag[2]+(trig_tag[3]*8E-9))
print "Acq start time-tag : %10.10f [s]"%(start_tag[2]+(start_tag[3]*8E-9))
print "Acq stop time-tag : %10.10f [s]"%(stop_tag[2]+(stop_tag[3]*8E-9))
......
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