moved DIRC stuff from threshold to gsi_dirc/threshold

diff --git a/users/gsi_dirc/lv_dirich/dirich_lv_off.sh b/users/gsi_dirc/lv_dirich/dirich_lv_off.sh
index c07713299b803348d84b7e881bf78649b2a870a8..51a3a0cc899283f2736b6dab3e83a8a62362f99a 100755 (executable)
--- a/users/gsi_dirc/lv_dirich/dirich_lv_off.sh
+++ b/users/gsi_dirc/lv_dirich/dirich_lv_off.sh
@@ -1,4 +1,4 @@
-python3.8 <<EOF
+python3 <<EOF
 import pyvisa
 import time
 resources = pyvisa.ResourceManager('@py')

diff --git a/users/gsi_dirc/lv_dirich/dirich_lv_on.sh b/users/gsi_dirc/lv_dirich/dirich_lv_on.sh
index 8366228612074b6cbe8c668fe8d5659877205ded..300c2034f34a250e6993f637573777ec32dd8027 100755 (executable)
--- a/users/gsi_dirc/lv_dirich/dirich_lv_on.sh
+++ b/users/gsi_dirc/lv_dirich/dirich_lv_on.sh
@@ -1,4 +1,4 @@
-python3.8 <<EOF
+python3 <<EOF
 import pyvisa
 import time
 resources = pyvisa.ResourceManager('@py')

diff --git a/users/gsi_dirc/readme_after_upgrade_2021.txt b/users/gsi_dirc/readme_after_upgrade_2021.txt
index 281134eab211e9d62a31ddaaf1a72af3f33bdad0..105f0cce04b9e069315923c3f356c14c0c6e526e 100644 (file)
--- a/users/gsi_dirc/readme_after_upgrade_2021.txt
+++ b/users/gsi_dirc/readme_after_upgrade_2021.txt
@@ -5,10 +5,7 @@ Which system I am using:
 
 lsb_release -a
 
-
-
-For python scripts acessing VISA the python3.7 nedded to be changed to 3.8
-
+For python scripts 
 VISA needed to be installed new as root:
 
 pip -install -U pyvisa

diff --git a/users/gsi_dirc/startup.sh b/users/gsi_dirc/startup.sh
index fa1c79830166737e45a106fb3732ee194df6ac38..6abab03a43676458013244ff841601923e5b59bd 100755 (executable)
--- a/users/gsi_dirc/startup.sh
+++ b/users/gsi_dirc/startup.sh
@@ -69,8 +69,8 @@ trbcmd w 0xfe51 0xc801 0x80c600c6 ##  triggerwindow +/-990ns ;5ns granularity
 #trbcmd w 0xfe4c 0xc801 0x8000001e ##  triggerwindow +/-150ns ;5ns granularity
 
 # Default TDC-channel enable for all channels
-trbcmd w 0xfe4c 0xc802 0xffffffff ## channel 01-32 enable
-trbcmd w 0xfe4c 0xc803 0x0000ffff ## channel 33-64 enable
+#trbcmd w 0xfe4c 0xc802 0xffffffff ## channel 01-32 enable
+#trbcmd w 0xfe4c 0xc803 0x0000ffff ## channel 33-64 enable
 trbcmd w 0xfe4c 0xc804 0x0000007c ## data transfer limit
 #
 trbcmd w 0xfe51 0xc802 0xffffffff ## channel 01-32 enable
@@ -157,7 +157,7 @@ trbcmd i 0xffff | wc -l
 #20170822 prepare_padiwas_invert_leds.pl --endpoints=0x2000..0x2003 --chains=0..2 --invert=0xffff 
 
 
-#prepare_padiwas_invert_leds.pl --endpoints=0x2000..0x200f --chains=0..2 --invert=0xffff 
+prepare_padiwas_invert_leds.pl --endpoints=0x2000..0x200f --chains=0..2 --invert=0xffff 
 
 #Invert erlangen
 #prepare_padiwas_invert_leds.pl --endpoints=0x2014..0x201d --chains=0..1 --invert=0xffff 
@@ -204,6 +204,12 @@ trbcmd w 0xfffe 0xc5 0x800050ff
 # trbcmd setbit 0xfe4c 0xcf00 0x1 
 #trbcmd setbit 0x8000 0xa1d4 0x10000 ## ???
 
+echo "write barrel dirc thresholds"
+
+cd ~/trbsoft/daqtools/thresholds/
+echo "padiwa thresholds..."
+./write_thresholds.pl ~/trbsoft/daqtools/users/gsi_dirc/thresh/padiwa_threshold_results_blockwise_20200715_163000.thr -o 200 > /dev/null
+echo "done"
 
 cd ~/trbsoft/daqtools/thresholds/trb_dirich_threshold
 
@@ -220,7 +226,6 @@ cd ~/trbsoft/daqtools/thresholds/trb_dirich_threshold
 #20150521
 #./write_thresholds.pl padiwa_threshold_results_20150516_high_nostretch_CS.log -o 200 > /dev/null 
 #./write_thresholds.pl padiwa_threshold_results_20150521_high_nostretch_CS.log -o 200 > /dev/null 
