latest versions

diff --git a/hmon/HPlot.pm b/hmon/HPlot.pm
index 0b4798efcb6f6c70e7f627e10834126bf2d7105a..3b9afb9107a8e189b71e9d14a4e17d61f90de113 100644 (file)
--- a/hmon/HPlot.pm
+++ b/hmon/HPlot.pm
@@ -7,13 +7,13 @@ use FileHandle;
 
 my $p;
 
-use constant {TYPE_HISTORY => 1};
+use constant {TYPE_HISTORY => 1, TYPE_BARGRAPH => 2};
 
 use constant {OUT_PNG    => 1,
               OUT_SVG    => 2,  #n/a
               OUT_SCREEN => 3}; #n/a
 
-my @color= ('#2222dd','#dd2222','#22dd22','#dd8822','#dd22dd','#22dddd');
+my @color= ('#2222dd','#dd2222','#22dd22','#dd8822','#dd22dd','#22dddd','#dddd22','#8888dd','#dddd88');
 
 sub plot_write {
   my ($file,$str,$no) = @_;
@@ -119,6 +119,19 @@ sub PlotInit {
       }
     plot_write($fh," ");
     }
+  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 xtics ('MDC12' 0,'MDC34' 1,'TOF' 2, 'RPC' 3, 'RICH' 4, 'SHW' 5, 'Start' 6, 'FW' 7) offset 2,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,"'-' lt rgb \"$color[$j]\" title \"".($p->{$name}->{titles}->[$j] || "$j")."\" ",1);
+      }
+    plot_write($fh," ");
+    }
   else {
     die "Plot type not supported";
     }
@@ -157,4 +170,4 @@ sub PlotAdd {
   }
 
 
-1;
\ No newline at end of file
+1;

diff --git a/hmon/hmon_busynew.pl b/hmon/hmon_busynew.pl
new file mode 100755 (executable)
index 0000000..5c6d0bc
--- /dev/null
+++ b/hmon/hmon_busynew.pl
@@ -0,0 +1,103 @@
+#!/usr/bin/perl -w
+
+use warnings;
+use strict;
+use Data::Dumper;
+use Data::TreeDumper;
+use Hmon;
+use QA;
+use HADES::TrbNet;
+use HPlot;
+use Time::HiRes qw(usleep);
+use List::Util qw[min max];
+
+
+my $plot = ();
+$plot->{name}    = "BusyTimes";
+$plot->{file}    = "files/BusyTimes";
+$plot->{curves}  = 9;
+$plot->{entries} = 200;
+$plot->{type}    = HPlot::TYPE_HISTORY;
+$plot->{output}  = HPlot::OUT_PNG;
+$plot->{titles}->[0] = "MDC12";
+$plot->{titles}->[1] = "MDC34";
+$plot->{titles}->[2] = "Shower";
+$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->{xlabel}  = "Time";
+$plot->{ylabel}  = "Deadtime (%)";
+$plot->{sizex}   = 830;
+$plot->{sizey}   = 420;
+$plot->{nokey}   = 0;
+$plot->{xscale}  = 4;
+HPlot::PlotInit($plot);
+
+my $plot2=();
+$plot2->{name}    = "BusyTimeBars";
+$plot2->{file}    = "files/BusyTimeBars";
+$plot2->{curves}  = 1;
+$plot2->{type}    = HPlot::TYPE_BARGRAPH;
+$plot2->{output}  = HPlot::OUT_PNG;
+$plot2->{ylabel}  = "Deadtime (%)";
+$plot2->{sizex}   = 265;
+$plot2->{sizey}   = 380;
+$plot2->{nokey}   = 1;
+
+my  $str = Hmon::MakeTitle(12,9,"BusyTimesNew",0);
+  $str .= qq@<img src="%ADDPNG files/BusyTimes.png%" type="image/png">@;
+  $str .= Hmon::MakeFooter();
+  Hmon::WriteFile("BusyTimesNew",$str);
+
+my $fqa = QA::OpenQAFile() or die "No connection to QA Logfile";
+
+trb_init_ports() or die trb_strerror();
+
+my $diff;
+my $old;
+my $iter=0;
+
+while (1) {
+  my $o;
+  my $t = trb_registertime_read_mem(0x8000,0x4030,0,8);
+  $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};
+
+  if (defined $old) {
+    foreach my $b (keys %$o) {
+      for my $v (0..7) {
+        my $tdiff = $o->{$b}->{time}->[$v] - $old->{$b}->{time}->[$v];
+        if ($tdiff < 0) { $tdiff += 2**16;}
+        $tdiff *= 16;
+        my $vdiff = $o->{$b}->{value}->[$v] - $old->{$b}->{value}->[$v];
+        if ($vdiff < 0) { $vdiff += 2**32;}
+        $diff->{$b}->[$v] = $vdiff/($tdiff|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',$diff->{0x8002}->[1],5); #Tof
+    HPlot::PlotAdd('BusyTimes',$diff->{0x8001}->[6],6); #Wall
+    HPlot::PlotAdd('BusyTimes',$diff->{0x8002}->[2],7); #Start/Cts
+    HPlot::PlotAdd('BusyTimes',max($diff->{0x8003}->[1],$diff->{0x8003}->[2]),8); #Pion
+    }
+
+  unless(++$iter % 4) {
+    HPlot::PlotDraw('BusyTimes');
+    }
+  $old = $o;
+  usleep(250000);
+  }

diff --git a/hmon/hmon_endpoints.pl b/hmon/hmon_endpoints.pl
index f0236d81c05666ba1b157a572781058c8214a86f..41a505f1747b97446952d7c84971d54c09adbfc9 100755 (executable)
--- a/hmon/hmon_endpoints.pl
+++ b/hmon/hmon_endpoints.pl
@@ -112,7 +112,7 @@ while(1) {
        #Pion
        0x8900,0x3800,0x3801,
        #Start TRB3
-       0x8880,0x5000,0x5001,0x5002
+       0x8880,0x5000,0x5001,0x5002,0x5003
        );
 
     ###strip the register value

diff --git a/hmon/speakdaemon.pl b/hmon/speakdaemon.pl
index f2e33853befe5bdfbb813e138eee73a67cd354ed..344f70d89baa416b7fef5196cdc549881b2b8641 100755 (executable)
--- a/hmon/speakdaemon.pl
+++ b/hmon/speakdaemon.pl
@@ -11,7 +11,7 @@ $SIG{USR1}  = sub { $inhibit = 1; };
 $SIG{USR2}  = sub { $inhibit = 0; system("killall espeak");}; #system("espeak -ven-male2 -s 130 -g 1 \"Speech daemon is online\" 2>/dev/null");
 
 my $fq = QA::OpenQAFile();
-my $cmd = "./hmon_tail -n 0 -F /home/hadaq/trbsoft/daq/tools/hmon/files/speaklog";
+my $cmd = "./hmon_tail -n 0 -F /home/hadaq/trbsoft/hadesdaq/hmon/files/speaklog";
 
 # my $fq = "remote";
 # my $cmd = "./hmon_ssh -T $QA::QAServer \"tail -n 0 -F /home/hadaq/trbsoft/daq/tools/hmon/files/speaklog\" </dev/null";

diff --git a/hub/startup.script b/hub/startup.script
index 0347e7bca1d7c784d7b2bdd680e4f6f6e313191c..0029c0ae536d3ba1096fef9ce3fe4a22d2c85a23 100644 (file)
--- a/hub/startup.script
+++ b/hub/startup.script
@@ -27,9 +27,17 @@ wait
 
 #Remove TRB3 from this
   trbcmd clearbit 0x8801 0xc3 0x10
+  trbcmd clearbit 0x8003 0xc3 0x04
   trbcmd w 0xff7f 0x8000 0x8000
   trbcmd w 0xff7f 0x8000 0x0000
   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

diff --git a/main/data_sources.db b/main/data_sources.db
index 3667dcc2d5acf9d30c66be8855e6395802b650be..6b91a9c058398b72d71a397b8a8175b7a4755643 100644 (file)
--- a/main/data_sources.db
+++ b/main/data_sources.db
@@ -13,7 +13,7 @@
 0x8410      0         RPC456            mid
 0x8600      0         TOF               low
 0x8700      0         FW                low
-0x8880      1         StartTRB3         low
+0x8880      0         StartTRB3         low
 0x8900      1         Pion1             mid
 0x1000      0         MDC12sec1         high
 0x1010      0         MDC12sec2         high
@@ -28,9 +28,9 @@
 0x1140      0         MDC34sec5         high
 0x1150      0         MDC34sec6         high
 0x1160      0         MDCspecial        mid   #off
-0x3200      0         Shower1           mid
-0x3210      0         Shower2           mid
-0x3220      0         Shower3           mid
-0x3230      0         Shower4           mid
-0x3240      0         Shower5           mid
-0x3250      0         Shower6           mid
+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/main_hades.script b/main/main_hades.script
index d67138979ed683e7eb7f341b1b1e0cc19de0268f..1669ae50e5fe2f67777eb9acf92151e699ab60b0 100644 (file)
--- a/main/main_hades.script
+++ b/main/main_hades.script
@@ -48,7 +48,7 @@ read_addrange_db ../main/address_range.db
 !ifndef CONFIGONLY
 #   Program CTS,SCS,TOF FPGA 
   exec_cmd{local} echo "Programming TRB-FPGA"
-  exec_cmd{scs}   jam_trbv2 --trb -aRUN_XILINX_PROC /home/hadaq/mdc_oepb/stapl/trb2_control_20101110.stapl
+#  exec_cmd{scs}   jam_trbv2 --trb -aRUN_XILINX_PROC /home/hadaq/mdc_oepb/stapl/trb2_control_20101110.stapl
   exec_cmd{wall}  jam_trbv2 --trb -aRUN_XILINX_PROC /home/hadaq/tof/fpga/20120305_tof.stapl
   exec_cmd{rpc}   jam_trbv2 --trb -aRUN_XILINX_PROC /home/hadaq/rpc/fpga/20120323_rpc_a.stapl
   exec_cmd{tof}   jam_trbv2 --trb -aRUN_XILINX_PROC /home/hadaq/tof/fpga/20120305_tof.stapl
@@ -60,7 +60,7 @@ read_addrange_db ../main/address_range.db
   exec_cmd{local} echo "Programming FPGA1"
   exec_cmd{hub}    jam_trbv2 --addononly -aFP /home/hadaq/hub/hub2_fpga1_single_20110517.stp
   exec_cmd{hubcts} jam_trbv2 --addon     -aFP /home/hadaq/hub/hub2_fpga1_full_20110517.stp
-  exec_cmd{hubcentral} jam_trbv2 --addon     -aFP /home/hadaq/hub/hub2_fpga1_full_20110517.stp
+ # exec_cmd{hubcentral} jam_trbv2 --addon     -aFP /home/hadaq/hub/hub2_fpga1_full_20110517.stp
   exec_cmd{cts}    jam_trbv2 --addononly -aFP /home/hadaq/cts/20120410_cts_fpga1_only_etrax_a.stp
 
   exec_cmd{shower} jam_trbv2 --addon -aFP /home/hadaq/shower/shower_fpga1_20110808_a.stp  #stable
@@ -69,7 +69,7 @@ read_addrange_db ../main/address_range.db
   # Program 2nd AddOn FPGA
   exec_cmd{local} echo "Programming FPGA2"
   exec_cmd{hub}    jam_trbv2 --addononly -aFP /home/hadaq/hub/hub2_fpga2_single_20111121.stp #experimental
-  exec_cmd{hubcentral}  jam_trbv2 --addon -aFP /home/hadaq/hub/hub2_fpga2_full_20110523.stp # leave this hub with old
+#  exec_cmd{hubcentral}  jam_trbv2 --addon -aFP /home/hadaq/hub/hub2_fpga2_full_20110523.stp # leave this hub with old
   exec_cmd{hubcts}    jam_trbv2 --addon -aFP /home/hadaq/hub/hub2_fpga2_full_20111121.stp #experimental
   exec_cmd{cts}    jam_trbv2 --addononly -aFP /home/hadaq/cts/20120321_cts_fpga2_only_etrax_a.stp
   exec_cmd{shower} jam_trbv2 --addon -aFP /home/hadaq/shower/shower_fpga2_20120214.stp  #stable
@@ -138,13 +138,13 @@ wait
   !ifndef NOCTS
     exec_script{blr}   ../cts/configure_blr.script
   !endif  
-wait
+
 #MDC
   !ifndef NOMDC
     exec_cmd{con} echo "Configure MDC"
     exec_script{pexor} ../mdc/startup.script
   !endif
-wait
+
 #RICH
   !ifndef NORICH
     exec_cmd{con} echo "Configure RICH"
@@ -157,13 +157,8 @@ wait
     exec_script{pexor} ../pion/startup.script
   !endif  
   
-wait
 
-#RPC
-  !ifndef NORPC
-    exec_script{local} ../rpc/startup.script
-  !endif
-  
+
 #Shower
   !ifndef NOSHOWER
     exec_cmd{con} echo "Configure Shower"
@@ -189,6 +184,11 @@ wait
     exec_script{local} ../tof/startup.script
   !endif
 
+#RPC
+  !ifndef NORPC
+    exec_script{local} ../rpc/startup.script
+  !endif
+  
 wait
   
 #Central boards / CTS / SCS

diff --git a/main/startup_briccolage.sh b/main/startup_briccolage.sh
index 03e125192433f4f405185fb59c2a7bb9fe490f75..c9a57f05d3c5d81a0d3ad51755e41ae893c0ff7b 100755 (executable)
--- a/main/startup_briccolage.sh
+++ b/main/startup_briccolage.sh
@@ -33,6 +33,10 @@ notifyall.sh "DAQ" "<I> DAQ is going to be restarted." "STARTUP" &
   trbcmd w 0x1031 0xc1 0xfbf   #one hardware port is not working, but nothing connected
   trbcmd w 0x1031 0xc3 0xfbf   #one hardware port is not working, but nothing connected
 
+# 2014-02-18 removed due to frequent busy
+switchport.pl 0x1003 5 off
+
+
 # 2012-04-30: 10:16:00 0x223b removed from system, reinit doesnt work
 #   switchport.pl 0x1133 5 off
 
@@ -61,7 +65,7 @@ notifyall.sh "DAQ" "<I> DAQ is going to be restarted." "STARTUP" &
   time ./startup.pl -f main_hades.script -eb off -o file \
       -m TOF -m RPC -m WALL -m RICH -m SHOWER \
       -m STARTCTS -m NORESET -m CONFIGONLY  -m MON_CTS \
-      -m NOMDC #-m MDCreg0current -m MDCnomasks -m MDCDATASET -m MDCindiv
+      -m MDC -m MDCreg0current -m MDCnomasks -m MDCDATASET -m MDCindiv
 
 ########################################
 ###  DO NOT CHANGE ANY MDC SETTINGS HERE - without changing them in reviveoep.pl as well!!!!!!
@@ -74,7 +78,7 @@ notifyall.sh "DAQ" "<I> DAQ is going to be restarted." "STARTUP" &
 #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/mdc/thresholds/register_thresholds_20120405_181232.db b/mdc/thresholds/register_thresholds_20120405_181232.db
index 6c4833b7c8a1de29c453d169a2dea2c3effabb87..a092f8f49efdb68c1df82d5f8f5cd051c0aee368 100644 (file)
--- a/mdc/thresholds/register_thresholds_20120405_181232.db
+++ b/mdc/thresholds/register_thresholds_20120405_181232.db
@@ -242,7 +242,7 @@
 0x2214     1    0x5a    0x5a    0x54    0x5a    
 0x2215     2    0x52    0x50    0x60    0x60    0x5e    0x60    
 0x2216     2    0x60    0x50    0x60    0x60    0x5a    0x60    
-0x2217     1    0x60    0x50    0x60    0x54    
+0x2217     1    0x70    0x60    0x70    0x64    
 0x2218     1    0x54    0x50    0x60    0x60    
 0x2219     1    0x5c    0x60    0x60    0x60    
 0x221a     1    0x5e    0x5a    0x5a    0x5a    

diff --git a/nettools/reviveoep.pl b/nettools/reviveoep.pl
index d1f073ea9d774d558b3f4f93564ea4bffd6255f5..6c9d277a80b9d346ca48f6100a401921a1f41a9e 100755 (executable)
--- a/nettools/reviveoep.pl
+++ b/nettools/reviveoep.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 
-BEGIN {push @INC, '/home/hadaq/trbsoft/daq/tools/hmon/'}
+BEGIN {push @INC, '/home/hadaq/trbsoft/hadesdaq/hmon/'}
 
 
 use warnings;

diff --git a/oracle/daq2ora_client.pl b/oracle/daq2ora_client.pl
index 4b94614248f2a13a3a16d12340e0603877f10f1a..703e037655734b4cc36b0acdba64e9b1d041e369 100755 (executable)
--- a/oracle/daq2ora_client.pl
+++ b/oracle/daq2ora_client.pl
@@ -84,7 +84,8 @@ if($opt_daemon){
 threads->new( \&statusServer );
 
 #-------- need to explicitely set oracle environment if this was started by icinga restarthandler (not-login ssh!)
-$ENV{ORACLE_HOME}='/usr/lib/oracle/11.2/client';
+$ENV{ORACLE_HOME}='/usr/lib/oracle/12.1/client64';
+$ENV{LD_LIBRARY_PATH}='/usr/lib/oracle/12.1/client64/lib';
 
 #-------- Connect the database
 $status = "Try to connect to the Data Base ...";

diff --git a/oracle/runinfo2orastart_parallel.sh b/oracle/runinfo2orastart_parallel.sh
index e10203e4ea9dfaf3d494b5b0682bd7e42def7ffb..b0e2f70f3a6d41e73f719047bed9539c3d910b5d 100755 (executable)
--- a/oracle/runinfo2orastart_parallel.sh
+++ b/oracle/runinfo2orastart_parallel.sh
@@ -1,12 +1,15 @@
 #!/bin/bash
 ## start script for separate runinfo2ora processes
 # JAM feb-2012
+# JAM added ld_library_path in feb-2014
 
 # for icinga restart handler, we need to kill old processes first:
 echo "killing old processes:" /bin/pidof -x  runinfo2ora.pl
 /bin/pidof -x  runinfo2ora.pl | /usr/bin/xargs /bin/kill -9
 # need to specify oracle environment for remote icinga restart:
-export ORACLE_HOME=/usr/lib/oracle/11.2/client
+export ORACLE_HOME=/usr/lib/oracle/12.1/client64
+export PATH=$PATH:$ORACLE_HOME/bin
+export LD_LIBRARY_PATH=$ORACLE_HOME/lib:$LD_LIBRARY_PATH
 /home/hadaq/trbsoft/daq/oracle/runinfo2ora.pl -f /home/hadaq/oper/oper_5/eb_runinfo2ora_1.txt  > /home/hadaq/log/runinfo2ora_1_log.txt 2>&1 &
 sleep 1
 /home/hadaq/trbsoft/daq/oracle/runinfo2ora.pl -f /home/hadaq/oper/oper_2/eb_runinfo2ora_2.txt  > /home/hadaq/log/runinfo2ora_2_log.txt 2>&1 &

diff --git a/pion/addresses_pion.db b/pion/addresses_pion.db
index e76846fd6010c78a6d2d8efbedf637b0e2ec25ce..387edcb8fcfd8bed2a0fd42d77d849777d1f8a7b 100644 (file)
--- a/pion/addresses_pion.db
+++ b/pion/addresses_pion.db
@@ -1,9 +1,9 @@
 #Address  #   S/N   #   FPGA  #   Design  #  TRB  #
 ###################################################
 0x3800        0750        0          0        033
-0x3801        0751        1          0        033
-0x3802        0752        2          0        033
-0x3803        0753        3          0        033
+0x3820        0751        1          0        033
+0x3821        0752        2          0        033
+0x3801        0753        3          0        033
 
 #0x3810        0750        0          0        075
 #0x3811        0751        1          0        075

diff --git a/pion/config/nxyter.sh b/pion/config/nxyter.sh
index 72c6ad1ec0efe39534d56a3201cbd520c5ca4c97..1321e2e539fb2b3d349dcd3e852ad3146b002dbf 100755 (executable)
--- a/pion/config/nxyter.sh
+++ b/pion/config/nxyter.sh
@@ -24,8 +24,8 @@ done
 #./trb3_setup.sh 0x3802
 #./trb3_setup.sh 0x3803
 
-trbcmd w 0x8900 0xc0 0xfff3
-trbcmd w 0x8900 0xc1 0xfff3
-trbcmd w 0x8900 0xc3 0xfff3
+trbcmd w 0x8900 0xc0 0xfff9
+trbcmd w 0x8900 0xc1 0xfff9
+trbcmd w 0x8900 0xc3 0xfff9
 
 cd ..

diff --git a/pion/config/nxyter/nxsetup_0x3800.dat b/pion/config/nxyter/nxsetup_0x3800.dat
index 5f421cb391c7afd464c775d47957681619bd5ef5..429b3384daf31f4aa7e532539f12b6a746d97f07 100644 (file)
--- a/pion/config/nxyter/nxsetup_0x3800.dat
+++ b/pion/config/nxyter/nxsetup_0x3800.dat
@@ -21,7 +21,7 @@
 0x000000ff    # 17
 0x00000023    # 18  Common Threshold, default 0x80
 0x0000001e    # 19
-0x0000005f    # 20
+0x0000007d    # 20
 0x0000008e    # 21
 0x00000064    # 22
 0x00000089    # 23
@@ -33,8 +33,8 @@
 0x00000045    # 29
 0x000000be    # 30
 0x000000be    # 31
-0x00000000    # 32  TestTrigger setup etc. , default 0x00
-0x0000000c    # 33  clock input 256A, set bit #3, default 0x08 (normal mode)
+0x00000004    # 32  TestTrigger setup etc. , default 0x00
+0x00000008    # 33  clock input 256A, set bit #3, default 0x08 (normal mode)
 0x000000be    # 34
 0x000000be    # 35
 0x000000be    # 36

diff --git a/pion/config/nxyter/nxsetup_0x3801.dat b/pion/config/nxyter/nxsetup_0x3801.dat
index 24db9e5a0b7f5af8de81472efcf8c2e62fe7c7e6..2b039cc1ad7b0acb22f78ee2ed734ea977dc8357 100644 (file)
--- a/pion/config/nxyter/nxsetup_0x3801.dat
+++ b/pion/config/nxyter/nxsetup_0x3801.dat
@@ -19,9 +19,9 @@
 0x00000000    # 15  Channel Masks END
 0x000000a0    # 16  
 0x000000ff    # 17
-0x00000028    # 18  Common Threshold, default 0x80
+0x00000023    # 18  Common Threshold, default 0x80
 0x0000001e    # 19
-0x0000005f    # 20
+0x00000064    # 20
 0x0000008e    # 21
 0x00000064    # 22
 0x00000089    # 23
@@ -33,8 +33,8 @@
 0x00000045    # 29
 0x000000be    # 30
 0x000000be    # 31
-0x00000004    # 32  TestTrigger setup etc. , default 0x00
-0x00000008    # 33  clock input 256A, set bit #3, default 0x08 (normal mode)
+0x00000000    # 32  TestTrigger setup etc. , default 0x00
+0x0000000c    # 33  clock input 256A, set bit #3, default 0x08 (normal mode)
 0x000000be    # 34
 0x000000be    # 35
 0x000000be    # 36

diff --git a/pion/config/nxyter/nxsetup_0x3802.dat b/pion/config/nxyter/nxsetup_0x3802.dat
deleted file mode 100644 (file)
index 3e2d7e6..0000000
--- a/pion/config/nxyter/nxsetup_0x3802.dat
+++ /dev/null
@@ -1,49 +0,0 @@
-#------------------------------------------
-# Value        I2C RegisterAddress
-#------------------------------------------
-0x00000000    #  0  Channel Masks BEGIN
-0x00000000    #  1
-0x00000000    #  2
-0x00000000    #  3
-0x00000000    #  4
-0x00000000    #  5
-0x00000000    #  6
-0x00000000    #  7
-0x00000000    #  8
-0x00000000    #  9
-0x00000000    # 10
-0x00000000    # 11
-0x00000000    # 12
-0x00000000    # 13
-0x00000000    # 14
-0x00000000    # 15  Channel Masks END
-0x000000a0    # 16  
-0x000000ff    # 17
-0x00000023    # 18  Common Threshold, default 0x80
-0x0000001e    # 19
-0x0000005f    # 20
-0x0000009b    # 21
-0x00000064    # 22
-0x00000089    # 23
-0x000000ff    # 24  Testpulse Strength, default 0x80
-0x00000045    # 25
-0x0000000f    # 26  iDUR (26) Analog dead time (changes nxtimer CVT)
-0x00000036    # 27
-0x0000005c    # 28
-0x00000045    # 29
-0x000000be    # 30
-0x000000be    # 31
-0x00000000    # 32  TestTrigger setup etc. , default 0x00
-0x0000000c    # 33  clock input 256A, set bit #3, default 0x08 (normal mode)
-0x000000be    # 34
-0x000000be    # 35
-0x000000be    # 36
-0x000000be    # 37
-0x00000000    # 38
-0x00000000    # 39
-0x000000be    # 40
-0x000000be    # 41
-0x000000be    # 42 Channel shutdown register, FIFO, do not touch
-0x00000000    # 43
-0x00000000    # 44
-0x000000ff    # 45

diff --git a/pion/config/nxyter/nxsetup_0x3803.dat b/pion/config/nxyter/nxsetup_0x3803.dat
deleted file mode 100644 (file)
index ef4eabc..0000000
--- a/pion/config/nxyter/nxsetup_0x3803.dat
+++ /dev/null
@@ -1,49 +0,0 @@
-#------------------------------------------
-# Value        I2C RegisterAddress
-#------------------------------------------
-0x00000000    #  0  Channel Masks BEGIN
-0x00000000    #  1
-0x00000000    #  2
-0x00000000    #  3
-0x00000000    #  4
-0x00000000    #  5
-0x00000000    #  6
-0x00000000    #  7
-0x00000000    #  8
-0x00000000    #  9
-0x00000000    # 10
-0x00000000    # 11
-0x00000000    # 12
-0x00000000    # 13
-0x00000000    # 14
-0x00000000    # 15  Channel Masks END
-0x000000a0    # 16  
-0x000000ff    # 17
-0x00000028    # 18  Common Threshold, default 0x80
-0x0000001e    # 19
-0x0000005f    # 20
-0x000000ae    # 21
-0x00000064    # 22
-0x00000089    # 23
-0x000000ff    # 24  Testpulse Strength, default 0x80
-0x00000045    # 25
-0x0000000f    # 26  iDUR (26) Analog dead time (changes nxtimer CVT)
-0x00000036    # 27
-0x0000005c    # 28
-0x00000045    # 29
-0x000000be    # 30
-0x000000be    # 31
-0x00000004    # 32  TestTrigger setup etc. , default 0x00
-0x00000008    # 33  clock input 256A, set bit #3, default 0x08 (normal mode)
-0x000000be    # 34
-0x000000be    # 35
-0x000000be    # 36
-0x000000be    # 37
-0x00000000    # 38
-0x00000000    # 39
-0x000000be    # 40
-0x000000be    # 41
-0x000000be    # 42 Channel shutdown register, FIFO, do not touch
-0x00000000    # 43
-0x00000000    # 44
-0x000000ff    # 45

diff --git a/pion/config/nxyter/trb3_setup.sh b/pion/config/nxyter/trb3_setup.sh
index 32d39f6306f67da3f1a1f6d2a3e01e1ba55cb237..b791fafd7e94237d0b42022674927a86d389f6f2 100755 (executable)
--- a/pion/config/nxyter/trb3_setup.sh
+++ b/pion/config/nxyter/trb3_setup.sh
@@ -21,6 +21,7 @@ trbcmd w $board 0x8101 0x01
 
 # Write nxsetup.dat to memory and transfer to nx-i2c-registers
 trbcmd wm $board 0x8200 0 nxsetup_$board.dat
+echo "Using nxsetup_$board.dat"
 
 #trbcmd w $board 0x8212 150 # threshold, load from dat file
 

diff --git a/pion/startup.script b/pion/startup.script
index 603448f6b45268494f84bacfc947039a899b34e6..97ccd1da07539cadbee5aafb8b2c3528f271e87b 100644 (file)
--- a/pion/startup.script
+++ b/pion/startup.script
@@ -2,7 +2,6 @@
 !ifndef RESTART 
   set_addresses  serials_pion.db  addresses_pion.db
 !endif
-wait
 
 exec_cmd{local} echo "---> Configuring n-XYTERs"
 exec_cmd /home/hadaq/trbsoft/hadesdaq/pion/config/nxyter_wrapper.sh

diff --git a/shower/configure_shower.script b/shower/configure_shower.script
index 4e8ad70c58c4d5454225be664b9131b49ba247c8..07da048bf4949efe1d8befe25f4647acbcb25014 100644 (file)
--- a/shower/configure_shower.script
+++ b/shower/configure_shower.script
@@ -1,8 +1,9 @@
 
 ###WARNING: PEDESTALS SET TO CONSTANT FF for testing purposes
 
-exec_cmd /home/hadaq/bin/showerpeds.pl -f /home/hadaq/trbsoft/daq/shower/showerpeds.dat write #NORMAL
-#exec_cmd /home/hadaq/bin/showerpeds.pl -f /home/hadaq/trbsoft/daq/shower/showerpeds_ff.dat write #QUIET MODE
+#exec_cmd /home/hadaq/bin/showerpeds.pl -f /home/hadaq/trbsoft/daq/shower/showerpeds.dat write #NORMAL
+exec_cmd /home/hadaq/bin/showerpeds.pl -f /home/hadaq/trbsoft/daq/shower/showerpeds_ff.dat write #QUIET MODE
+#exec_cmd /home/hadaq/bin/showerpeds.pl -f /home/hadaq/trbsoft/daq/shower/showerpeds_00.dat write #no thresholds
 #exec_cmd /home/hadaq/bin/showerpeds.pl -f /home/hadaq/trbsoft/daq/shower/showerPed_1111_hv2300V.txt write
 
 

diff --git a/start/startup.script b/start/startup.script
index be8db16bab4dfa801ac2d0a90bc7d2bacb30a4fa..26cb4c7cdb09abf0880fdc7615465a6c10bee5ac 100644 (file)
--- a/start/startup.script
+++ b/start/startup.script
@@ -11,4 +11,7 @@
 trbcmd w 0x5000 0xc801 0x000f0000
 trbcmd w 0x5001 0xc801 0x000f0000
 trbcmd w 0x5002 0xc801 0x000f0000
-trbcmd w 0x5003 0xc801 0x000f0000
\ No newline at end of file
+trbcmd w 0x5003 0xc801 0x000f0000
+
+
+trbcmd w 0xfe48 0xc801 0x000f0000

diff --git a/utils/move_doublecpu_irq.sh b/utils/move_doublecpu_irq.sh
index b8733f434107f47e7a978625ce9b869eb1f8b03f..b6d00c73416db3c1538e93447d810e50f4588335 100755 (executable)
--- a/utils/move_doublecpu_irq.sh
+++ b/utils/move_doublecpu_irq.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 #ssh root@lxhadeb01 'echo 000000 > /proc/irq/1272/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@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@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;'