From: Michael Traxler <M.Traxler@gsi.de>
Date: Tue, 24 May 2022 01:03:28 +0000 (+0200)
Subject: local gsi_ee_trb84 status, mt
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=31d0776176c3646af7196053e53cc46de91e611f;p=daqtools.git

local gsi_ee_trb84 status, mt
---

diff --git a/users/gsi_ee_trb84/db/register_configgbe_ip.db b/users/gsi_ee_trb84/db/register_configgbe_ip.db
index be653a4..7e3d8cd 100644
--- a/users/gsi_ee_trb84/db/register_configgbe_ip.db
+++ b/users/gsi_ee_trb84/db/register_configgbe_ip.db
@@ -24,13 +24,12 @@
     15     0x81F0   0x81F1   0x81F2   0x81F3   0x81F7  
 
 !Value table
-#                Dest MAC   Dest MAC    Dest IP     Dest Port  Src Port  
-# Hub  # Type #     C0    #     C1   #     C2     #    C3    #    C7   #
-########################################################################
 
 #14:dd:a9:d3:f4:b8 # hadesp39
 #60:45:cb:9e:97:c5 # hadesp46
-
+#                Dest MAC   Dest MAC    Dest IP     Dest Port  Src Port  
+# Hub  # Type #     C0    #     C1   #     C2     #    C3    #    C7   #
+########################################################################
  0xc001    0    0xcb9e97c5    0x6045    0xc0a80009    50084	0xc350
  0x8610    0    0xcb9e97c5    0x6045    0xc0a80009    50061     0xc350
  0x1692    0    0xcb9e97c5    0x6045    0xc0a80009    50092     0xc350
diff --git a/users/gsi_ee_trb84/db/register_configtdc.db b/users/gsi_ee_trb84/db/register_configtdc.db
index e57d349..0758050 100644
--- a/users/gsi_ee_trb84/db/register_configtdc.db
+++ b/users/gsi_ee_trb84/db/register_configtdc.db
@@ -18,7 +18,7 @@
 #0xfe62		0   0x00000000	 0x00000000   0x00000000   0x00000000   0x00000000   0x00000000	# trb3sc
 0xfe71		0   0x00000000	 0x00000000   0x00000000   0x00000000   0x00000000   0x00000000	# trb3sc padiwa 4Conn backplane
 #0xfe51		0   0x00000000	 0x00000000   0x00000000   0x00000000   0x00000000   0x00000000	# dirich
-0xfe57		0   0x00000000	 0x00000000   0x00000000   0x00000000   0x00000000   0x00000000	# dirich5s
+#0xfe57		0   0x00000000	 0x00000000   0x00000000   0x00000000   0x00000000   0x00000000	# dirich5s
 
 
 
@@ -30,7 +30,7 @@
 #0xfe62		0   0x50003000	 0x80640064   0x00000000   0x00000000   0x00000078   0x00000000	# trb3sc
 0xfe71		0   0x50003000	 0x80640064   0x00000000   0x00000000   0x00000078   0x00000000	# trb3sc padiwa 4Conn backplane
 #0xfe51		0   0x50003000	 0x00640064   0x00000000   0x00000000   0x00000078   0x00000000	# dirich
-0xfe57		0   0x50003000	 0x00640064   0x00000000   0x00000000   0x00000078   0x00000000	# dirich5s
+#0xfe57		0   0x50003000	 0x00640064   0x00000000   0x00000000   0x00000078   0x00000000	# dirich5s
 
 
 
diff --git a/users/gsi_ee_trb84/first.C b/users/gsi_ee_trb84/first.C
index 2b711ce..c497477 100644
--- a/users/gsi_ee_trb84/first.C
+++ b/users/gsi_ee_trb84/first.C
@@ -28,11 +28,11 @@ void first()
 //   hadaq::TdcProcessor::SetToTRange(30, 50, 80);
 
    // [min..max] range for TDC ids
-   hadaq::TrbProcessor::SetTDCRange(0x1100, 0x11FF);
+   hadaq::TrbProcessor::SetTDCRange(0x1000, 0x1FFF);
 
 
    // [min..max] range for HUB ids