-echo "write barrel dirc thresholds"
 
 #./write_thresholds.pl padiwa_threshold_results_sequential_2015_06_25_offset_40_a.log -o 160
 #./write_thresholds.pl padiwa_threshold_results_sequential_2015_06_27_offset_40_a.log -o 160
@@ -293,7 +298,12 @@ echo "padiwa_threshold_results loading"
 #./write_thresholds.pl mcp10.log -o 600
 #./write_thresholds.pl mcp11.log -o 600
 
-./HADESthreshscan_v1 -f 20190403_141628_std_save.thr -l 0 -t 0 2300
+
+
+#./HADESthreshscan_v1 -f 20191030_111147_std_save.thr -l 0 -i -t 0 60
+./HADESthreshscan_v1 --no-autosave -f ~/trbsoft/daqtools/users/gsi_dirc/thresholds/dirich/20201120_165730_std_save.thr -l 0 -i -t 0 40
+
+
 # 10/26 quick fix to set special threshold for 0x2006/0 = +1mV
 #grep '0x2006' padiwa_threshold_results_latest.log | grep 'chain: 00' >! padiwa_thresholds_current_0x2006-0.txt
 #./write_thresholds.pl padiwa_thresholds_current_0x2006-0.txt -o 1000

diff --git a/users/gsi_dirc/thresh/201505101347.thr b/users/gsi_dirc/thresholds/201505101347.thr
similarity index 100%
rename from users/gsi_dirc/thresh/201505101347.thr
rename to users/gsi_dirc/thresholds/201505101347.thr

diff --git a/users/gsi_dirc/thresh/201505101403.thr b/users/gsi_dirc/thresholds/201505101403.thr
similarity index 100%
rename from users/gsi_dirc/thresh/201505101403.thr
rename to users/gsi_dirc/thresholds/201505101403.thr

diff --git a/users/gsi_dirc/thresh/201505101408.thr b/users/gsi_dirc/thresholds/201505101408.thr
similarity index 100%
rename from users/gsi_dirc/thresh/201505101408.thr
rename to users/gsi_dirc/thresholds/201505101408.thr

diff --git a/users/gsi_dirc/thresh/201505101426.thr b/users/gsi_dirc/thresholds/201505101426.thr
similarity index 100%
rename from users/gsi_dirc/thresh/201505101426.thr
rename to users/gsi_dirc/thresholds/201505101426.thr

diff --git a/users/gsi_dirc/thresh/201505101447.thr b/users/gsi_dirc/thresholds/201505101447.thr
similarity index 100%
rename from users/gsi_dirc/thresh/201505101447.thr
rename to users/gsi_dirc/thresholds/201505101447.thr

diff --git a/users/gsi_dirc/thresh/201505121536.thr b/users/gsi_dirc/thresholds/201505121536.thr
similarity index 100%
rename from users/gsi_dirc/thresh/201505121536.thr
rename to users/gsi_dirc/thresholds/201505121536.thr

diff --git a/users/gsi_dirc/thresh/201505142120.thr b/users/gsi_dirc/thresholds/201505142120.thr
similarity index 100%
rename from users/gsi_dirc/thresh/201505142120.thr
rename to users/gsi_dirc/thresholds/201505142120.thr

diff --git a/users/gsi_dirc/thresholds/dirich/.gitignore b/users/gsi_dirc/thresholds/dirich/.gitignore
new file mode 100644 (file)
index 0000000..d9eb8ea
--- /dev/null
+++ b/users/gsi_dirc/thresholds/dirich/.gitignore
@@ -0,0 +1,5 @@
+
+*.root
+*.thr
+*~
+

diff --git a/thresholds/padiwa_status_2018_2.txt b/users/gsi_dirc/thresholds/padiwa/padiwa_status_2018_2.txt
similarity index 100%
rename from thresholds/padiwa_status_2018_2.txt
rename to users/gsi_dirc/thresholds/padiwa/padiwa_status_2018_2.txt

diff --git a/thresholds/padiwa_status_april_update_drc.txt b/users/gsi_dirc/thresholds/padiwa/padiwa_status_april_update_drc.txt
similarity index 100%
rename from thresholds/padiwa_status_april_update_drc.txt
rename to users/gsi_dirc/thresholds/padiwa/padiwa_status_april_update_drc.txt

diff --git a/thresholds/padiwa_status_barreldirc.txt b/users/gsi_dirc/thresholds/padiwa/padiwa_status_barreldirc.txt
similarity index 100%
rename from thresholds/padiwa_status_barreldirc.txt
rename to users/gsi_dirc/thresholds/padiwa/padiwa_status_barreldirc.txt

diff --git a/thresholds/padiwa_status_bdirc_nov16.txt b/users/gsi_dirc/thresholds/padiwa/padiwa_status_bdirc_nov16.txt
similarity index 100%
rename from thresholds/padiwa_status_bdirc_nov16.txt
rename to users/gsi_dirc/thresholds/padiwa/padiwa_status_bdirc_nov16.txt

