diff --git a/Scripts/setup.sh b/Scripts/setup.sh index 7fa19fff5c64947de4ac511fb79c812970c1500d..65e3ab439ced642c788df8cc752df8ba71cfa2e2 100644 --- a/Scripts/setup.sh +++ b/Scripts/setup.sh @@ -1,5 +1,5 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" export PYTHONPATH=${PYTHONPATH}:${DIR}/../Python export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${DIR}/../Lib/lib:${DIR}/../Driver/pcie40 -export PATH=${PATH}:${DIR}/../Driver/pcie40_reload +export PATH=${PATH}:${DIR}/../Driver/pcie40_reload:${DIR}/../Driver/pcie40 diff --git a/Scripts/testB2L.py b/Scripts/testB2L.py index 4fd61fd35fdc86ff7c1f6179f821bae28e1043f7..9f5861a2c65717373b0055d4ec233f00ec00e88d 100644 --- a/Scripts/testB2L.py +++ b/Scripts/testB2L.py @@ -57,13 +57,6 @@ def _crc16(data, crc, table): import socket hname = socket.gethostname() -# initialize belle2 link in PCIe40 -mem.write( 0 , 0x00050100 , 0x0 ) -mem.write( 0 , 0x00050100 , 0x4 ) -mem.write( 0 , 0x00050100 , 0x0 ) -mem.write( 0 , 0x00050100 , 0x4 ) -mem.write( 0 , 0x00050100 , 0x0 ) - for nev in range( 10 ): # Send trigger (adapt this line to your system) @@ -100,23 +93,23 @@ for nev in range( 10 ): # Display data: print '===================================' - print 'B2L: {:08x}'.format(data[0]) - print 'B2L: {:08x}'.format(data[1]) - print 'B2L: {:08x}'.format(data[2]) - print 'B2L: {:08x}'.format(data[3]) - print 'B2L: {:08x}'.format(data[4]) + print 'B2L: {0:08x}'.format(data[0]) + print 'B2L: {0:08x}'.format(data[1]) + print 'B2L: {0:08x}'.format(data[2]) + print 'B2L: {0:08x}'.format(data[3]) + print 'B2L: {0:08x}'.format(data[4]) print '-----------------------------------' - print 'FEE: data #0 {:08x}'.format(data[5]) - print 'FEE: data #1 {:08x}'.format(data[6]) + print 'FEE: data #0 {0:08x}'.format(data[5]) + print 'FEE: data #1 {0:08x}'.format(data[6]) print 'FEE: ..........' - print 'FEE: data #{} {:08x}'.format(size/2-7,data[size/2-4]) + print 'FEE: data #{0} {1:08x}'.format(size/2-7,data[size/2-4]) print '-----------------------------------' - print 'B2L: {:08x}'.format(data[size/2-3]) - print 'B2L: {:08x}'.format(data[size/2-2]) + print 'B2L: {0:08x}'.format(data[size/2-3]) + print 'B2L: {0:08x}'.format(data[size/2-2]) print '===================================' print '' - print 'CRC = {:04x}'.format(data[size/2-2]&0xFFFF) - print 'Computed CRC {:04x}'.format(_crc16( data_crc, 0xffff , CRC16_XMODEM_TABLE ) ) + print 'CRC = {0:04x}'.format(data[size/2-2]&0xFFFF) + print 'Computed CRC {0:04x}'.format(_crc16( data_crc, 0xffff , CRC16_XMODEM_TABLE ) ) if ( data[size/2-2]&0xFFFF ) != ( _crc16( data_crc, 0xffff , CRC16_XMODEM_TABLE ) ): print 'Error in CRC comparison' nErr = nErr + 1