diff --git a/SeaquentialOperator.sh b/SeaquentialOperator.sh index 7d143183bd7725a65b49b99651af10dce1494b45..21e77aefb645b3d69c265ccede584910593e221c 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 fcdf3410a3c845295f1def264ac056d2ae5d41fa..e3aafb03aa816487c7bd1f025eb9faadaa1c04ac 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 df3ca5681997360d28de128298b9ba91ea027774..d440a0e34f49f09885dd0a77c6ec7937befe6efc 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 a5b7adb0fae83d8680bc0b04532ff0b5a3919d2f..bb363454d6211090dfa1d31a9483a4c0d0854bb2 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`