]> jspc29.x-matter.uni-frankfurt.de Git - mvdsensorcontrol.git/commitdiff
adapted start.pl, removed some warnings from unpacker
authorWWW daemon apache <wwwrun@jspc55.x-matter.uni-frankfurt.de>
Tue, 29 Oct 2013 16:40:57 +0000 (17:40 +0100)
committerWWW daemon apache <wwwrun@jspc55.x-matter.uni-frankfurt.de>
Tue, 29 Oct 2013 16:40:57 +0000 (17:40 +0100)
tools/preview/unpack_hld.pl
tools/start.pl

index 8f40c28affb7d754779662318d2a8f387293e183..819d3f4503becbbe959b71866466e2d49e258bd1 100755 (executable)
@@ -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) {
index 356258f4f5e32f6ffdfe65dc0da09ef0d6b9c0ed..1aa7a971316e2551219b1f31320b1262dd04c867 100755 (executable)
@@ -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);