-   hadaq::TrbProcessor::SetHUBRange(0x8800, 0x88FF);
+   hadaq::TrbProcessor::SetHUBRange(0x0840, 0x0840);
 
    // Histogramming for ToT: first: nr. of bins, 2nd: TOT range
    hadaq::TdcProcessor::SetDefaults(600, 1000);
@@ -127,7 +127,7 @@ extern "C" void after_create(hadaq::HldProcessor* hld)
       //tdc->SetStoreEnabled();
       for (unsigned nch=1; nch<tdc->NumChannels(); nch++) {
         //if(nch!=48) {
-          tdc->SetRefChannel(nch, nch-1, 0xffff, 18000,  -5., 5.);
+          tdc->SetRefChannel(nch, nch-1, 0xffff, 100000,  -50., 50.);
           //}
       }
 
diff --git a/users/gsi_ee_trb84/startup.sh b/users/gsi_ee_trb84/startup.sh
index 6b7358c..9e7dad5 100755
--- a/users/gsi_ee_trb84/startup.sh
+++ b/users/gsi_ee_trb84/startup.sh
@@ -65,9 +65,6 @@ echo "TDC settings end"
 # pulser to 100kHz and 50kHz
 #trbcmd w 0xc840 0xa156 0x0000270f #10khz pulser 0
 
-trbcmd w 0xc001 0xa158 0x0000270f #10khz pulser 0
-
-
 
 #trbcmd w 0xc840 0xa150 0x000003e7 #100khz
 #trbcmd w 0xc840 0xa150 0x0001869f #1khz
@@ -96,7 +93,7 @@ trbcmd w 0xfffe 0xc5 0x50ff
 
 echo "pulser"
 # pulser #0 to 10 kHz
-trbcmd w 0xc001 0xa158 0x0000070f   
+trbcmd w 0xc001 0xa158 0x000007cf # set pulser frequency to 50kHz
 #trbcmd w 0xc001 0xa150 0x0022270f   
 
 echo "trigger type"
@@ -131,49 +128,53 @@ echo "pulser frequency"
 #trbcmd w 0xc001 0xa155 0x3e7 # Pulser 2: 100kHz
 
 
-./tdcv4_caltrg_init_new.sh 0xfe53
-#./tdcv4_caltrg_init.sh 0xfe55
+# only for tdcv4
+
+# ./tdcv4_caltrg_init_new.sh 0xfe53
+# #./tdcv4_caltrg_init.sh 0xfe55
+
 
 
+# trbcmd setbit 0xfe53 0xcd00 0x08000000  # enable TDL of RefChan
+# trbcmd setbit 0xfe55 0xcd00 0x08000000  # enable TDL of RefChan
+# #trbcmd w 0xfe53 0xcd12 0x2801 # enable channels
+# #trbcmd w 0xfe53 0xcd22 0x8002 # enable channels
+# trbcmd clearbit 0xfe53 0xcd00 0x1
+# trbcmd clearbit 0xfe55 0xcd00 0x1
 
-trbcmd setbit 0xfe53 0xcd00 0x08000000  # enable TDL of RefChan
-trbcmd setbit 0xfe55 0xcd00 0x08000000  # enable TDL of RefChan
-#trbcmd w 0xfe53 0xcd12 0x2801 # enable channels
-#trbcmd w 0xfe53 0xcd22 0x8002 # enable channels
-trbcmd clearbit 0xfe53 0xcd00 0x1
-trbcmd clearbit 0xfe55 0xcd00 0x1
 
+# # set Oscillator frequency
+# trbcmd loadbit 0xfe53 0xcd24 0xff000000 0x60000000  # 8 LSBs of oscillator frequency in units of 10kHz
+# trbcmd loadbit 0xfe53 0xcd25 0xff000000 0x6d000000  # 8 MSBs of oscillator frequency in units of 10kHz
 
