Farich settings added, mt

diff --git a/users/gsi_ee_trb84/startup.sh b/users/gsi_ee_trb84/startup.sh
index d1fe78d18182197f94ffd0d33f859aafde779b66..0d65414d65f41ea0c99ad00def30f439bc21df21 100755 (executable)
--- a/users/gsi_ee_trb84/startup.sh
+++ b/users/gsi_ee_trb84/startup.sh
@@ -64,6 +64,8 @@ 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
 #trbcmd w 0xc840 0xa150 0x00001387 #20khz
@@ -122,38 +124,54 @@ trbcmd setbit 0xc001 0xa15c 0x10
 #trbcmd setbit 0xc001 0xa101 0x8 # enable external trigger in of CTS
 
 echo "pulser frequency"
-trbcmd w 0xc001 0xa154 0x3e7 # Pulser 1: 100kHz
-trbcmd w 0xc001 0xa155 0x3e7 # Pulser 2: 100kHz
+#trbcmd w 0xc001 0xa154 0x3e7 # Pulser 1: 100kHz
+#trbcmd w 0xc001 0xa155 0x3e7 # Pulser 2: 100kHz
 
 
-./tdcv4_caltrg_init.sh
+./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
 
 
 # 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
+
+
 #enable Hitcounters TDCv4
 trbcmd setbit   0xfe53 0xcd00 0x200
 trbcmd clearbit 0xfe53 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
 
+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 
+./tdcv4_enable_channels.sh 0xfe53 0xf 0xf #enable channel 5 and 0
+
+./tdcv4_enable_channels.sh 0xfe55 0xf 0xf #enable channel 5 and 0 
 
 echo "pulser enable"
-#trbcmd setbit 0xc001 0xa101 0x2
+trbcmd setbit 0xc001 0xa101 0x1
 # pulser enable