small modifications to scripts

diff --git a/Environment.pm b/Environment.pm
index 825be0ee570a3a546b2f577d314a371e9acac8e1..cc93cd799d29575902d1e48bb2187acf06d5e992 100644 (file)
--- a/Environment.pm
+++ b/Environment.pm
@@ -6,7 +6,7 @@ use constant JTAGROOTPATH     => $ENV{'JTAGROOTPATH'}     || "/local.1/htdocs/mv
 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;
+use constant XMLPATH          => $ENV{'XMLPATH'}          || JTAGROOTPATH."/../mvdconfig";
 use constant EVENTBUILDERPATH => $ENV{'EVENTBUILDERPATH'} || "/local.1/bastelstube/daqdata/bin";
 use constant DAQTOOLSPATH     => $ENV{'DAQTOOLSPATH'}     || "/local.1/htdocs/daqtools";
 use constant CONFIGPATH       => $ENV{'CONFIGPATH'}       || "/local.1/htdocs/mvdconfig";
@@ -33,4 +33,4 @@ $ENV{'XMLPATH'}           = XMLPATH           unless defined $ENV{'XMLPATH'};
 
 $ENV{'PATH'} = $ENV{'PATH'}.":".EVENTBUILDERPATH;
 
-1;
\ No newline at end of file
+1;

diff --git a/tools/preview/unpack_hld.pl b/tools/preview/unpack_hld.pl
index a3f1ac84f3e0ab636f5970f438bcd58438b3bc1c..8f40c28affb7d754779662318d2a8f387293e183 100755 (executable)
--- a/tools/preview/unpack_hld.pl
+++ b/tools/preview/unpack_hld.pl
@@ -428,7 +428,7 @@ sub analyzeData() {
         
       #Check Status Word
       my $SensorIsValid = 0;
-      if($SensorStatus == 0xf000000f) {
+      if(($SensorStatus & 0xf000000f) == 0xf000000f) {
         $SensorIsValid = 1;
         $Statistics->{$SensorId}->{Valid}++;
         }

diff --git a/tools/start.pl b/tools/start.pl
index 21ee9c35f307e67f31d0dd7e74298b1e49e83701..356258f4f5e32f6ffdfe65dc0da09ef0d6b9c0ed 100755 (executable)
--- a/tools/start.pl
+++ b/tools/start.pl
@@ -24,9 +24,15 @@ sub trb_write {
 sub run {
   my($c) = @_;
   print $c."\n";
-  system($c);
+  system("DAQOPSERVER=".DAQOPSERVER." ".$c);
   }
 
+
+#trb_register_write(0xf30c,0xa002,0xab);
+#print Dumper trb_register_read(0xf30c,0xa002);
+
+#exit;
+
 #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");
@@ -37,8 +43,8 @@ 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(0xff7f,0x8000,0x8000);
-trb_write(0xff7f,0x8000,0x0000);
+trb_write(0x8c00,0x8000,0x8000);
+trb_write(0x8c00,0x8000,0x0000);
 
 
 trb_write(0xfffe,0x00c5,0x20ff);   #Timeouts
@@ -53,6 +59,7 @@ 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,0x00c3,0x00f1);   #no slowcontrol for unused FPGA
 
 
 #Set Sensor IDs
@@ -62,4 +69,4 @@ trb_write(0xc002,0x00c1,0xccc1ccc0);
 trb_write(0xc002,0x00c2,0x00000000);
 
 #Send arbiter start signal
-trb_write(0xf30c,0xa000,0x00000001);
\ No newline at end of file
+trb_write(0xf30c,0xa000,0x00000001);

diff --git a/tools/startup.pl b/tools/startup.pl
index d4a9d6cd93e186df39d974db1ab007d196287acc..7d7208836bb7bf4e8b859cc3d07e40e08e61f992 100755 (executable)
--- a/tools/startup.pl
+++ b/tools/startup.pl
@@ -50,7 +50,7 @@ pod2usage(-exitval => 0, -verbose => 2) if $man;
   
   
 my $defaultIniPath = JTAGCONFIGPATH;
-my $defaultXmlPath = XMLPATH;
+my $defaultXmlPath = CONFDIR;
 mkdir($defaultIniPath) unless (-e $defaultIniPath);
 
   
@@ -148,7 +148,7 @@ sub execute {
 sub sensorini {
   my ($sfile) = @_;
   for (my $s=0;$s<scalar @{$sfile};$s++) {
-    my $cmd = "./xml2ini.pl -c $defaultXmlPath/config/$sfile->[$s] -o $defaultIniPath/$sfile->[$s].ini";
+    my $cmd = "./xml2ini.pl -c $defaultXmlPath/$sfile->[$s] -o $defaultIniPath/$sfile->[$s].ini";
     print $cmd."\n" if $verbose;
     system($cmd);
     }