Skip to content

Commit 34057be

Browse files
martenolemartenole
committed
Update detector workflows
1 parent 2c337e3 commit 34057be

5 files changed

Lines changed: 24 additions & 18 deletions

File tree

‎DATA/testing/detectors/FT0/ft0-digits-qc-ctf.sh‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
#!/usr/bin/env bash
22

3+
# Make common arguments and helper functions such as add_W available
34
source common/setenv.sh
5+
source common/getCommonArgs.sh
6+
source common/gen_topo_helper_functions.sh
47

5-
SEVERITY=WARNING
6-
ARGS_ALL="--session default --severity $SEVERITY --shm-segment-id $NUMAID --shm-segment-size $SHMSIZE"
7-
ARGS_ALL+=" --infologger-severity $SEVERITY"
88
if [ -z $CTF_DIR ]; then CTF_DIR=$FILEWORKDIR; fi # Directory where to store dictionary files
9-
#ARGS_ALL+=" --monitoring-backend influxdb-unix:///tmp/telegraf.sock"
10-
ARGS_ALL_CONFIG="NameConf.mDirGRP=$FILEWORKDIR;NameConf.mDirGeom=$FILEWORKDIR;NameConf.mDirCollContext=$FILEWORKDIR;NameConf.mDirMatLUT=$FILEWORKDIR;keyval.input_dir=$FILEWORKDIR;keyval.output_dir=/dev/null"
9+
1110
CTF_DICT="--ctf-dict $FILEWORKDIR/ctf_dictionary.root"
1211
NTHREADS=2
1312
# Output directory for the CTF, to write to the current dir., remove `--output-dir $CTFOUT` from o2-ctf-writer-workflow or set to `CTFOUT=\"""\"`
@@ -18,6 +17,8 @@ MYDIR="$(dirname $(readlink -f $0))"
1817
PROXY_INSPEC="x:FT0/RAWDATA;eos:***/INFORMATION;dd:FLP/DISTSUBTIMEFRAME/0"
1918
IN_CHANNEL="--channel-config 'name=readout-proxy,type=pull,method=connect,address=ipc://@$INRAWCHANNAME,transport=shmem,rateLogging=1'"
2019

20+
# TODO use add_W function from gen_topo_helper_functions.sh to assemble workflow
21+
# as done for example in https://github.com/AliceO2Group/O2DPG/blob/master/DATA/production/calib/its-threshold-processing.sh
2122
o2-dpl-raw-proxy ${ARGS_ALL} --readout-proxy "${IN_CHANNEL}" --dataspec "${PROXY_INSPEC}" \
2223
| o2-ft0-flp-dpl-workflow --disable-root-output ${ARGS_ALL} --configKeyValues "$ARGS_ALL_CONFIG;" --pipeline ft0-datareader-dpl:$NTHREADS \
2324
| o2-ft0-entropy-encoder-workflow ${ARGS_ALL} --configKeyValues "$ARGS_ALL_CONFIG;" ${CTF_DICT} \

‎DATA/testing/detectors/FV0/fv0-digits-qc-ctf.sh‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#!/usr/bin/env bash
22

3+
# Make common arguments and helper functions such as add_W available
34
source common/setenv.sh
5+
source common/getCommonArgs.sh
6+
source common/gen_topo_helper_functions.sh
7+
48

5-
SEVERITY=WARNING
6-
ARGS_ALL="--session default --severity $SEVERITY --shm-segment-id $NUMAID --shm-segment-size $SHMSIZE"
7-
ARGS_ALL+=" --infologger-severity $SEVERITY"
89
if [ -z $CTF_DIR ]; then CTF_DIR=$FILEWORKDIR; fi # Directory where to store dictionary files
910
#ARGS_ALL+=" --monitoring-backend influxdb-unix:///tmp/telegraf.sock"
10-
ARGS_ALL_CONFIG="NameConf.mDirGRP=$FILEWORKDIR;NameConf.mDirGeom=$FILEWORKDIR;NameConf.mDirCollContext=$FILEWORKDIR;NameConf.mDirMatLUT=$FILEWORKDIR;keyval.input_dir=$FILEWORKDIR;keyval.output_dir=/dev/null"
1111
CTF_DICT="--ctf-dict $FILEWORKDIR/ctf_dictionary.root"
1212
NTHREADS=2
1313
# Output directory for the CTF, to write to the current dir., remove `--output-dir $CTFOUT` from o2-ctf-writer-workflow or set to `CTFOUT=\"""\"`
@@ -18,6 +18,8 @@ MYDIR="$(dirname $(readlink -f $0))"
1818
PROXY_INSPEC="x:FV0/RAWDATA;eos:***/INFORMATION;dd:FLP/DISTSUBTIMEFRAME/0"
1919
IN_CHANNEL="--channel-config 'name=readout-proxy,type=pull,method=connect,address=ipc://@$INRAWCHANNAME,transport=shmem,rateLogging=1'"
2020

21+
# TODO use add_W function from gen_topo_helper_functions.sh to assemble workflow
22+
# as done for example in https://github.com/AliceO2Group/O2DPG/blob/master/DATA/production/calib/its-threshold-processing.sh
2123
o2-dpl-raw-proxy ${ARGS_ALL} --readout-proxy "${IN_CHANNEL}" --dataspec "${PROXY_INSPEC}" --inject-missing-data \
2224
| o2-fv0-flp-dpl-workflow --disable-root-output ${ARGS_ALL} --configKeyValues "$ARGS_ALL_CONFIG;" --pipeline fv0-datareader-dpl:$NTHREADS \
2325
| o2-fv0-entropy-encoder-workflow ${ARGS_ALL} --configKeyValues "$ARGS_ALL_CONFIG;" ${CTF_DICT} \