diff --git a/thresholds/padiwa_status_bdirc_sep16.txt b/users/gsi_dirc/thresholds/padiwa/padiwa_status_bdirc_sep16.txt
similarity index 100%
rename from thresholds/padiwa_status_bdirc_sep16.txt
rename to users/gsi_dirc/thresholds/padiwa/padiwa_status_bdirc_sep16.txt

diff --git a/thresholds/padiwa_status_change_to_10pf.txt b/users/gsi_dirc/thresholds/padiwa/padiwa_status_change_to_10pf.txt
similarity index 100%
rename from thresholds/padiwa_status_change_to_10pf.txt
rename to users/gsi_dirc/thresholds/padiwa/padiwa_status_change_to_10pf.txt

diff --git a/thresholds/padiwa_status_februar.txt b/users/gsi_dirc/thresholds/padiwa/padiwa_status_februar.txt
similarity index 100%
rename from thresholds/padiwa_status_februar.txt
rename to users/gsi_dirc/thresholds/padiwa/padiwa_status_februar.txt

diff --git a/thresholds/padiwa_status_june_barreldirc.txt b/users/gsi_dirc/thresholds/padiwa/padiwa_status_june_barreldirc.txt
similarity index 100%
rename from thresholds/padiwa_status_june_barreldirc.txt
rename to users/gsi_dirc/thresholds/padiwa/padiwa_status_june_barreldirc.txt

diff --git a/thresholds/padiwa_status_march2016.txt b/users/gsi_dirc/thresholds/padiwa/padiwa_status_march2016.txt
similarity index 100%
rename from thresholds/padiwa_status_march2016.txt
rename to users/gsi_dirc/thresholds/padiwa/padiwa_status_march2016.txt

diff --git a/thresholds/setup_status_april.txt b/users/gsi_dirc/thresholds/padiwa/setup_status_april.txt
similarity index 100%
rename from thresholds/setup_status_april.txt
rename to users/gsi_dirc/thresholds/padiwa/setup_status_april.txt

diff --git a/thresholds/setup_status_may_cern.txt b/users/gsi_dirc/thresholds/padiwa/setup_status_may_cern.txt
similarity index 100%
rename from thresholds/setup_status_may_cern.txt
rename to users/gsi_dirc/thresholds/padiwa/setup_status_may_cern.txt

diff --git a/thresholds/thresholds_blockwise.sh b/users/gsi_dirc/thresholds/padiwa/thresholds_blockwise.sh
similarity index 100%
rename from thresholds/thresholds_blockwise.sh
rename to users/gsi_dirc/thresholds/padiwa/thresholds_blockwise.sh

diff --git a/thresholds/thresholds_blockwise_longterm.sh b/users/gsi_dirc/thresholds/padiwa/thresholds_blockwise_longterm.sh
similarity index 100%
rename from thresholds/thresholds_blockwise_longterm.sh
rename to users/gsi_dirc/thresholds/padiwa/thresholds_blockwise_longterm.sh

diff --git a/thresholds/thresholds_blockwise_sub0.sh b/users/gsi_dirc/thresholds/padiwa/thresholds_blockwise_sub0.sh
similarity index 100%
rename from thresholds/thresholds_blockwise_sub0.sh
rename to users/gsi_dirc/thresholds/padiwa/thresholds_blockwise_sub0.sh

diff --git a/thresholds/thresholds_blockwise_sub1.sh b/users/gsi_dirc/thresholds/padiwa/thresholds_blockwise_sub1.sh
similarity index 100%
rename from thresholds/thresholds_blockwise_sub1.sh
rename to users/gsi_dirc/thresholds/padiwa/thresholds_blockwise_sub1.sh

diff --git a/thresholds/thresholds_blockwise_sub2.sh b/users/gsi_dirc/thresholds/padiwa/thresholds_blockwise_sub2.sh
similarity index 100%
rename from thresholds/thresholds_blockwise_sub2.sh
rename to users/gsi_dirc/thresholds/padiwa/thresholds_blockwise_sub2.sh

diff --git a/thresholds/thresholds_blockwise_sub3.sh b/users/gsi_dirc/thresholds/padiwa/thresholds_blockwise_sub3.sh
similarity index 100%
rename from thresholds/thresholds_blockwise_sub3.sh
rename to users/gsi_dirc/thresholds/padiwa/thresholds_blockwise_sub3.sh

diff --git a/users/gsi_dirc/thresh/temp.thr b/users/gsi_dirc/thresholds/temp.thr
similarity index 100%
rename from users/gsi_dirc/thresh/temp.thr
rename to users/gsi_dirc/thresholds/temp.thr

diff --git a/users/gsi_dirc/thresh/thresh_heatmap.png b/users/gsi_dirc/thresholds/thresh_heatmap.png
similarity index 100%
rename from users/gsi_dirc/thresh/thresh_heatmap.png
rename to users/gsi_dirc/thresholds/thresh_heatmap.png

diff --git a/users/gsi_dirc/thresh/thresh_hist.png b/users/gsi_dirc/thresholds/thresh_hist.png
similarity index 100%
rename from users/gsi_dirc/thresh/thresh_hist.png
rename to users/gsi_dirc/thresholds/thresh_hist.png