|
@@ -195,7 +195,13 @@ class DataSet(object):
|
|
|
|
|
|
|
|
|
finedelay_factor = board_config.get("chip_delay_factor")
|
|
|
- finedelays = board_config.get("chip_delay")
|
|
|
+
|
|
|
+ #TRIAGE:
|
|
|
+ #FMC Banks are currently (18.12.2020) switched, so the slots for the
|
|
|
+ #ADC delay slots 1,2,3,4 are for ADCs 5,6,7,8 and vice versa
|
|
|
+ fdelays = board_config.get("chip_delay")
|
|
|
+ finedelays = fdelays[:4] + fdelays[4:]
|
|
|
+
|
|
|
finedelays = [i * finedelay_factor for i in finedelays]
|
|
|
|
|
|
|
|
@@ -240,11 +246,13 @@ class DataSet(object):
|
|
|
|
|
|
|
|
|
#Express the delays as fractions of full timing distance between bunches
|
|
|
- adcdelays_ps = [i / time_between_bunches_ps for i in adcdelays_ps]
|
|
|
+ adcdelays_ps = [float(i) / time_between_bunches_ps for i in adcdelays_ps]
|
|
|
|
|
|
- print("###############################")
|
|
|
- print(adcdelays_ps)
|
|
|
- print("###############################")
|
|
|
+ #print("###############################")
|
|
|
+ #print(finedelays)
|
|
|
+ #print(adcdelays_ps)
|
|
|
+ #print(board_config.dump())
|
|
|
+ #print("###############################")
|
|
|
|
|
|
|
|
|
return adcdelays_ps
|