From fca59f5793c85cfaa3faba34bacd00b241b6683a Mon Sep 17 00:00:00 2001
From: Shohei Yamagaya <yamagaya@champ.hep.sci.osaka-u.ac.jp>
Date: Fri, 20 Dec 2019 12:14:47 +0900
Subject: [PATCH] update : for fei4b scans
---
SeaquentialOperator.sh | 2 +-
SingleOperator.sh | 4 ++--
libYarr/call_scanConsole.sh | 4 ++--
script/setup.sh | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/SeaquentialOperator.sh b/SeaquentialOperator.sh
index 7d14318..21e77ae 100755
--- a/SeaquentialOperator.sh
+++ b/SeaquentialOperator.sh
@@ -55,7 +55,7 @@ if [ -z $module_id ];then
fi
cd $TMP_DIR
-./libYarr/createDefaultConfig.sh -a rd53a -m $module_id -c 1 -R
+./libYarr/createDefaultConfig.sh -a fei4b -m $module_id -c 1 -R
if $DCS_Control ;then
echo "DCS system is turned on!"
diff --git a/SingleOperator.sh b/SingleOperator.sh
index fcdf341..e3aafb0 100755
--- a/SingleOperator.sh
+++ b/SingleOperator.sh
@@ -40,7 +40,7 @@ DataBase=false
chip_num=1
SCAN_SET=false
-asic_type=rd53a
+asic_type=fei4b
#############################################
option_target=""
@@ -132,5 +132,5 @@ fi
cd $TMP_DIR
if ${data_taking};then
- ./libYarr/call_dbAccessor.sh -c $TMP_DIR/configs/module_configs/rd53a/$module_id/connectivity.json -s $YARR_DIR/data/last_scan/scanLog.json -C ./configs/influxDB/connectivity.json
+ ./libYarr/call_dbAccessor.sh -c $TMP_DIR/configs/module_configs/fei4b/$module_id/connectivity.json -s $YARR_DIR/data/last_scan/scanLog.json -C ./configs/influxDB/connectivity.json
fi
diff --git a/libYarr/call_scanConsole.sh b/libYarr/call_scanConsole.sh
index df3ca56..d440a0e 100755
--- a/libYarr/call_scanConsole.sh
+++ b/libYarr/call_scanConsole.sh
@@ -19,7 +19,7 @@ cd $YARR_DIR
################################
# default parameters
-asic_type=rd53a
+asic_type=fei4b
target_tot=7
target_preamp=10000
target_charge=1500
@@ -89,7 +89,7 @@ if [ -z ${scan_type} ]; then
fi
#if [ ! `echo ${scan_type} | grep "rd53a"` ]; then
if [ ! -e "${scan_type}" ]; then
- scan_type=configs/scans/rd53a/${scan_type}.json
+ scan_type=configs/scans/fei4/${scan_type}.json
fi
if [ ! -f ${scan_type} ]; then
echo "Not exist scan \"${scan_type}\"."
diff --git a/script/setup.sh b/script/setup.sh
index a5b7adb..bb36345 100755
--- a/script/setup.sh
+++ b/script/setup.sh
@@ -29,7 +29,7 @@ if $need_login ; then
export system
export RunCounter_path=$HOME/.yarr/runCounter
- export SCAN_DIR=$YARR_DIR/configs/scans/rd53a/
+ export SCAN_DIR=$YARR_DIR/configs/scans/fei4/
# export DCS_setup_file=$TMP_DIR/configs/DCS_setup/DCS_setup.json
export DCS_setup_file=`get_json $system_configuration_file .DCS_setup`
--
GitLab