latest version

diff --git a/control/gui/expert/Reboot RICH b/control/gui/expert/Reboot RICH
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/evtbuild/start_eb_gbe.pl b/evtbuild/start_eb_gbe.pl
index e2bf2537d0de0d4fc8ae85f0e17ac56a9099f9ce..87d9565038668adb7667959f0e28b60565c65831 100755 (executable)
--- a/evtbuild/start_eb_gbe.pl
+++ b/evtbuild/start_eb_gbe.pl
@@ -813,11 +813,11 @@ sub killIOC()
 
     #print Dumper \%$ioc_href;
 
-    &writeExpectIOC() if( defined %$ioc_href );
+    &writeExpectIOC() if(%$ioc_href);
 
     if($opt_verb){
         print "Killing running IOCs...\n";
-        print "No IOCs found - nothing to kill, continue...\n" unless( defined %$ioc_href );
+        print "No IOCs found - nothing to kill, continue...\n" unless(%$ioc_href);
     }
 
     my (@process_list);

diff --git a/hmon/HPlot.pm b/hmon/HPlot.pm
index ef8ea04ff57a6eedcba1808cb5b66f44e6661cdd..8077c12af5a80446b1e34bd45bfa65b2f4672517 100755 (executable)
--- a/hmon/HPlot.pm
+++ b/hmon/HPlot.pm
@@ -13,7 +13,7 @@ use constant {OUT_PNG    => 1,
               OUT_SVG    => 2,  #n/a
               OUT_SCREEN => 3}; #n/a
 
