Skip to content
Snippets Groups Projects
Commit 311fd817 authored by Patrick Robbe's avatar Patrick Robbe
Browse files

Merge branch 'master' of gitlab.in2p3.fr:belle2-daq-upgrade/software

parents 559fb7fb f606a102
No related branches found
No related tags found
No related merge requests found
...@@ -28,6 +28,7 @@ Pcie40Applications/pcie40_ecs ...@@ -28,6 +28,7 @@ Pcie40Applications/pcie40_ecs
Pcie40Applications/pcie40_reload Pcie40Applications/pcie40_reload
Pcie40Applications/pcie40_b2slc Pcie40Applications/pcie40_b2slc
Pcie40Applications/pcie40_dma Pcie40Applications/pcie40_dma
Pcie40Applications/pcie40_b2linkreset
*.d *.d
**/pcie40_reload.out **/pcie40_reload.out
File deleted
...@@ -23,7 +23,7 @@ int pcie40_b2dmabufferread(int fd , unsigned int result[] ) { ...@@ -23,7 +23,7 @@ int pcie40_b2dmabufferread(int fd , unsigned int result[] ) {
int ret = 0 ; int ret = 0 ;
unsigned int * pData = 0 ; unsigned int * pData = 0 ;
ret = dma_launch( fd , &pData ) ; ret = dma_launch( fd , &pData ) ;
if ( ( *pData == NULL ) || ( ret <= 0 ) ) return 0 ; if ( ( pData == NULL ) || ( ret <= 0 ) ) return 0 ;
for ( i = 0 ; i < DMASIZE ; ++i ) result[ i ] = pData[ i ] ; for ( i = 0 ; i < DMASIZE ; ++i ) result[ i ] = pData[ i ] ;
return 1 ; return 1 ;
} }
......
...@@ -18,7 +18,7 @@ for nev in range( 1 ): ...@@ -18,7 +18,7 @@ for nev in range( 1 ):
if ( hname == 'belle2daq.local' ): if ( hname == 'belle2daq.local' ):
os.system( "ssh vme \"trigft -80 pulse 1 1\"" ) ### ADD this to suppress output >/dev/null 2>&1" ) os.system( "ssh vme \"trigft -80 pulse 1 1\"" ) ### ADD this to suppress output >/dev/null 2>&1" )
else: ### KEK else: ### KEK
os.system( "ssh ttd3 \"trigft -23 pulse 1 1\"" ) os.system( "ssh vme \"trigft -53 pulse 1 1\"" )
# wait for data to arrive # wait for data to arrive
size = 0 size = 0
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment