misc, mt

diff --git a/tools/dirich_scan_backplane.pl b/tools/dirich_scan_backplane.pl
index 16b680fda49319ac232b71a3badc646fdaec1cd8..aef8c03744fed5e56bccac59d88e19c46005979d 100755 (executable)
--- a/tools/dirich_scan_backplane.pl
+++ b/tools/dirich_scan_backplane.pl
@@ -19,10 +19,9 @@ foreach my $cur_position (1..12) {
   #print $c . "\n";
   qx($c);
   sleep 4;
-  $c = "~/trbsoft/daqtools/merge_serial_address.pl $ENV{DAQ_TOOLS_PATH}/base/serials_dirich.db $ENV{USER_DIR}/db/addresses_dirich.db";
+  #qx($c);
 
-  qx($c);
-  $c = "trbcmd reset; sleep 1; trbcmd i 0xffff | grep ^0x12";
+  $c = "trbcmd reset; sleep 1; ~/trbsoft/daqtools/merge_serial_address.pl $ENV{DAQ_TOOLS_PATH}/base/serials_dirich.db $ENV{USER_DIR}/db/addresses_dirich.db; sleep 1; trbcmd i 0xffff | grep ^0x12";
   my $r = qx($c);
 
   print "position: $cur_position: $r\n";

diff --git a/tools/switch_power_dirich.pl b/tools/switch_power_dirich.pl
index 71f9ce83451a90798fa1c23f3a932dd387c3a3a6..1b650e3cc59616bf4b6caaa2476e08baf0583287 100755 (executable)
--- a/tools/switch_power_dirich.pl
+++ b/tools/switch_power_dirich.pl
@@ -83,5 +83,5 @@ exit;
 
 
 sub usage {
-  print "switch_power_dirich.pl <position in backplane> <on|off|toggle>\n";
+  print "switch_power_dirich.pl <dirich_conc_address> <position in backplane> <on|off|toggle>\n";
 }

diff --git a/users/frankfurt_test/dirich_cycle.pl b/users/frankfurt_test/dirich_cycle.pl
index dde1421268e65167d1ca10f2242007c0cbed836f..ed26f6d11768fdf6c3b0c8b8445dfbb7021d9465 100755 (executable)
--- a/users/frankfurt_test/dirich_cycle.pl
+++ b/users/frankfurt_test/dirich_cycle.pl
@@ -29,7 +29,7 @@ foreach my $combs (keys %$act_ports) {
   next if $mask == 0;
   trb_register_setbit($combs,0xd580,$mask);
   usleep(10000);
-  trb_register_clearbit($combs,0xd580,$mask);  
+  trb_register_clearbit($combs,0xd580,$mask);
   }
 usleep(800000);  
 count();

diff --git a/users/gsi_ee_trb84/TdcEventBuilder.xml b/users/gsi_ee_trb84/TdcEventBuilder.xml
index d80f118553082ecae73d59b78e75961f66f085b2..9bb7a8ae9462aa67dc822d770b655f5c4b7b2993 100644 (file)
--- a/users/gsi_ee_trb84/TdcEventBuilder.xml
+++ b/users/gsi_ee_trb84/TdcEventBuilder.xml
@@ -69,7 +69,7 @@ When starting analysis from the go4 gui, one should specify stream server with p
     <!-- Thread name="*" publ="true" prof="true"/ -->
     
     <MemoryPool name="Pool">
-       <BufferSize value="200000"/>
+       <BufferSize value="2000000"/>
        <NumBuffers value="1000"/>
     </MemoryPool>
     
@@ -96,7 +96,7 @@ When starting analysis from the go4 gui, one should specify stream server with p
     <Module name="Combiner" class="hadaq::CombinerModule">    
         <!-- these parameters will force to create inputs/outputs of module -->
        <NumInputs value="4"/>
-       <NumOutputs value="1"/>
+       <NumOutputs value="2"/>
 
        <InputPort name="Input0" url="hadaq://host:50084" urlopt1="" thread="inp2thrd"/>
        <InputPort name="Input1" url="hadaq://host:50061" urlopt1="" thread="inp1thrd"/>
@@ -112,7 +112,7 @@ When starting analysis from the go4 gui, one should specify stream server with p
        <!-- <InputPort name="Input3" url="hadaq://host:10104" urlopt1="trb=0x8030&tdc=[0x3030,0x3031,0x3032,0x3033]&dummy"/> -->
        <!-- <InputPort name="Input4" url="hadaq://host:10105" urlopt1="trb=0x8040&tdc=[0x3040,0x3041,0x3042,0x3043]&dummy"/> -->
 
-       <InputPort name="Input*" queue="30" urlopt="udpbuf=20000&mtu=64512&flush=2.0&observer=false&debug"/>
+       <InputPort name="Input*" queue="30" urlopt="udpbuf=200000&mtu=64512&flush=2.0&observer=false&debug"/>
 
        <ExtraDebug value="false"/>
 

diff --git a/users/gsi_ee_trb84/startup.sh b/users/gsi_ee_trb84/startup.sh
index 9f3a28190d1b3d1aa4ce61fe5c160c75e696b9b6..d74725b01b48cf88db23a8f185f7f6cdda479917 100755 (executable)
--- a/users/gsi_ee_trb84/startup.sh
+++ b/users/gsi_ee_trb84/startup.sh
@@ -87,12 +87,12 @@ trbcmd w 0xfffe 0xc5 0x50ff
 
 echo "pulser"
 # pulser #0 to 10 kHz
-trbcmd w 0xc001 0xa154 0x0000270f   
+trbcmd w 0xc001 0xa156 0x0000270f   
 #trbcmd w 0xc001 0xa150 0x0022270f   
 
 echo "trigger type"
 # set trigger type to 0x1
-trbcmd setbit 0xc001 0xa159 0x10
+trbcmd setbit 0xc001 0xa15e 0x10
 
 
 #trbcmd clearbit 0x1130 0xc801 0x80000000 # disable window

diff --git a/users/gsi_ee_trb84/trbreset_loop.pl b/users/gsi_ee_trb84/trbreset_loop.pl
index 7ae7359d2f63129646c6a84cab59ac1fa1a263e5..02736743ea27d570ed06338952a9f1edf3737ba6 100755 (executable)
--- a/users/gsi_ee_trb84/trbreset_loop.pl
+++ b/users/gsi_ee_trb84/trbreset_loop.pl
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 ### Change THIS!
-my $required_endpoints = 20;
+my $required_endpoints = 16;
 
 
 

diff --git a/web/htdocs/tools/pwr/pwr.conf b/web/htdocs/tools/pwr/pwr.conf
index 12556522a33d2867ab435186cfc5e5fe770c8afb..0e016ef942812f3ae6710c62ec04a44444e56c67 100644 (file)
--- a/web/htdocs/tools/pwr/pwr.conf
+++ b/web/htdocs/tools/pwr/pwr.conf
@@ -3,6 +3,6 @@
 
 //PWRSPLY:/dev/ttyUSB0:9600:PST3202:PST:3
 //PWRSPLY:/dev/ttyUSB0:115200:HMP4030:HMP:3
-PWRSPLY:/dev/FTDI_FT232R_USB_UART_AH02HFZW:2400:PSP2010:PSP:1
-PWRSPLY:/dev/FTDI_FT232R_USB_UART_A702HE33:2400:PSP405:PSP:1
-
+//PWRSPLY:/dev/FTDI_FT232R_USB_UART_AH02HFZW:2400:PSP2010:PSP:1
+//PWRSPLY:/dev/FTDI_FT232R_USB_UART_A702HE33:2400:PSP405:PSP:1
+PWRSPLY:/dev/HAMEG_HAMEG_HO720_024025396:0:DiRich:HMP:4