-my @color= ('#2222dd','#dd2222','#22dd22','#dd8822','#dd22dd','#22dddd','#dddd22','#8888dd','#8822bb');
+my @color= ('#2222dd','#dd2222','#22dd22','#dd8822','#dd22dd','#22dddd','#dddd22','#8888dd','#8822bb','#444444');
 
 sub plot_write {
   my ($file,$str,$no) = @_;
@@ -56,8 +56,7 @@ sub PlotInit {
   $p->{$name}->{xscale} = $p->{$name}->{xscale} || 1;
   $p->{$name}->{type}   or die "No plot type specified";
   $p->{$name}->{output} or die "No destination specified";
-
-  @color = @{$p->{$name}->{colors}} if($p->{$name}->{colors});
+  $p->{$name}->{colors} = $p->{$name}->{colors} || \@color;
 
   foreach my $i (0..($c->{entries}-1)) {
     for my $j (0..($c->{curves}-1)) {
@@ -110,13 +109,13 @@ sub PlotInit {
     plot_write($fh,"plot ",1);
     for(my $j=0; $j<$p->{$name}->{curves};$j++) {
       if($p->{$name}->{fill}) {
-        plot_write($fh,"'-' using 1:2 with filledcurves x1 lt rgb \"$color[$j]\" title \"".($p->{$name}->{titles}->[$j] || "$j")."\" ",1);
+        plot_write($fh,"'-' using 1:2 with filledcurves x1 lt rgb \"".$p->{$name}->{colors}->[$j]."\" title \"".($p->{$name}->{titles}->[$j] || "$j")."\" ",1);
         }
       elsif($p->{$name}->{dots}) {
-        plot_write($fh,"'-' using 1:2 with points pointsize 0.6 pointtype 2 lt rgb \"$color[$j]\" title \"".($p->{$name}->{titles}->[$j] || "$j")."\" ",1);
+        plot_write($fh,"'-' using 1:2 with points pointsize 0.6 pointtype 2 lt rgb \"".$p->{$name}->{colors}->[$j]."\" title \"".($p->{$name}->{titles}->[$j] || "$j")."\" ",1);
         }
       else {
-        plot_write($fh,"'-' using 1:2 with lines  lt rgb \"$color[$j]\" title \"".($p->{$name}->{titles}->[$j] || "$j")."\" ",1);
+        plot_write($fh,"'-' using 1:2 with lines  lt rgb \"".$p->{$name}->{colors}->[$j]."\" title \"".($p->{$name}->{titles}->[$j] || "$j")."\" ",1);
         }
       plot_write($fh,', ',1) unless ($j+1==$p->{$name}->{curves});
       }
@@ -125,19 +124,19 @@ sub PlotInit {
   elsif($p->{$name}->{type} == TYPE_BARGRAPH) {
     plot_write($fh,"set style fill   solid 1.00 border -1");
     plot_write($fh,"set grid noxtics ytics");
-    plot_write($fh,"set boxwidth 2 absolute");
+    plot_write($fh,"set boxwidth 4 absolute");
     plot_write($fh,"set xtics (",1);
     for(my $j=0; $j<scalar @{$p->{$name}->{bartitle}};$j++) {
       plot_write($fh,', ',1) if $j;
       plot_write($fh,"'".$p->{$name}->{bartitle}->[$j]."' $j ",1);
       }
-    plot_write($fh,") offset 2,0 scale 0");
+    plot_write($fh,") offset 2.5,0 scale 0");
     plot_write($fh,"set style histogram title offset character 0, 0, 0");
     plot_write($fh,"set style data histograms");
     plot_write($fh,"plot ",1);
     for(my $j=0; $j<$p->{$name}->{curves};$j++) {
       plot_write($fh,', ',1) if $j;
-      plot_write($fh,"'-' lt rgb \"$color[$j]\" title \"".($p->{$name}->{titles}->[$j] || "$j")."\" ",1);
+      plot_write($fh,"'-' lt rgb \"".$p->{$name}->{colors}->[$j]."\" title \"".($p->{$name}->{titles}->[$j] || "$j")."\" ",1);
       }
     plot_write($fh," ");
     }
@@ -171,7 +170,7 @@ sub PlotDraw {
       }  
     elsif($p->{$name}->{type} == TYPE_BARGRAPH) {        
       for(my $i=0; $i< $p->{$name}->{entries}; $i++) {
-        plot_write($p->{$name}->{fh},$p->{$name}->{value}->[$j]->[$i]);
+        plot_write($p->{$name}->{fh},$p->{$name}->{value}->[$j]->[$i]+1E-9);
         }
       }
     plot_write($p->{$name}->{fh},"e");

diff --git a/hmon/hmon_busynew.pl b/hmon/hmon_busynew.pl
index 1916c11bbacfb77e48fd431508cab70331b73f0c..65d07e39b8c6bfa8a21a78f1bcd3d2127b7fe70a 100755 (executable)
--- a/hmon/hmon_busynew.pl
+++ b/hmon/hmon_busynew.pl
@@ -15,7 +15,7 @@ use List::Util qw[min max];
 my $plot = ();
 $plot->{name}    = "BusyTimes";
 $plot->{file}    = "files/BusyTimes";
-$plot->{curves}  = 9;
+$plot->{curves}  = 10;
 $plot->{entries} = 200;
 $plot->{type}    = HPlot::TYPE_HISTORY;
 $plot->{output}  = HPlot::OUT_PNG;
@@ -26,14 +26,15 @@ $plot->{titles}->[3] = "RPC";
 $plot->{titles}->[4] = "Rich";
 $plot->{titles}->[5] = "TOF";
 $plot->{titles}->[6] = "Wall";
-$plot->{titles}->[7] = "St/Vt/Cts";
-$plot->{titles}->[8] = "Pion";
+$plot->{titles}->[7] = "St2";
+$plot->{titles}->[8] = "St3";
+$plot->{titles}->[9] = "Pion";
 $plot->{xlabel}  = "Time";
 $plot->{ylabel}  = "Deadtime (%)";
 $plot->{sizex}   = 830;
 $plot->{sizey}   = 420;
 $plot->{nokey}   = 0;
-$plot->{xscale}  = 4;
+$plot->{xscale}  = 8;
 $plot->{ymin}    = -1;
 $plot->{ymax}    = 101;
 $plot->{buffer}  = 1;
@@ -42,14 +43,15 @@ HPlot::PlotInit($plot);
 my $plot2 = ();
 $plot2->{name}    = "BusyTimeBars";
 $plot2->{file}    = "files/BusyTimeBars";
-$plot2->{curves}  = 1;
+$plot2->{curves}  = 7;
 $plot2->{type}    = HPlot::TYPE_BARGRAPH;
 $plot2->{output}  = HPlot::OUT_PNG;
 $plot2->{ylabel}  = "Deadtime (%)";
-$plot2->{sizex}   = 380;
+$plot2->{colors}  = ['#d0d0d0','#d8d8d8','#e0e0e0','#e8e8e8','#f0f0f0','#f8f8f8','#0000ff'];
+$plot2->{sizex}   = 580;
 $plot2->{sizey}   = 265;
 $plot2->{nokey}   = 1;
-$plot2->{entries} = 9;
+$plot2->{entries} = 10;
 $plot2->{ymin}    = -1;
 $plot2->{ymax}    = 101;
 $plot2->{bartitle}->[0] = "M12";
@@ -59,8 +61,9 @@ $plot2->{bartitle}->[3] = "RPC";
 $plot2->{bartitle}->[4] = "Ric";
 $plot2->{bartitle}->[5] = "TOF";
 $plot2->{bartitle}->[6] = "FW";
-$plot2->{bartitle}->[7] = "Sta";
-$plot2->{bartitle}->[8] = "Pi";
+$plot2->{bartitle}->[7] = "St2";
+$plot2->{bartitle}->[8] = "St3";
+$plot2->{bartitle}->[9] = "Pi";
 $plot2->{buffer}  = 1;
 HPlot::PlotInit($plot2);
 
@@ -69,8 +72,8 @@ my  $str = Hmon::MakeTitle(12,9,"Busy Times",0);
   $str .= Hmon::MakeFooter();
   Hmon::WriteFile("busyhist",$str);
 
-  $str = Hmon::MakeTitle(5,6,"Busy Times",0);
-  $str .= qq@<img src="%ADDPNG files/BusyTimeBars.png%" width="380" height="265" type="image/png">@;
+  $str = Hmon::MakeTitle(8,6,"Busy Times",0);
+  $str .= qq@<img src="%ADDPNG files/BusyTimeBars.png%" width="580" height="265" type="image/png">@;
   $str .= Hmon::MakeFooter();
   Hmon::WriteFile("busy",$str);
   
@@ -82,15 +85,18 @@ my $diff;
 my $old;
 my $iter=0;
 
+for my $p (0..7) {
+  for my $s (0..9) {
+    HPlot::PlotFill('BusyTimeBars',.001,$s,$p);
+    }
+  }
+
 while (1) {
-  my $t = trb_registertime_read_mem(0x8000,0x4030,0,8);
-  my $o->{0x8000} = $t->{0x8000};
-  $t = trb_registertime_read_mem(0x8001,0x4030,0,8);
-  $o->{0x8001} = $t->{0x8001};
-  $t = trb_registertime_read_mem(0x8002,0x4030,0,8);
-  $o->{0x8002} = $t->{0x8002};
-  $t = trb_registertime_read_mem(0x8003,0x4030,0,8);
-  $o->{0x8003} = $t->{0x8003};
+  my $o;
+  foreach my $b (0x8000,0x8001,0x8002,0x8003,0x8004,0x8101,0x8111,0x8801) {
+    my $t = trb_registertime_read_mem($b,0x4030,0,8);
+    $o->{$b} = $t->{$b};
+    }
 
   if (defined $old) {
     foreach my $b (keys %$o) {
@@ -107,39 +113,68 @@ while (1) {
     HPlot::PlotAdd('BusyTimes',$diff->{0x8000}->[6],0); #MDC12
     HPlot::PlotAdd('BusyTimes',$diff->{0x8000}->[7],1); #MDC34
     HPlot::PlotAdd('BusyTimes',$diff->{0x8000}->[3],2); #Shower
-    HPlot::PlotAdd('BusyTimes',max($diff->{0x8001}->[1],$diff->{0x8001}->[2]),3); #RPC
-    HPlot::PlotAdd('BusyTimes',max($diff->{0x8001}->[3],$diff->{0x8001}->[4],$diff->{0x8001}->[5]),4); #Rich
+    HPlot::PlotAdd('BusyTimes',max($diff->{0x8001}->[1],$diff->{0x8001}->[2],$diff->{0x8001}->[3]),3); #RPC
+    HPlot::PlotAdd('BusyTimes',max($diff->{0x8001}->[4],$diff->{0x8001}->[5],$diff->{0x8001}->[6]),4); #Rich
     HPlot::PlotAdd('BusyTimes',$diff->{0x8002}->[1],5); #Tof
-    HPlot::PlotAdd('BusyTimes',$diff->{0x8001}->[6],6); #Wall
+    HPlot::PlotAdd('BusyTimes',$diff->{0x8002}->[3],6); #Wall
     HPlot::PlotAdd('BusyTimes',$diff->{0x8002}->[2],7); #Start/Cts
-    HPlot::PlotAdd('BusyTimes',max($diff->{0x8003}->[1],$diff->{0x8003}->[2]),8); #Pion
-    
-    HPlot::PlotFill('BusyTimeBars',$diff->{0x8000}->[6],0,0); #MDC12
-    HPlot::PlotFill('BusyTimeBars',$diff->{0x8000}->[7],1,0); #MDC34
-    HPlot::PlotFill('BusyTimeBars',$diff->{0x8000}->[3],2,0); #Shower
-    HPlot::PlotFill('BusyTimeBars',max($diff->{0x8001}->[1],$diff->{0x8001}->[2]),3,0); #RPC
-    HPlot::PlotFill('BusyTimeBars',max($diff->{0x8001}->[3],$diff->{0x8001}->[4],$diff->{0x8001}->[5]),4,0); #Rich
-    HPlot::PlotFill('BusyTimeBars',$diff->{0x8002}->[1],5,0); #Tof
-    HPlot::PlotFill('BusyTimeBars',$diff->{0x8001}->[6],6,0); #Wall
-    HPlot::PlotFill('BusyTimeBars',$diff->{0x8002}->[2],7,0); #Start/Cts
-    HPlot::PlotFill('BusyTimeBars',max($diff->{0x8003}->[1],$diff->{0x8003}->[2]),8,0); #Pion    
-
-#     HPlot::PlotFill('BusyTimeBars',$diff->{0x8000}->[16+6],0,1); #MDC12
-#     HPlot::PlotFill('BusyTimeBars',$diff->{0x8000}->[16+7],1,1); #MDC34
-#     HPlot::PlotFill('BusyTimeBars',$diff->{0x8000}->[16+3],2,1); #Shower
-#     HPlot::PlotFill('BusyTimeBars',max($diff->{0x8001}->[16+1],$diff->{0x8001}->[16+2]),3,1); #RPC
-#     HPlot::PlotFill('BusyTimeBars',max($diff->{0x8001}->[16+3],$diff->{0x8001}->[16+4],$diff->{0x8001}->[16+5]),4,1); #Rich
-#     HPlot::PlotFill('BusyTimeBars',$diff->{0x8002}->[16+1],5,1); #Tof
-#     HPlot::PlotFill('BusyTimeBars',$diff->{0x8001}->[16+6],6,1); #Wall
-#     HPlot::PlotFill('BusyTimeBars',$diff->{0x8002}->[16+2],7,1); #Start/Cts
-#     HPlot::PlotFill('BusyTimeBars',max($diff->{0x8003}->[16+1],$diff->{0x8003}->[16+2]),8,1); #Pion        
-    
-    HPlot::PlotDraw('BusyTimeBars');
-    unless(++$iter % 4) {
+    HPlot::PlotAdd('BusyTimes',max($diff->{0x8003}->[3],$diff->{0x8003}->[4]),8); #Start TRB3
+    HPlot::PlotAdd('BusyTimes',max($diff->{0x8003}->[1],$diff->{0x8003}->[2]),9); #Pion
+
+#Default plots    
+    HPlot::PlotFill('BusyTimeBars',$diff->{0x8000}->[6],0,6); #MDC12
+    HPlot::PlotFill('BusyTimeBars',$diff->{0x8000}->[7],1,6); #MDC34
+    HPlot::PlotFill('BusyTimeBars',$diff->{0x8000}->[3],2,6); #Shower
+    HPlot::PlotFill('BusyTimeBars',max($diff->{0x8001}->[1],$diff->{0x8001}->[2],$diff->{0x8001}->[3]),3,6); #RPC
+    HPlot::PlotFill('BusyTimeBars',max($diff->{0x8001}->[4],$diff->{0x8001}->[5],$diff->{0x8001}->[6]),4,6); #Rich
+    HPlot::PlotFill('BusyTimeBars',$diff->{0x8002}->[1],5,6); #Tof
+    HPlot::PlotFill('BusyTimeBars',$diff->{0x8002}->[3],6,6); #Wall
+    HPlot::PlotFill('BusyTimeBars',$diff->{0x8002}->[2],7,6); #Start/Cts
+    HPlot::PlotFill('BusyTimeBars',max($diff->{0x8003}->[3],$diff->{0x8003}->[4]),8,6); #Start TRB3
+    HPlot::PlotFill('BusyTimeBars',max($diff->{0x8003}->[1],$diff->{0x8003}->[2]),9,6); #Pion    
+
+#Extended view
+    HPlot::PlotFill('BusyTimeBars',$diff->{0x8101}->[1],0,5); #MDC12
+    HPlot::PlotFill('BusyTimeBars',$diff->{0x8101}->[2],0,4); #MDC12
+    HPlot::PlotFill('BusyTimeBars',$diff->{0x8101}->[3],0,3); #MDC12
+    HPlot::PlotFill('BusyTimeBars',$diff->{0x8101}->[4],0,2); #MDC12
+    HPlot::PlotFill('BusyTimeBars',$diff->{0x8101}->[5],0,1); #MDC12
+    HPlot::PlotFill('BusyTimeBars',$diff->{0x8101}->[6],0,0); #MDC12
+    HPlot::PlotFill('BusyTimeBars',$diff->{0x8111}->[1],1,5); #MDC34
+    HPlot::PlotFill('BusyTimeBars',$diff->{0x8111}->[2],1,4); #MDC34
+    HPlot::PlotFill('BusyTimeBars',$diff->{0x8111}->[3],1,3); #MDC34
+    HPlot::PlotFill('BusyTimeBars',$diff->{0x8111}->[4],1,2); #MDC34
+    HPlot::PlotFill('BusyTimeBars',$diff->{0x8111}->[5],1,1); #MDC34
+    HPlot::PlotFill('BusyTimeBars',$diff->{0x8111}->[6],1,0); #MDC34
+    HPlot::PlotFill('BusyTimeBars',$diff->{0x8004}->[1],2,5); #Shower
+    HPlot::PlotFill('BusyTimeBars',$diff->{0x8004}->[2],2,4); #Shower
+    HPlot::PlotFill('BusyTimeBars',$diff->{0x8004}->[3],2,3); #Shower
+    HPlot::PlotFill('BusyTimeBars',$diff->{0x8004}->[4],2,2); #Shower
+    HPlot::PlotFill('BusyTimeBars',$diff->{0x8004}->[5],2,1); #Shower
+    HPlot::PlotFill('BusyTimeBars',$diff->{0x8004}->[6],2,0); #Shower
+    HPlot::PlotFill('BusyTimeBars',$diff->{0x8001}->[1],3,5); #RPC
+    HPlot::PlotFill('BusyTimeBars',$diff->{0x8001}->[2],3,4); #RPC
+    HPlot::PlotFill('BusyTimeBars',$diff->{0x8001}->[3],3,3); #RPC
+    HPlot::PlotFill('BusyTimeBars',$diff->{0x8001}->[4],4,5); #Rich
+    HPlot::PlotFill('BusyTimeBars',$diff->{0x8001}->[5],4,4); #Rich
+    HPlot::PlotFill('BusyTimeBars',$diff->{0x8001}->[6],4,3); #Rich
+    HPlot::PlotFill('BusyTimeBars',$diff->{0x8801}->[1],7,5); #Start
+    HPlot::PlotFill('BusyTimeBars',$diff->{0x8801}->[2],7,4); #Veto
+    HPlot::PlotFill('BusyTimeBars',$diff->{0x8801}->[3],7,3); #Cts
+    HPlot::PlotFill('BusyTimeBars',$diff->{0x8003}->[3],8,5); #Start TRB3
+    HPlot::PlotFill('BusyTimeBars',$diff->{0x8003}->[4],8,4); #Start TRB3
+    HPlot::PlotFill('BusyTimeBars',$diff->{0x8003}->[1],9,5); #Pion
+    HPlot::PlotFill('BusyTimeBars',$diff->{0x8003}->[2],9,4); #Pion
+
+    $iter++;
+    unless($iter % 4) {
+      HPlot::PlotDraw('BusyTimeBars');
+      }
+    unless($iter % 8) {
       HPlot::PlotDraw('BusyTimes');
       }
     }
 
   $old = $o;
-  usleep(250000);
+  usleep(125000);
   }

diff --git a/hmon/hmon_endpoints.pl b/hmon/hmon_endpoints.pl
index 41a505f1747b97446952d7c84971d54c09adbfc9..b964ea58d0871e5efeecb7e89bb6a857fbfc05dc 100755 (executable)
--- a/hmon/hmon_endpoints.pl
+++ b/hmon/hmon_endpoints.pl
@@ -89,7 +89,7 @@ while(1) {
 
     my @rpc_boards =(0x4800,0x4801,0x4802,0x4803,0x4810,0x4811,0x4812,0x4813,0x4820,0x4821,0x4822,
                     0x4823,0x4830,0x4831,0x4832,0x4833,0x4840,0x4841,0x4842,0x4843,0x4850,0x4851,
-                    0x4852,0x4853,0x8400,0x8401,0x8410,0x8411);
+                    0x4852,0x4853,0x8400,0x8401,0x8410,0x8411,0x8420,0x8421);
 
     my @other_boards =(
        #shower

diff --git a/hub/addresses_hub.db b/hub/addresses_hub.db
index 14d01a456e53a07b5fd848ab367bd72fd073b2bf..cbab1b1ae78e092e5d30fb6de3f0b5f4c86e0a15 100644 (file)
--- a/hub/addresses_hub.db
+++ b/hub/addresses_hub.db
@@ -3,6 +3,11 @@
 #Central
 #0x8001        010         1          3        023
 #0x8000        010         2          5        023
+0x8000        0805         5          0        080
+0x8001        0800         0          0        080
+0x8002        0801         1          0        080
+0x8003        0802         2          0        080
+0x8004        0803         3          0        080
 
 #MDC
 0x8101        003         1          2        103
@@ -23,10 +28,8 @@
 0x8400        006         2          4        101
 0x8411        014         1          2        102
 0x8410        014         2          4        102
-
-#Shower
-0x8501        016         1          2        104
-0x8500        016         2          4        104
+0x8421        016         1          2        104
+0x8420        016         2          4        104
 
 #TOF
 0x8601        009         1          2        096 ###
@@ -46,10 +49,3 @@
 
 #StartTRB3
 0x8880        0745        5          0        074
-
-
-0x8000        0805         5          0        080
-0x8001        0800         0          0        080
-0x8002        0801         1          0        080
-0x8003        0802         2          0        080
-0x8004        0803         3          0        080

diff --git a/hub/configure_ports.script b/hub/configure_ports.script
index eb334104bb9d70a430fa6df7f62014e15dea220a..2818b9b742aad2ccaffb3b8289e099211ddd0408 100644 (file)
--- a/hub/configure_ports.script
+++ b/hub/configure_ports.script
@@ -6,9 +6,9 @@
   trbcmd w 0x8002 0xc0 0xff81
   trbcmd w 0x8002 0xc1 0xff81
   trbcmd w 0x8002 0xc3 0xff81
-  trbcmd w 0x8003 0xc0 0xff8f
-  trbcmd w 0x8003 0xc1 0xff8f
-  trbcmd w 0x8003 0xc3 0xff8f
+  trbcmd w 0x8003 0xc0 0xffff
+  trbcmd w 0x8003 0xc1 0xffff
+  trbcmd w 0x8003 0xc3 0xffff
   trbcmd w 0x8004 0xc0 0xffff
   trbcmd w 0x8004 0xc1 0xffff
   trbcmd w 0x8004 0xc3 0xffff
@@ -18,9 +18,9 @@
 
 
 !ifdef RICH
-  trbcmd setbit 0x8001 0xc0 0x0038
-  trbcmd setbit 0x8001 0xc1 0x0038
-  trbcmd setbit 0x8001 0xc3 0x0038
+  trbcmd setbit 0x8001 0xc0 0x0070
+  trbcmd setbit 0x8001 0xc1 0x0070
+  trbcmd setbit 0x8001 0xc3 0x0070
 !endif
 
 !ifdef TOF
@@ -30,9 +30,9 @@
 !endif
 
 !ifdef RPC
-  trbcmd setbit 0x8001 0xc0 0x0006
-  trbcmd setbit 0x8001 0xc1 0x0006
-  trbcmd setbit 0x8001 0xc3 0x0006
+  trbcmd setbit 0x8001 0xc0 0x000e
+  trbcmd setbit 0x8001 0xc1 0x000e
+  trbcmd setbit 0x8001 0xc3 0x000e
 !endif
 
 !ifdef SHOWER
@@ -42,9 +42,9 @@
 !endif
 
 !ifdef WALL
-  trbcmd setbit 0x8001 0xc0 0x0040
-  trbcmd setbit 0x8001 0xc1 0x0040
-  trbcmd setbit 0x8001 0xc3 0x0040
+  trbcmd setbit 0x8002 0xc0 0x0008
+  trbcmd setbit 0x8002 0xc1 0x0008
+  trbcmd setbit 0x8002 0xc3 0x0008
 !endif
 # 
 # !ifdef MDC12
@@ -184,7 +184,3 @@ trbcmd clearbit 0x8a00 0xc3 0x000c
 #Remove both SCS from Trigger Distribution
 trbcmd w 0x8000 0xc0 0xfdf  #remove pexor from trigger
 trbcmd w 0x8000 0xc1 0xfdf  #remove pexor from trigger
-
-#Remove second CTS board from LVL1/IPU
-#trbcmd clearbit 0x8801 0xc0 0x10
-#trbcmd clearbit 0x8801 0xc1 0x10

diff --git a/hub/register_configgbe_ip_eb5master.db b/hub/register_configgbe_ip_eb5master.db
index 397cfb487408610c8fb762d3d97b85f810bc93b3..8ae690008a017df02b61aa3eacfd4da74c30a303 100644 (file)
--- a/hub/register_configgbe_ip_eb5master.db
+++ b/hub/register_configgbe_ip_eb5master.db
@@ -105,7 +105,7 @@
   0x8320      0        0xc355     0xdead8320   0xc0a86485     0xc355     0xc0a8640f
   0x8400      0        0xc356     0xdead8400   0xc0a86486     0xc356     0xc0a8640f
   0x8410      0        0xc357     0xdead8410   0xc0a86487     0xc357     0xc0a8640f
-  0x8500      0        0xc358     0xdead8500   0xc0a86488     0xc358     0xc0a8640f
+  0x8420      0        0xc358     0xdead8420   0xc0a86488     0xc358     0xc0a8640f
   0x8600      0        0xc359     0xdead8600   0xc0a86489     0xc359     0xc0a8640f
   0x8700      0        0xc35A     0xdead8700   0xc0a8648A     0xc35A     0xc0a8640f
   0x8800      0        0xc350     0xdead8800   0xc0a8648B     0xc350     0xc0a8640f
@@ -142,7 +142,7 @@
   0x8320      1        0xc355     0xdead8320   0xc0a86485     0xc355     0xc0a8640C
   0x8400      1        0xc356     0xdead8400   0xc0a86486     0xc356     0xc0a8640C
   0x8410      1        0xc357     0xdead8410   0xc0a86487     0xc357     0xc0a8640C
-  0x8500      1        0xc358     0xdead8500   0xc0a86488     0xc358     0xc0a8640C
+  0x8420      1        0xc358     0xdead8420   0xc0a86488     0xc358     0xc0a8640C
   0x8600      1        0xc359     0xdead8600   0xc0a86489     0xc359     0xc0a8640C
   0x8700      1        0xc35A     0xdead8700   0xc0a8648A     0xc35A     0xc0a8640C
   0x8800      1        0xc350     0xdead8800   0xc0a8648B     0xc350     0xc0a8640C
@@ -177,7 +177,7 @@
   0x8320      2        0xc355     0xdead8320   0xc0a86485     0xc355     0xc0a8640D
   0x8400      2        0xc356     0xdead8400   0xc0a86486     0xc356     0xc0a8640D
   0x8410      2        0xc357     0xdead8410   0xc0a86487     0xc357     0xc0a8640D
-  0x8500      2        0xc358     0xdead8500   0xc0a86488     0xc358     0xc0a8640D
+  0x8420      2        0xc358     0xdead8420   0xc0a86488     0xc358     0xc0a8640D
   0x8600      2        0xc359     0xdead8600   0xc0a86489     0xc359     0xc0a8640D
   0x8700      2        0xc35A     0xdead8700   0xc0a8648A     0xc35A     0xc0a8640D
   0x8800      2        0xc350     0xdead8800   0xc0a8648B     0xc350     0xc0a8640D
@@ -214,7 +214,7 @@
   0x8320      3        0xc355     0xdead8320   0xc0a86485     0xc355     0xc0a8640E
   0x8400      3        0xc356     0xdead8400   0xc0a86486     0xc356     0xc0a8640E
   0x8410      3        0xc357     0xdead8410   0xc0a86487     0xc357     0xc0a8640E
-  0x8500      3        0xc358     0xdead8500   0xc0a86488     0xc358     0xc0a8640E
+  0x8420      3        0xc358     0xdead8420   0xc0a86488     0xc358     0xc0a8640E
   0x8600      3        0xc359     0xdead8600   0xc0a86489     0xc359     0xc0a8640E
   0x8700      3        0xc35A     0xdead8700   0xc0a8648A     0xc35A     0xc0a8640E
   0x8800      3        0xc350     0xdead8800   0xc0a8648B     0xc350     0xc0a8640E
@@ -252,7 +252,7 @@
   0x8320      4        0xc455     0xdead8320   0xc0a86485     0xc455        0xc0a8640f
   0x8400      4        0xc456     0xdead8400   0xc0a86486     0xc456        0xc0a8640f
   0x8410      4        0xc457     0xdead8410   0xc0a86487     0xc457        0xc0a8640f
-  0x8500      4        0xc458     0xdead8500   0xc0a86488     0xc458        0xc0a8640f
+  0x8420      4        0xc458     0xdead8420   0xc0a86488     0xc458        0xc0a8640f
   0x8600      4        0xc459     0xdead8600   0xc0a86489     0xc459        0xc0a8640f
   0x8700      4        0xc45A     0xdead8700   0xc0a8648A     0xc45A        0xc0a8640f
   0x8800      4        0xc450     0xdead8800   0xc0a8648B     0xc450        0xc0a8640f
@@ -288,7 +288,7 @@
   0x8320      5        0xc455     0xdead8320   0xc0a86485     0xc455        0xc0a8640C
   0x8400      5        0xc456     0xdead8400   0xc0a86486     0xc456        0xc0a8640C
   0x8410      5        0xc457     0xdead8410   0xc0a86487     0xc457        0xc0a8640C
-  0x8500      5        0xc458     0xdead8500   0xc0a86488     0xc458        0xc0a8640C
+  0x8420      5        0xc458     0xdead8420   0xc0a86488     0xc458        0xc0a8640C
   0x8600      5        0xc459     0xdead8600   0xc0a86489     0xc459        0xc0a8640C
   0x8700      5        0xc45A     0xdead8700   0xc0a8648A     0xc45A        0xc0a8640C
   0x8800      5        0xc450     0xdead8800   0xc0a8648B     0xc450        0xc0a8640C
@@ -323,7 +323,7 @@
   0x8320      6        0xc455     0xdead8320   0xc0a86485     0xc455        0xc0a8640D
   0x8400      6        0xc456     0xdead8400   0xc0a86486     0xc456        0xc0a8640D
   0x8410      6        0xc457     0xdead8410   0xc0a86487     0xc457        0xc0a8640D
-  0x8500      6        0xc458     0xdead8500   0xc0a86488     0xc458        0xc0a8640D
+  0x8420      6        0xc458     0xdead8420   0xc0a86488     0xc458        0xc0a8640D
   0x8600      6        0xc459     0xdead8600   0xc0a86489     0xc459        0xc0a8640D
   0x8700      6        0xc45A     0xdead8700   0xc0a8648A     0xc45A        0xc0a8640D
   0x8800      6        0xc450     0xdead8800   0xc0a8648B     0xc450        0xc0a8640D
@@ -358,7 +358,7 @@
   0x8320      7        0xc455     0xdead8320   0xc0a86485     0xc455        0xc0a8640E
   0x8400      7        0xc456     0xdead8400   0xc0a86486     0xc456        0xc0a8640E
   0x8410      7        0xc457     0xdead8410   0xc0a86487     0xc457        0xc0a8640E
-  0x8500      7        0xc458     0xdead8500   0xc0a86488     0xc458        0xc0a8640E
+  0x8420      7        0xc458     0xdead8420   0xc0a86488     0xc458        0xc0a8640E
   0x8600      7        0xc459     0xdead8600   0xc0a86489     0xc459        0xc0a8640E
   0x8700      7        0xc45A     0xdead8700   0xc0a8648A     0xc45A        0xc0a8640E
   0x8800      7        0xc450     0xdead8800   0xc0a8648B     0xc450        0xc0a8640E
@@ -396,7 +396,7 @@
   0x8320      8        0xc555     0xdead8320   0xc0a86485      0xc555       0xc0a8640f
   0x8400      8        0xc556     0xdead8400   0xc0a86486      0xc556       0xc0a8640f
   0x8410      8        0xc557     0xdead8410   0xc0a86487      0xc557       0xc0a8640f
-  0x8500      8        0xc558     0xdead8500   0xc0a86488      0xc558       0xc0a8640f
+  0x8420      8        0xc558     0xdead8420   0xc0a86488      0xc558       0xc0a8640f
   0x8600      8        0xc559     0xdead8600   0xc0a86489      0xc559       0xc0a8640f
   0x8700      8        0xc55A     0xdead8700   0xc0a8648A      0xc55A       0xc0a8640f
   0x8800      8        0xc550     0xdead8800   0xc0a8648B      0xc550       0xc0a8640f
@@ -432,7 +432,7 @@
   0x8320      9        0xc555     0xdead8320   0xc0a86485     0xc555        0xc0a8640C
   0x8400      9        0xc556     0xdead8400   0xc0a86486     0xc556        0xc0a8640C
   0x8410      9        0xc557     0xdead8410   0xc0a86487     0xc557        0xc0a8640C
-  0x8500      9        0xc558     0xdead8500   0xc0a86488     0xc558        0xc0a8640C
+  0x8420      9        0xc558     0xdead8420   0xc0a86488     0xc558        0xc0a8640C
   0x8600      9        0xc559     0xdead8600   0xc0a86489     0xc559        0xc0a8640C
   0x8700      9        0xc55A     0xdead8700   0xc0a8648A     0xc55A        0xc0a8640C
   0x8800      9        0xc550     0xdead8800   0xc0a8648B     0xc550        0xc0a8640C
@@ -467,7 +467,7 @@
   0x8320     10        0xc555     0xdead8320   0xc0a86485     0xc555        0xc0a8640D
   0x8400     10        0xc556     0xdead8400   0xc0a86486     0xc556        0xc0a8640D
   0x8410     10        0xc557     0xdead8410   0xc0a86487     0xc557        0xc0a8640D
-  0x8500     10        0xc558     0xdead8500   0xc0a86488     0xc558        0xc0a8640D
+  0x8420     10        0xc558     0xdead8420   0xc0a86488     0xc558        0xc0a8640D
   0x8600     10        0xc559     0xdead8600   0xc0a86489     0xc559        0xc0a8640D
   0x8700     10        0xc55A     0xdead8700   0xc0a8648A     0xc55A        0xc0a8640D
   0x8800     10        0xc550     0xdead8800   0xc0a8648B     0xc550        0xc0a8640D
@@ -502,7 +502,7 @@
   0x8320     11        0xc555     0xdead8320   0xc0a86485     0xc555        0xc0a8640E
   0x8400     11        0xc556     0xdead8400   0xc0a86486     0xc556        0xc0a8640E
   0x8410     11        0xc557     0xdead8410   0xc0a86487     0xc557        0xc0a8640E
-  0x8500     11        0xc558     0xdead8500   0xc0a86488     0xc558        0xc0a8640E
+  0x8420     11        0xc558     0xdead8420   0xc0a86488     0xc558        0xc0a8640E
   0x8600     11        0xc559     0xdead8600   0xc0a86489     0xc559        0xc0a8640E
   0x8700     11        0xc55A     0xdead8700   0xc0a8648A     0xc55A        0xc0a8640E
   0x8800     11        0xc550     0xdead8800   0xc0a8648B     0xc550        0xc0a8640E
@@ -537,7 +537,7 @@
   0x8320     12        0xc655     0xdead8320   0xc0a86485     0xc655        0xc0a8640f
   0x8400     12        0xc656     0xdead8400   0xc0a86486     0xc656        0xc0a8640f
   0x8410     12        0xc657     0xdead8410   0xc0a86487     0xc657        0xc0a8640f
-  0x8500     12        0xc658     0xdead8500   0xc0a86488     0xc658        0xc0a8640f
+  0x8420     12        0xc658     0xdead8420   0xc0a86488     0xc658        0xc0a8640f
   0x8600     12        0xc659     0xdead8600   0xc0a86489     0xc659        0xc0a8640f
   0x8700     12        0xc65A     0xdead8700   0xc0a8648A     0xc65A        0xc0a8640f
   0x8800     12        0xc650     0xdead8800   0xc0a8648B     0xc650        0xc0a8640f
@@ -573,7 +573,7 @@
   0x8320     13        0xc655     0xdead8320   0xc0a86485     0xc655        0xc0a8640C
   0x8400     13        0xc656     0xdead8400   0xc0a86486     0xc656        0xc0a8640C
   0x8410     13        0xc657     0xdead8410   0xc0a86487     0xc657        0xc0a8640C
-  0x8500     13        0xc658     0xdead8500   0xc0a86488     0xc658        0xc0a8640C
+  0x8420     13        0xc658     0xdead8420   0xc0a86488     0xc658        0xc0a8640C
   0x8600     13        0xc659     0xdead8600   0xc0a86489     0xc659        0xc0a8640C
   0x8700     13        0xc65A     0xdead8700   0xc0a8648A     0xc65A        0xc0a8640C
   0x8800     13        0xc650     0xdead8800   0xc0a8648B     0xc650        0xc0a8640C
@@ -608,7 +608,7 @@
   0x8320     14        0xc655     0xdead8320   0xc0a86485     0xc655        0xc0a8640D
   0x8400     14        0xc656     0xdead8400   0xc0a86486     0xc656        0xc0a8640D
   0x8410     14        0xc657     0xdead8410   0xc0a86487     0xc657        0xc0a8640D
-  0x8500     14        0xc658     0xdead8500   0xc0a86488     0xc658        0xc0a8640D
+  0x8420     14        0xc658     0xdead8420   0xc0a86488     0xc658        0xc0a8640D
   0x8600     14        0xc659     0xdead8600   0xc0a86489     0xc659        0xc0a8640D
   0x8700     14        0xc65A     0xdead8700   0xc0a8648A     0xc65A        0xc0a8640D
   0x8800     14        0xc650     0xdead8800   0xc0a8648B     0xc650        0xc0a8640D
@@ -647,7 +647,7 @@
   0x8320     15        0xc655     0xdead8320   0xc0a86485     0xc655        0xc0a8640E
   0x8400     15        0xc656     0xdead8400   0xc0a86486     0xc656        0xc0a8640E
   0x8410     15        0xc657     0xdead8410   0xc0a86487     0xc657        0xc0a8640E
-  0x8500     15        0xc658     0xdead8500   0xc0a86488     0xc658        0xc0a8640E
+  0x8420     15        0xc658     0xdead8420   0xc0a86488     0xc658        0xc0a8640E
   0x8600     15        0xc659     0xdead8600   0xc0a86489     0xc659        0xc0a8640E
   0x8700     15        0xc65A     0xdead8700   0xc0a8648A     0xc65A        0xc0a8640E
   0x8800     15        0xc650     0xdead8800   0xc0a8648B     0xc650        0xc0a8640E

diff --git a/hub/register_configgbe_multiQueueOn.db b/hub/register_configgbe_multiQueueOn.db
index be9a60a33ed3925a674473cc00c005293bde03c0..843c9f52881114f59a67a9207922166bdd917d61 100644 (file)
--- a/hub/register_configgbe_multiQueueOn.db
+++ b/hub/register_configgbe_multiQueueOn.db
@@ -19,7 +19,7 @@
 #   0x8320      0       0x8320     0x00020001   0x00030062     0xea60       0x578          1            0            0        0xffffff      0x7          0x0
 #   0x8400      0       0x8400     0x00020001   0x00030062     0xea60       0x578          1            0            0        0xffffff      0x7          0x0
 #   0x8410      0       0x8410     0x00020001   0x00030062     0xea60       0x578          1            0            0        0xffffff      0x7          0x0
-#   0x8500      0       0x8500     0x00020001   0x00030062     0xea60       0x578          0            0            0        0xffffff      0x7          0x0
+#   0x8420      0       0x8420     0x00020001   0x00030062     0xea60       0x578          0            0            0        0xffffff      0x7          0x0
 #   0x8600      0       0x8600     0x00020001   0x00030062     0xea60       0x578          1            0            0        0xffffff      0x7          0x0
 #   0x8700      0       0x8700     0x00020001   0x00030062     0xea60       0x578          1            0            0        0xffffff      0x7          0x0
 #   0x8800      0       0x8800     0x00020001   0x00030062     0xea60       0x578          1            0            0        0xffffff      0x7          0x0
@@ -68,33 +68,33 @@
   0x8000      1       0x8000         0            0        
   0x8100      1       0x8100         0            0
   0x8110      1       0x8110         0            0
-  0x8300      1       0x8300         1            0
-  0x8310      1       0x8310         1            0
-  0x8320      1       0x8320         1            0
-  0x8400      1       0x8400         1            0
-  0x8410      1       0x8410         1            0
-  0x8500      1       0x8500         0            0
-  0x8600      1       0x8600         1            0
-  0x8700      1       0x8700         1            0
-  0x8800      1       0x8800         1            0
-  0x8900      1       0x8900         1            0
-  0x8880      1       0x8880         1            0
-  0x1000      1       0x1000         1            0
-  0x1010      1       0x1010         1            0
-  0x1020      1       0x1020         1            0
-  0x1030      1       0x1030         1            0
-  0x1040      1       0x1040         1            0
-  0x1050      1       0x1050         1            0
-  0x1100      1       0x1100         1            0
-  0x1110      1       0x1110         1            0
-  0x1120      1       0x1120         1            0
-  0x1130      1       0x1130         1            0
-  0x1140      1       0x1140         1            0
-  0x1150      1       0x1150         1            0
-  0x1160      1       0x1160         0            0
-  0x3200      1       0x3200         1            0
-  0x3210      1       0x3210         1            0
-  0x3220      1       0x3220         1            0
-  0x3230      1       0x3230         1            0
-  0x3240      1       0x3240         1            0
-  0x3250      1       0x3250         1            0
+  0x8300      1       0x8300         1            1
+  0x8310      1       0x8310         1            1
+  0x8320      1       0x8320         1            1
+  0x8400      1       0x8400         1            1
+  0x8410      1       0x8410         1            1
+  0x8420      1       0x8420         1            1
+  0x8600      1       0x8600         1            1
+  0x8700      1       0x8700         1            1
+  0x8800      1       0x8800         1            1
+  0x8900      1       0x8900         1            1    
+  0x8880      1       0x8880         1            1
+  0x1000      1       0x1000         1            1
+  0x1010      1       0x1010         1            1
+  0x1020      1       0x1020         1            1
+  0x1030      1       0x1030         1            1
+  0x1040      1       0x1040         1            1
+  0x1050      1       0x1050         1            1
+  0x1100      1       0x1100         1            1
+  0x1110      1       0x1110         1            1
+  0x1120      1       0x1120         1            1
+  0x1130      1       0x1130         1            1
+  0x1140      1       0x1140         1            1
+  0x1150      1       0x1150         1            1
+  0x1160      1       0x1160         0            1
+  0x3200      1       0x3200         1            1
+  0x3210      1       0x3210         1            1
+  0x3220      1       0x3220         1            1
+  0x3230      1       0x3230         1            1
+  0x3240      1       0x3240         1            1
+  0x3250      1       0x3250         1            1

diff --git a/hub/startup.script b/hub/startup.script
index 0029c0ae536d3ba1096fef9ce3fe4a22d2c85a23..deb651b9592fa4a90ed48064a1674aa64d68f5b9 100644 (file)
--- a/hub/startup.script
+++ b/hub/startup.script
@@ -33,11 +33,6 @@ wait
   trbcmd setbit 0x8801 0xc3 0x10
   trbcmd setbit 0x8003 0xc3 0x04
 
-#Configure GbE
-  load_register  register_configgbe.db
-  load_register  register_configgbe_ip.db
-
-
 
 # Timeout setting for all hubs
   trbcmd w 0xfffe 0xc5 0x4000
@@ -51,7 +46,6 @@ wait
   
   trbcmd loadbit 0xfe15 0xc5 0xffff0000 0x00080000
   trbcmd loadbit 0xfe23 0xc5 0xffff0000 0x00080000
-  trbcmd loadbit 0x8900 0xc5 0xffff0000 0x00080000
   
   trbcmd loadbit 0x8101 0xc5 0xffff0000 0x00060000
   trbcmd loadbit 0x8111 0xc5 0xffff0000 0x00060000
@@ -60,6 +54,7 @@ wait
   trbcmd loadbit 0x8321 0xc5 0xffff0000 0x00060000
   trbcmd loadbit 0x8401 0xc5 0xffff0000 0x00060000
   trbcmd loadbit 0x8411 0xc5 0xffff0000 0x00060000
+  trbcmd loadbit 0x8421 0xc5 0xffff0000 0x00060000
   trbcmd loadbit 0x8501 0xc5 0xffff0000 0x00060000
   trbcmd loadbit 0x8601 0xc5 0xffff0000 0x00060000
   trbcmd loadbit 0x8701 0xc5 0xffff0000 0x00060000
@@ -73,10 +68,13 @@ wait
   trbcmd loadbit 0x8320 0xc5 0xffff0000 0x00040000
   trbcmd loadbit 0x8400 0xc5 0xffff0000 0x00040000
   trbcmd loadbit 0x8410 0xc5 0xffff0000 0x00040000
+  trbcmd loadbit 0x8420 0xc5 0xffff0000 0x00040000
   trbcmd loadbit 0x8500 0xc5 0xffff0000 0x00040000
   trbcmd loadbit 0x8600 0xc5 0xffff0000 0x00040000
   trbcmd loadbit 0x8700 0xc5 0xffff0000 0x00040000
   trbcmd loadbit 0x8800 0xc5 0xffff0000 0x00040000
+  trbcmd loadbit 0x8880 0xc5 0xffff0000 0x00040000
+  trbcmd loadbit 0x8900 0xc5 0xffff0000 0x00040000
   
   trbcmd loadbit 0x8001 0xc5 0xffff0000 0x00020000
   trbcmd loadbit 0x8002 0xc5 0xffff0000 0x00020000

diff --git a/main/data_sources.db b/main/data_sources.db
deleted file mode 100644 (file)
index 6b91a9c058398b72d71a397b8a8175b7a4755643..0000000000000000000000000000000000000000
--- a/main/data_sources.db
+++ /dev/null
@@ -1,36 +0,0 @@
-# Table with active data sources
-
-# Addr     On/Off     Name              DataSize
-#Start must be the first for EvtId
-0x8800      1         StartVetoCTS      low
-0x8000      0         Central           low  #off
-0x8100      0         innerMDC          low  #off
-0x8110      0         outerMDC          low  #off
-0x8300      0         RICH12            mid
-0x8310      0         RICH34            mid
-0x8320      0         RICH56            mid
-0x8400      0         RPC123            mid
-0x8410      0         RPC456            mid
-0x8600      0         TOF               low
-0x8700      0         FW                low
-0x8880      0         StartTRB3         low
-0x8900      1         Pion1             mid
-0x1000      0         MDC12sec1         high
-0x1010      0         MDC12sec2         high
-0x1020      0         MDC12sec3         mid
-0x1030      0         MDC12sec4         mid
-0x1040      0         MDC12sec5         high
-0x1050      0         MDC12sec6         high
-0x1100      0         MDC34sec1         high
-0x1110      0         MDC34sec2         mid
-0x1120      0         MDC34sec3         high
-0x1130      0         MDC34sec4         mid
-0x1140      0         MDC34sec5         high
-0x1150      0         MDC34sec6         high
-0x1160      0         MDCspecial        mid   #off
-0x3200      1         Shower1           mid
-0x3210      1         Shower2           mid
-0x3220      1         Shower3           mid
-0x3230      1         Shower4           mid
-0x3240      1         Shower5           mid
-0x3250      1         Shower6           mid

diff --git a/main/data_sources.db b/main/data_sources.db
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..3302fc223e777ec19f842b6a2a90d71e92d44530
--- /dev/null
+++ b/main/data_sources.db
@@ -0,0 +1 @@
+data_sources_all.db
\ No newline at end of file

diff --git a/main/startup_briccolage.sh b/main/startup_briccolage.sh
index c9a57f05d3c5d81a0d3ad51755e41ae893c0ff7b..6bdc1607dee79ab33ef04bbe43a517112b5cbbfa 100755 (executable)
--- a/main/startup_briccolage.sh
+++ b/main/startup_briccolage.sh
@@ -78,7 +78,7 @@ switchport.pl 0x1003 5 off
 #All calib to EB1
 trbcmd w 0x0003 0xa0f3 0xff1
   
-#/home/hadaq/trbsoft/hadesdaq/utils/move_doublecpu_irq.sh &
+/home/hadaq/trbsoft/hadesdaq/utils/move_doublecpu_irq.sh &
 scp /home/hadaq/oper/daq2ora/daq2ora_current.txt hades33:/home/hadaq/trbsoft/hadesdaq/hmon/files/ &
 
   

diff --git a/nettools/rebootoep_x11.sh b/nettools/rebootoep_x11.sh
index 64613012cc26995acd47e201e7c8a0184374b5f0..3bf6c7bb6a5009bdc459d457c1efe2f134d55d7e 100755 (executable)
--- a/nettools/rebootoep_x11.sh
+++ b/nettools/rebootoep_x11.sh
@@ -1,6 +1,7 @@
 export DAQOPSERVER=hades31
-export myvar=$(doyoureallywant.pl "to reboot the MDC-OEPs")
-if [ $myvar == "256" ]; then exit; fi
+
+#export myvar=$(doyoureallywant.pl "to reboot the MDC-OEPs")
+#if [ $myvar == "256" ]; then exit; fi
 
 echo Reset...
 trbcmd reset

diff --git a/utils/move_doublecpu_irq.sh b/utils/move_doublecpu_irq.sh
index b6d00c73416db3c1538e93447d810e50f4588335..f2f06e8415cc10a161957e1820f6fbf332cab97a 100755 (executable)
--- a/utils/move_doublecpu_irq.sh
+++ b/utils/move_doublecpu_irq.sh
@@ -1,8 +1,10 @@
 #!/bin/bash
 #ssh root@lxhadeb01 'echo 000000 > /proc/irq/1272/smp_affinity'
-ssh root@lxhadeb02p 'echo c > /proc/irq/1272/smp_affinity'
-ssh root@lxhadeb03p 'echo c > /proc/irq/1272/smp_affinity'
-ssh root@lxhadeb04p 'echo c > /proc/irq/1272/smp_affinity'
-ssh root@lxhadeb05p 'echo 0c > /proc/irq/31/smp_affinity;echo 03 > /proc/irq/32/smp_affinity;echo 03 > /proc/irq/33/smp_affinity;'
+ssh root@lxhadeb02 'echo c > /proc/irq/1272/smp_affinity'
+ssh root@lxhadeb03 'echo c > /proc/irq/1272/smp_affinity'
+ssh root@lxhadeb04 'echo c > /proc/irq/1272/smp_affinity'
+#ssh root@lxhadeb05 'echo 0c > /proc/irq/31/smp_affinity;echo 03 > /proc/irq/32/smp_affinity;echo 03 > /proc/irq/33/smp_affinity;'
+ssh root@lxhadeb05 'echo 0c > /proc/irq/77/smp_affinity;echo 03 > /proc/irq/78/smp_affinity;echo 03 > /proc/irq/79/smp_affinity;'
+# todo- will go up to irq/100 JAM
 #ssh root@lxhadeb05 'echo 030 > /proc/irq/46/smp_affinity;echo 0c0 > /proc/irq/47/smp_affinity;echo 300 > /proc/irq/48/smp_affinity;echo c00 > /proc/irq/49/smp_affinity;'