-# set Oscillator frequency
-trbcmd loadbit 0xfe53 0xcd24 0xff000000 0x60000000  # 8 LSBs of oscillator frequency in units of 10kHz
-trbcmd loadbit 0xfe53 0xcd25 0xff000000 0x6d000000  # 8 MSBs of oscillator frequency in units of 10kHz
+# trbcmd loadbit 0xfe55 0xcd24 0xff000000 0x60000000  # 8 LSBs of oscillator frequency in units of 10kHz
+# trbcmd loadbit 0xfe55 0xcd25 0xff000000 0x6d000000  # 8 MSBs of oscillator frequency in units of 10kHz
 
-trbcmd loadbit 0xfe55 0xcd24 0xff000000 0x60000000  # 8 LSBs of oscillator frequency in units of 10kHz
-trbcmd loadbit 0xfe55 0xcd25 0xff000000 0x6d000000  # 8 MSBs of oscillator frequency in units of 10kHz
 
+# #enable Hitcounters TDCv4
+# trbcmd setbit   0xfe53 0xcd00 0x200
+# trbcmd clearbit 0xfe53 0xcd00 0x100
 
-#enable Hitcounters TDCv4
-trbcmd setbit   0xfe53 0xcd00 0x200
-trbcmd clearbit 0xfe53 0xcd00 0x100
+# trbcmd setbit   0xfe55 0xcd00 0x200
+# trbcmd clearbit 0xfe55 0xcd00 0x100
 
-trbcmd setbit   0xfe55 0xcd00 0x200
-trbcmd clearbit 0xfe55 0xcd00 0x100
 
 
-# Stretcher
-trbcmd loadbit 0xfe53 0xcd17 0xffff 0xffff  # enable Stretcher for Channels 15..0
-trbcmd loadbit 0xfe53 0xcd27 0xffff 0xffff  # enable Stretcher for Channels 31..16
-trbcmd setbit  0xfe53 0xcd00 0x40000000     # enable Stretcher for Reference Channel
+# # Stretcher
+# trbcmd loadbit 0xfe53 0xcd17 0xffff 0xffff  # enable Stretcher for Channels 15..0
+# trbcmd loadbit 0xfe53 0xcd27 0xffff 0xffff  # enable Stretcher for Channels 31..16
+# trbcmd setbit  0xfe53 0xcd00 0x40000000     # enable Stretcher for Reference Channel
 
-trbcmd loadbit 0xfe55 0xcd17 0xffff 0xffff  # enable Stretcher for Channels 15..0
-trbcmd loadbit 0xfe55 0xcd27 0xffff 0xffff  # enable Stretcher for Channels 31..16
-trbcmd setbit  0xfe55 0xcd00 0x40000000     # enable Stretcher for Reference Channel
+# trbcmd loadbit 0xfe55 0xcd17 0xffff 0xffff  # enable Stretcher for Channels 15..0
+# trbcmd loadbit 0xfe55 0xcd27 0xffff 0xffff  # enable Stretcher for Channels 31..16
+# trbcmd setbit  0xfe55 0xcd00 0x40000000     # enable Stretcher for Reference Channel
 
-# Enable
-#./tdcv4_enable_channels.sh 0xfe53 0x11 0x0 #enable channel 5 and 0
-./tdcv4_enable_channels.sh 0xfe53 0xf 0xf #enable channel 5 and 0
+# # Enable
+# #./tdcv4_enable_channels.sh 0xfe53 0x11 0x0 #enable channel 5 and 0
+# ./tdcv4_enable_channels.sh 0xfe53 0xf 0xf #enable channel 5 and 0
 
-./tdcv4_enable_channels.sh 0xfe55 0xf 0xf #enable channel 5 and 0 
+# ./tdcv4_enable_channels.sh 0xfe55 0xf 0xf #enable channel 5 and 0 
+# end of tdcv4 block
 
 echo "pulser enable"
 trbcmd setbit 0xc001 0xa101 0x1
diff --git a/web/htdocs/apacheEnv.pm b/web/htdocs/apacheEnv.pm
index c2f5987..1047d68 100644
--- a/web/htdocs/apacheEnv.pm
+++ b/web/htdocs/apacheEnv.pm
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 #This file sets the environment in case that the daqtools are run within an Apache web-server.
 
-$ENV{'DAQOPSERVER'} = 'jspc55:88';
+$ENV{'DAQOPSERVER'} = 'hades46:84';
 
 
-1;
\ No newline at end of file
+1;