hadplot -noraise option added to gnuplot command

diff --git a/tools/hadplot b/tools/hadplot
index d1e92770ed247d0c2e0dc6fce63d972606b934e7..b445128b41ea7022a38b74b3517ef3053c5f5b77 100755 (executable)
--- a/tools/hadplot
+++ b/tools/hadplot
@@ -142,7 +142,7 @@ if($style == 5) {$curvestyle="histostacked";      $xticks=1;}
 
 #Open Gnuplot
 our $fh;
-my $fn = "gnuplot -geometry $geom -bg 'ghost white'";
+my $fn = "gnuplot -noraise -geometry $geom -bg 'ghost white'";
 $fh = new FileHandle ("|$fn") or  die "error: no gnuplot";
 $fh->autoflush(1);
 

diff --git a/users/tum_e12/configure_eb.sh b/users/tum_e12/configure_eb.sh
index 80f01cb8ae532e87320e698fa69f5c482b90f8d7..4283ae8996628792c3421232fb0f0d82f89cfc96 100755 (executable)
--- a/users/tum_e12/configure_eb.sh
+++ b/users/tum_e12/configure_eb.sh
@@ -2,24 +2,37 @@
 
 # MAC Address of the EB
 # i.e. 6C:F0:49:02:D7:45
+
+# MAC Bia E12 Net
 #trbcmd w 0x8000 0x8100 0x4902d745   # Lower 32 bits of EB MAC
 #trbcmd w 0x8000 0x8101 0x6cf0       # Bit 15..0: Higher 16 bit of EB MAC,
-trbcmd w 0x8000 0x8100 0x0c2e8176    # Lower 32 bits of EB MAC
-trbcmd w 0x8000 0x8101 0x000e        # Bit 15..0: Higher 16 bit of EB MAC,
 
-# IP Adress and Port of EB: (10.152.8.107:50000)
+# MAC Bia Local Net
+#trbcmd w 0x8000 0x8100 0x0c2e8176    # Lower 32 bits of EB MAC
+#trbcmd w 0x8000 0x8101 0x000e        # Bit 15..0: Higher 16 bit of EB MAC,
+
+# MAC Crius Local Net
+trbcmd w 0x8000 0x8100 0xb9f0b3e0    # Lower 32 bits of EB MAC
+trbcmd w 0x8000 0x8101 0x0019        # Bit 15..0: Higher 16 bit of EB MAC,
+
+# IP Adress and Port of EB: (10.152.8.107:50000) Bia E12 Net
 #trbcmd w 0x8000 0x8102 0x0a98086b   # Destination IP
 #trbcmd w 0x8000 0x8103 0xc350       # Bit 15..0: Destination UDP Port
-# IP Adress and Port of EB: (10.152.8.107:50000)
-trbcmd w 0x8000 0x8102 0xc0a8016b   # Destination IP
+
+# IP Adress and Port of EB: (192.168.1.107:50000) Bia Local Net
+#trbcmd w 0x8000 0x8102 0xc0a8016b   # Destination IP
+#trbcmd w 0x8000 0x8103 0xc350       # Bit 15..0: Destination UDP Port
+
+# IP Adress and Port of EB: (10.152.8.107:50000) Crius E12 Net
+trbcmd w 0x8000 0x8102 0x81bba22c   # Destination IP
 trbcmd w 0x8000 0x8103 0xc350       # Bit 15..0: Destination UDP Port
 
-# MAC Adress of Source (trb3)
+# MAC Adress of Source (TRB3)
 trbcmd w 0x8000 0x8104 0xdead8001   # Lower 32 bits of Source MAC
 trbcmd w 0x8000 0x8105 0x0230       # Bit 15..0: Higher 16 bit of Source MAC
 
 # IP and Port of Source (10.152.8.17:50000)
-#trbcmd w 0x8000 0x8106 0x0a980811   # Source IP
-trbcmd w 0x8000 0x8106 0xc0a80111   # Source IP
+trbcmd w 0x8000 0x8106 0x0a980811   # (10.152.8.17) Source IP TRB3 E12 Net
+#trbcmd w 0x8000 0x8106 0xc0a80111   # (192.168.1.17) Source IP TRB3 Local Net
 trbcmd w 0x8000 0x8107 0xc350       # Bit 15..0: Source UDP Port 
 trbcmd w 0x8000 0x8108 0x0578       # Bit 15..0: MTU size

diff --git a/users/tum_e12/setenv.sh b/users/tum_e12/setenv.sh
index 52f620f8a1167e3fb23541bff51f384e2c1fece5..4844152d41b3a965c0f5f8df7d7849b6659049c8 100755 (executable)
--- a/users/tum_e12/setenv.sh
+++ b/users/tum_e12/setenv.sh
@@ -9,8 +9,6 @@ expath ${BASEDIR}/trbnettools/bin
 export PERL5LIB=${BASEDIR}/trbnettools/perllib/usr/local/lib64/perl5:${BASEDIR}/daqtools/web/CtsPlugins:${BASEDIR}/daqtools/web/include
 
 export TRB3_SERVER=trb3
-#export DAQOPSERVER=bia:12
-export DAQOPSERVER=bia
-
-
+#export DAQOPSERVER=bia
+export DAQOPSERVER=crius
 export TRBNETID=12