latest changes

diff --git a/tools/preview/exec_evtbuild_t.pl b/tools/preview/exec_evtbuild_t.pl
index 091c1796ee8a82b32acca3b084f48fd0a9d80adc..82d593071c3bcfc9222c915b02a0b1a27829db92 100755 (executable)
--- a/tools/preview/exec_evtbuild_t.pl
+++ b/tools/preview/exec_evtbuild_t.pl
@@ -53,9 +53,9 @@ else{
 
 chdir($opt_path);
 
-$thr1 = threads->new(\&execute, "timeout -s SIGINT ".($time+1.5)." daq_evtbuild -m 1 -q 32 -d file -x te -Se -S boris");
+$thr1 = threads->new(\&execute, "timeout -s SIGINT ".($time+1.5)." daq_evtbuild -m 1 -q 32 -d file -x te -Se -S mvdtest");
 sleep 1;
-$thr2 = threads->new(\&execute, "timeout -s SIGINT ".$time." daq_netmem -m 1 -q 32 -i 50000 -S boris");
+$thr2 = threads->new(\&execute, "timeout -s SIGINT ".$time." daq_netmem -m 1 -q 32 -i 50000 -S mvdtest");
 
 $thr1->join();
 $thr2->join();

diff --git a/tools/run.pl b/tools/run.pl
index 145b511a34721e588da7d91fefc477028052230e..2dfb8d33984355a4d9d1562d8763f9dde51ee180 100755 (executable)
--- a/tools/run.pl
+++ b/tools/run.pl
@@ -58,7 +58,8 @@ system("./startup.pl ".SETUPFILE);
 
 my $dummy;
 
-$dummy=qx"./preview/exec_evtbuild_t.pl -t $runtime -p $dumpPath 2>&1"; #14
+$dummy=qx"rm $dumpPath/te1*.hld 2>&1";
+$dummy.=qx"./preview/exec_evtbuild_t.pl -t $runtime -p $dumpPath 2>&1";
 $dummy.=qx"rm $dumpPath/temp.hld 2>&1";
 $dummy.=qx"mv $dumpPath/te1* $dumpPath/temp.hld 2>&1";
 $dummy.=qx"rm $picPath/*.png 2>&1"; # delete old pictures

diff --git a/tools/start.pl b/tools/start.pl
index 4fd694666276394e440bc7ae9d93d7dbf7f4f00e..a2f4579416d1e6465261601420a4b73d55c5d6d1 100755 (executable)
--- a/tools/start.pl
+++ b/tools/start.pl
@@ -33,6 +33,8 @@ sub run {
 
 #exit;
 
+run("trbcmd reset");
+
 #Set addresses
 run(DAQTOOLSPATH."/tools/merge_serial_address.pl ".CONFIGPATH."/network/serials_hub.db ".CONFIGPATH."/network/addresses_hub.db");
 run(DAQTOOLSPATH."/tools/merge_serial_address.pl ".CONFIGPATH."/network/serials_mapsaddon.db ".CONFIGPATH."/network/addresses_mapsaddon.db");
@@ -57,16 +59,16 @@ trb_write(0xfffe,0x00c5,0x20ff);   #Timeouts
 #trb_write(0x8c01,0x00c1,0xffff);
 #trb_write(0x8c01,0x00c3,0xffff);
 
-trb_write(0xf30c,0x00c0,0x00f1);   
-trb_write(0xf30c,0x00c1,0x00f1);
+trb_write(0xf30c,0x00c0,0x00e1);   
+trb_write(0xf30c,0x00c1,0x00e1);
 trb_write(0xf30c,0x00c3,0x00ff);   #only slowcontrol for unused FPGA
 
 
 #Set Sensor IDs
-trb_write(0xf30d,0x00c0,0xccc1ccc0);
+#trb_write(0xf30d,0x00c0,0xccc1ccc0);
 
 #Set JTAG switches
-trb_write(0xf30d,0x00c2,0x00000000);
+trb_write(0xf30d,0xb000,0x00000000);
 
 #Send arbiter start signal
 trb_write(0xf30c,0xa000,0x00000001);

diff --git a/tools/startup.pl b/tools/startup.pl
index 7d7208836bb7bf4e8b859cc3d07e40e08e61f992..64fc3dd6edf69251ba33c15df0adaf5115403545 100755 (executable)
--- a/tools/startup.pl
+++ b/tools/startup.pl
@@ -125,7 +125,6 @@ $chainsinifile->close();
 ###############################
 ## Do whatever has to be done
 ###############################
-
 local $CWD = $ENV{'JTAGPATH'};
 foreach my $cmd (@commands) {
   execute($cmd);