some fixes, can now display data from sensors connected to different peripheral FPGAs

diff --git a/tools/preview/unpack_hld.pl b/tools/preview/unpack_hld.pl
index c37c48dd55333843dd162fba151616d20dee41f2..6687079f045d5a32d81326048c129ad590b8d463 100755 (executable)
--- a/tools/preview/unpack_hld.pl
+++ b/tools/preview/unpack_hld.pl
@@ -404,7 +404,7 @@ sub analyzeData() {
     SensLoop: while(1) { #Loop over Sensors
       #Read Sensor Header
       my $SensorHead   = (($data->[$pos+0]||0) << 16) + ($data->[$pos+1]||0);
-      my $SensorId     = ($data->[$pos+3]||0);
+      my $SensorId     = ($RocId<<16)|($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);
@@ -525,7 +525,7 @@ sub WriteResults {
     my @hitrates;
     if($opt_hitrates) {
       
-      printf("%s\t%i\t%i\t%i\t%i\t%10i\t%10i\t%10i\t%10i\n",
+      printf("%08x\t%i\t%i\t%i\t%i\t%10i\t%10i\t%10i\t%10i\n",
                $id,
                $hitcount->{$id},
                $Statistics->{$id}->{Valid}||0,
@@ -559,7 +559,7 @@ sub WriteResults {
       print $fg  "set yrange [0:576];\n";
       print $fg  "set cbrange [0:$Statistics->{$id}->{Valid}];\n";
       print $fg  "set palette defined ( 0 'white', 1 'red', 5 'black', 10 'blue', $Statistics->{$id}->{Valid} 'green');\n";
-      my $s = sprintf("%04x",$id);
+      my $s = sprintf("%08x",$id);
 
       print $fg strftime("set label 100 \"%H:%M:%S\" at screen 0.98,0.02 right tc rgb \"#000044\" font \"monospace,8\"\n", localtime());
       print $fg  "set label 101 \"".$hitcount->{$id}." States, ".($Statistics->{$id}->{Valid}||0)." good, ".($Statistics->{$id}->{Broken}||0)." broken, ".($Statistics->{$id}->{RealBroken}||0)." invalid\" at screen 0.02,0.01 left tc  rgb \"#000044\" font \"monospace,8\"\n" ;

diff --git a/tools/start.pl b/tools/start.pl
index 417a838820e67b34b6044690a6b6ef32dccf3a40..877fe47c74bd3ee386cf9ef653a8683da419acf1 100755 (executable)
--- a/tools/start.pl
+++ b/tools/start.pl
@@ -67,9 +67,9 @@ if($system eq 'Vacuum') {
   trb_write($ccu,0x00c3,0x00ff);   #only slowcontrol for unused FPGA
   }
 if($system eq 'ELab') {
-  trb_write($ccu,0x00c0,0x00e4);   
-  trb_write($ccu,0x00c1,0x00e4);
-  trb_write($ccu,0x00c3,0x00fc);   #only slowcontrol for unused FPGA
+  trb_write($ccu,0x00c0,0x00ed);   
+  trb_write($ccu,0x00c1,0x00ed);
+  trb_write($ccu,0x00c3,0x00fd); # only 0x00, 0x02, 0x03 active 
   }
 
 #Send arbiter start signal

diff --git a/tools/testgui.pl b/tools/testgui.pl
index 843583c30c9b8dbf6025e9cf93021e9cfebac166..7a5dc396bce60d7796673e5ab599c04cffc56878 100755 (executable)
--- a/tools/testgui.pl
+++ b/tools/testgui.pl
@@ -279,7 +279,7 @@ sub print_sensorArea {
   
   my $controllerAddress = $controller->findvalue("./\@address");
   
-  my $sensorId = $systemName.'_0x'.$controllerAddress.'_'.$sensor->findvalue("./\@id");
+  my $sensorId = $systemName.'_'.$controllerAddress.$sensor->findvalue("./\@id");
   my $sensorName = $sensor->findvalue("./\@name");
   my $sensorConfig = $sensor->findvalue("./\@config");
   my $sensorEnabled = $sensor->findvalue("./\@enabled");