‎DATA/testing/detectors/TPC/tpc-krypton-raw.sh‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/usr/bin/env bash
22

33
source common/setenv.sh
4-
54
source common/getCommonArgs.sh
5+
source common/gen_topo_helper_functions.sh
66

77
export SHMSIZE=$(( 128 << 30 )) # GB for the global SHMEM # for kr cluster finder
88

@@ -12,11 +12,12 @@ CALIB_INSPEC="A:TPC/RAWDATA;dd:FLP/DISTSUBTIMEFRAME/0;eos:***/INFORMATION"
1212

1313
NLANES=36
1414
SESSION="default"
15-
ARGS_FILES="NameConf.mDirGRP=/home/epn/odc/files/;NameConf.mDirGeom=/home/epn/odc/files/;keyval.output_dir=/dev/null"
15+
ARGS_FILES="keyval.output_dir=/dev/null"
1616
HOST=localhost
1717
QC_CONFIG="consul-json://alio2-cr1-hv-con01.cern.ch:8500/o2/components/qc/ANY/any/tpc-raw-qcmn"
1818

19-
19+
# TODO use add_W function from gen_topo_helper_functions.sh to assemble workflow
20+
# as done for example in https://github.com/AliceO2Group/O2DPG/blob/master/DATA/production/calib/its-threshold-processing.sh
2021
o2-dpl-raw-proxy $ARGS_ALL \
2122
--dataspec "$PROXY_INSPEC" --inject-missing-data \
2223
--readout-proxy '--channel-config "name=readout-proxy,type=pull,method=connect,address=ipc://@tf-builder-pipe-0,transport=shmem,rateLogging=1"' \

‎DATA/testing/detectors/TPC/tpc-krypton.sh‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ source common/setenv.sh
44

55
source common/getCommonArgs.sh
66

7-
source common/gen_topo_helper_functions.sh
7+
source common/gen_topo_helper_functions.sh
88

99

1010
export GLOBAL_SHMSIZE=$(( 128 << 30 )) # GB for the global SHMEM # for kr cluster finder
@@ -20,7 +20,7 @@ CALIB_INSPEC="A:TPC/RAWDATA;dd:FLP/DISTSUBTIMEFRAME/0;eos:***/INFORMATION"
2020
NLANES=1
2121
SESSION="default"
2222

23-
ARGS_FILES="NameConf.mDirGRP=/home/epn/odc/files/;NameConf.mDirGeom=/home/epn/odc/files/;keyval.output_dir=/dev/null"
23+
ARGS_FILES="keyval.output_dir=/dev/null"
2424

2525
QC_CONFIG="consul-json://alio2-cr1-hv-con01.cern.ch:8500/o2/components/qc/ANY/any/tpc-krypton-qcmn"
2626

@@ -30,7 +30,8 @@ if [[ ${TPC_KRYPTON_NO_WRITEOUT:-} == 1 ]]; then
3030
WRITER_TYPE="--writer-type none"
3131
fi
3232

33-
33+
# TODO use add_W function from gen_topo_helper_functions.sh to assemble workflow
34+
# as done for example in https://github.com/AliceO2Group/O2DPG/blob/master/DATA/production/calib/its-threshold-processing.sh
3435
o2-dpl-raw-proxy $ARGS_ALL \
3536
--dataspec "$PROXY_INSPEC" --inject-missing-data \
3637
--readout-proxy "--channel-config 'name=readout-proxy,type=pull,method=connect,address=ipc://@tf-builder-pipe-0,transport=shmem,rateLogging=1'" \

‎DATA/testing/detectors/TPC/tpc-laser-raw-filter.sh‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ source common/setenv.sh
44

55
source common/getCommonArgs.sh
66

7-
source common/gen_topo_helper_functions.sh
7+
source common/gen_topo_helper_functions.sh
88

99
export SHMSIZE=$(( 128 << 30 )) # GB for the global SHMEM # for kr cluster finder
1010

@@ -18,13 +18,14 @@ CALIB_INSPEC="A:TPC/RAWDATA;dd:FLP/DISTSUBTIMEFRAME/0;eos:***/INFORMATION"
1818
NLANES=36
1919
SESSION="default"
2020
PIPEADD="0"
21-
ARGS_FILES="NameConf.mDirGRP=/home/epn/odc/files/;NameConf.mDirGeom=/home/epn/odc/files/;keyval.output_dir=/dev/null"
21+
ARGS_FILES="keyval.output_dir=/dev/null"
2222

2323
HOST=localhost
2424

2525
QC_CONFIG="consul-json://alio2-cr1-hv-con01.cern.ch:8500/o2/components/qc/ANY/any/tpc-raw-qcmn"
2626

27-
27+
# TODO use add_W function from gen_topo_helper_functions.sh to assemble workflow
28+
# as done for example in https://github.com/AliceO2Group/O2DPG/blob/master/DATA/production/calib/its-threshold-processing.sh
2829
o2-dpl-raw-proxy $ARGS_ALL \
2930
--dataspec "$PROXY_INSPEC" --inject-missing-data \
3031
--readout-proxy '--channel-config "name=readout-proxy,type=pull,method=connect,address=ipc://@tf-builder-pipe-0,transport=shmem,rateLogging=1"' \

0 commit comments

Comments
 (0)