diff --git a/CablingDB/cablingDB.py b/CablingDB/cablingDB.py index 07757ea59fbd75c02abd0745040441d7c53dd10c..9d81f2a07fe9ec5b05db241eee69eca10c8eb543 100755 --- a/CablingDB/cablingDB.py +++ b/CablingDB/cablingDB.py @@ -537,10 +537,10 @@ digi_map = { ('vetonu', 0, 1, 0), ('veto', 1, 0, 0), ('veto', 1, 1, 0), - ('timing', 0, 0, 1), - ('timing', 0, 0, 0), - ('timing', 0, 1, 1), - ('timing', 0, 1, 0), + ('trigger', 0, 0, 1), + ('trigger', 0, 0, 0), + ('trigger', 0, 1, 1), + ('trigger', 0, 1, 0), ('preshower', 0, 0, 0), ('preshower', 0, 1, 0), ('veto', 0, 1, 0), @@ -609,7 +609,7 @@ for run, data in digi_map.items(): assert isinstance(data[i][1], int), 'Digitizer station is not int' assert isinstance(data[i][2], int), 'Digitizer plane is not int' assert isinstance(data[i][3], int), 'Digitizer pmt is not int' - assert data[i][0] in ['trigger', 'timing', 'veto', 'vetonu', 'preshower', 'calo'], 'Invalid type' + assert data[i][0] in ['trigger', 'veto', 'vetonu', 'preshower', 'calo'], 'Invalid type' assert data[i][1] >= -1 and data[i][1] <= 1, 'Invalid station number' assert data[i][2] >= -1 and data[i][2] <= 3, 'Invalid plate number' assert data[i][3] >= -1 and data[i][3] <= 1, 'Invalid pmt number' diff --git a/CablingDB/extractDigitizerMapping.py b/CablingDB/extractDigitizerMapping.py index a5278d9785adb550b4975ab1cae86f51d9a5cdf5..3f66fd4fe9e878488201dbfb1f3593f0384bf51d 100755 --- a/CablingDB/extractDigitizerMapping.py +++ b/CablingDB/extractDigitizerMapping.py @@ -63,10 +63,10 @@ TI12_6520_map = [ ('vetonu', 0, 1, 0), ('veto', 1, 0, 0), # Digitizer 6 ('veto', 1, 1, 0), - ('timing', 0, 0, 1), # Digitizer 8 - ('timing', 0, 0, 0), - ('timing', 0, 1, 1), - ('timing', 0, 1, 0), + ('trigger', 0, 0, 1), # Digitizer 8 + ('trigger', 0, 0, 0), + ('trigger', 0, 1, 1), + ('trigger', 0, 1, 0), ('preshower', 0, 0, 0), # Digitizer 12 ('preshower', 0, 1, 0), ('veto', 0, 1, 0), # Digitizer 14