latest start script and Enviroment

diff --git a/Environment.pm b/Environment.pm
index 3fb35ee6944bdea6fd227d61ce395b1be74edb9f..380e67a66f8775679d83513fb009bd633b7f6667 100644 (file)
--- a/Environment.pm
+++ b/Environment.pm
@@ -7,7 +7,7 @@ use constant DAQOPSERVER      => $ENV{'DAQOPSERVER'}      || "localhost:7";
 use constant JTAGPATH         => $ENV{'JTAGPATH'}         || "/local.1/jtag_mvd/soft/toolbox/jtag_atomic/";
 use constant JTAGCONFIGPATH   => $ENV{'JTAGCONFIGPATH'}   || "/tmp/inifiles";
 use constant XMLPATH          => $ENV{'XMLPATH'}          || JTAGROOTPATH."/../mvdconfig";
-use constant EVENTBUILDERPATH => $ENV{'EVENTBUILDERPATH'} || "/local.1/bastelstube/daqdata/bin";
+use constant EVENTBUILDERPATH => $ENV{'EVENTBUILDERPATH'} || "/home/hadaq/bin";
 use constant DAQTOOLSPATH     => $ENV{'DAQTOOLSPATH'}     || "/local.1/htdocs/daqtools";
 use constant CONFIGPATH       => $ENV{'CONFIGPATH'}       || "/local.1/htdocs/mvdconfig";
 

diff --git a/tools/start.pl b/tools/start.pl
index 1aa7a971316e2551219b1f31320b1262dd04c867..4fd694666276394e440bc7ae9d93d7dbf7f4f00e 100755 (executable)
--- a/tools/start.pl
+++ b/tools/start.pl
@@ -43,30 +43,30 @@ run(DAQTOOLSPATH."/tools/merge_serial_address.pl ".CONFIGPATH."/network/serials_
 run(DAQTOOLSPATH."/tools/loadregisterdb.pl ".CONFIGPATH."/network/register_configgbe_mvd.db");
 run(DAQTOOLSPATH."/tools/loadregisterdb.pl ".CONFIGPATH."/network/register_configgbe_ip_mvd.db");
 
-trb_write(0x8c00,0x8000,0x8000);
-trb_write(0x8c00,0x8000,0x0000);
+#trb_write(0x8c00,0x8000,0x8000);
+#trb_write(0x8c00,0x8000,0x0000);
 
 
 trb_write(0xfffe,0x00c5,0x20ff);   #Timeouts
 
 
-trb_write(0x8c00,0x00c0,0xffff);   #Enable ports of Hub2
-trb_write(0x8c00,0x00c1,0xffff);
-trb_write(0x8c00,0x00c3,0xffff);
-trb_write(0x8c01,0x00c0,0xffff);
-trb_write(0x8c01,0x00c1,0xffff);
-trb_write(0x8c01,0x00c3,0xffff);
+#trb_write(0x8c00,0x00c0,0xffff);   #Enable ports of Hub2
+#trb_write(0x8c00,0x00c1,0xffff);
+#trb_write(0x8c00,0x00c3,0xffff);
+#trb_write(0x8c01,0x00c0,0xffff);
+#trb_write(0x8c01,0x00c1,0xffff);
+#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,0x00c0,0x00f1);   
+trb_write(0xf30c,0x00c1,0x00f1);
 trb_write(0xf30c,0x00c3,0x00ff);   #only slowcontrol for unused FPGA
 
 
 #Set Sensor IDs
-trb_write(0xc002,0x00c0,0xccc1ccc0);
+trb_write(0xf30d,0x00c0,0xccc1ccc0);
 
 #Set JTAG switches
-trb_write(0xc002,0x00c2,0x00000000);
+trb_write(0xf30d,0x00c2,0x00000000);
 
 #Send arbiter start signal
 trb_write(0xf30c,0xa000,0x00000001);