From 86f4d2f6b9ca2288a143e5fd2c0380fe1cec03ac Mon Sep 17 00:00:00 2001 From: WWW daemon apache Date: Tue, 29 Oct 2013 17:40:57 +0100 Subject: [PATCH] adapted start.pl, removed some warnings from unpacker --- tools/preview/unpack_hld.pl | 10 +++++----- tools/start.pl | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/preview/unpack_hld.pl b/tools/preview/unpack_hld.pl index 8f40c28..819d3f4 100755 --- a/tools/preview/unpack_hld.pl +++ b/tools/preview/unpack_hld.pl @@ -396,11 +396,11 @@ sub analyzeData() { SensLoop: while(1) { #Loop over Sensors #Read Sensor Header - my $SensorHead = ($data->[$pos+0] << 16) + $data->[$pos+1]; - my $SensorId = $data->[$pos+3]; - my $SensorStatus = ($data->[$pos+4] << 16) + $data->[$pos+5]; - my $SensorError = ($data->[$pos+6] << 16) + $data->[$pos+7]; - my $SensorDebug = ($data->[$pos+8] << 16) + $data->[$pos+9]; + my $SensorHead = (($data->[$pos+0]||0) << 16) + ($data->[$pos+1]||0); + my $SensorId = ($data->[$pos+3]||0); + my $SensorStatus = (($data->[$pos+4]||0) << 16) + ($data->[$pos+5]||0); + my $SensorError = (($data->[$pos+6]||0) << 16) + ($data->[$pos+7]||0); + my $SensorDebug = (($data->[$pos+8]||0) << 16) + ($data->[$pos+9]||0); $pos+=10; if($opt_frameinfo) { diff --git a/tools/start.pl b/tools/start.pl index 356258f..1aa7a97 100755 --- a/tools/start.pl +++ b/tools/start.pl @@ -59,11 +59,11 @@ trb_write(0x8c01,0x00c3,0xffff); trb_write(0xf30c,0x00c0,0x00f0); #No trigger for TRB3 ROC a.t.m. trb_write(0xf30c,0x00c1,0x00f0); -trb_write(0xf30c,0x00c3,0x00f1); #no slowcontrol for unused FPGA +trb_write(0xf30c,0x00c3,0x00ff); #only slowcontrol for unused FPGA #Set Sensor IDs -trb_write(0xc002,0x00c1,0xccc1ccc0); +trb_write(0xc002,0x00c0,0xccc1ccc0); #Set JTAG switches trb_write(0xc002,0x00c2,0x00000000); -- 2.43.0