Skip to content

Commit d1b6781

Browse files
rmunzerrmunzer
authored
TPC - Update calibration and krypton workflows (#1400)
* Remove information spec and modify writeout disable parameter in tpc_krypton workflow * Fix for grp in tpc_krypton * Adopt Krypton raw workflow * Change ccdb link and last TimeBin * Fix bug in workflow * Change creation of workflow with scripts * Change workflow creation - using script - for tpc-krypton-raw * Change workflow creation using topo scripts
1 parent 16c4587 commit d1b6781

File tree

6 files changed

+181
-93
lines changed

6 files changed

+181
-93
lines changed

‎DATA/production/calib/tpc-laser-filter.sh‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,18 @@ FILEWORKDIR="/home/wiechula/processData/inputFilesTracking/triggeredLaser"
1010

1111
FILEWORKDIR2="/home/epn/odc/files/"
1212

13+
#ARGS_ALL_CONFIG+="NameConf.mDirGRP=$FILEWORKDIR;NameConf.mDirGeom=$FILEWORKDIR2;NameConf.mDirCollContext=$FILEWORKDIR;NameConf.mDirMatLUT=$FILEWORKDIR;keyval.input_dir=$FILEWORKDIR;keyval.output_dir=/dev/null"
14+
ARGS_ALL_CONFIG+="NameConf.mDirGRP=$FILEWORKDIR;NameConf.mDirGeom=$FILEWORKDIR2;NameConf.mDirCollContext=$FILEWORKDIR;NameConf.mDirMatLUT=$FILEWORKDIR"
1315

14-
if [ $NUMAGPUIDS != 0 ]; then
16+
if [ ${NUMAGPUIDS} != 0 ]; then
1517
ARGS_ALL+=" --child-driver 'numactl --membind $NUMAID --cpunodebind $NUMAID'"
1618
fi
1719

18-
if [ $GPUTYPE == "HIP" ]; then
19-
if [ $NUMAID == 0 ] || [ $NUMAGPUIDS == 0 ]; then
20+
if [ ${GPUTYPE} == "HIP" ]; then
21+
if [ ${NUMAID} == 0 ] || [ ${NUMAGPUIDS} == 0 ]; then
2022
export TIMESLICEOFFSET=0
2123
else
22-
export TIMESLICEOFFSET=$NGPUS
24+
export TIMESLICEOFFSET=${NGPUS}
2325
fi
2426
GPU_CONFIG_KEY+="GPU_proc.deviceNum=0;"
2527
GPU_CONFIG+=" --environment ROCR_VISIBLE_DEVICES={timeslice${TIMESLICEOFFSET}}"
@@ -28,13 +30,13 @@ else
2830
GPU_CONFIG_KEY+="GPU_proc.deviceNum=-2;"
2931
fi
3032

31-
if [ $GPUTYPE != "CPU" ]; then
33+
if [ ${GPUTYPE} != "CPU" ]; then
3234
GPU_CONFIG_KEY+="GPU_proc.forceMemoryPoolSize=$GPUMEMSIZE;"
33-
if [ $HOSTMEMSIZE == "0" ]; then
35+
if [ ${HOSTMEMSIZE} == "0" ]; then
3436
HOSTMEMSIZE=$(( 1 << 30 ))
3537
fi
3638
fi
37-
if [ $HOSTMEMSIZE != "0" ]; then
39+
if [ ${HOSTMEMSIZE} != "0" ]; then
3840
GPU_CONFIG_KEY+="GPU_proc.forceHostMemoryPoolSize=$HOSTMEMSIZE;"
3941
fi
4042

@@ -53,30 +55,29 @@ if [[ ! -z ${TPC_LASER_ILBZS:-} ]]; then
5355
LASER_DECODER_ADD="--pedestal-url /home/wiechula/processData/inputFilesTracking/triggeredLaser/pedestals.openchannels.root -decode-type 0"
5456
fi
5557

56-
o2-dpl-raw-proxy $ARGS_ALL \
58+
o2-dpl-raw-proxy ${ARGS_ALL} \
5759
--dataspec "$PROXY_INSPEC" --inject-missing-data \
5860
--readout-proxy "--channel-config 'name=readout-proxy,type=pull,method=connect,address=ipc://@tf-builder-pipe-0,transport=shmem,rateLogging=1'" \
59-
| o2-tpc-raw-to-digits-workflow $ARGS_ALL ${LASER_DECODER_ADD} \
61+
| o2-tpc-raw-to-digits-workflow ${ARGS_ALL} ${LASER_DECODER_ADD} \
6062
--input-spec "$CALIB_INSPEC" \
6163
--configKeyValues "TPCDigitDump.NoiseThreshold=3;TPCDigitDump.LastTimeBin=600;$ARGS_ALL_CONFIG" \
62-
--pedestal-url /home/wiechula/processData/inputFilesTracking/triggeredLaser/pedestals.openchannels.root \
6364
--pipeline tpc-raw-to-digits-0:20 \
6465
--remove-duplicates \
6566
--send-ce-digits \
66-
| o2-tpc-reco-workflow $ARGS_ALL ${TPC_CORR_SCALING:-} \
67+
| o2-tpc-reco-workflow ${ARGS_ALL} ${TPC_CORR_SCALING:-} \
6768
--input-type digitizer \
6869
--output-type "tracks,disable-writer,clusters" \
6970
--disable-mc \
7071
--pipeline tpc-zsEncoder:20,tpc-tracker:8 \
71-
$GPU_CONFIG \
72+
${GPU_CONFIG} \
7273
--condition-remap "file:///home/wiechula/processData/inputFilesTracking/triggeredLaser/=GLO/Config/GRPECS;file:///home/wiechula/processData/inputFilesTracking/triggeredLaser/=GLO/Config/GRPMagField;file:///home/wiechula/processData/inputFilesTracking/triggeredLaser=TPC/Calib/LaserTracks" \
7374
--configKeyValues "${ARGS_ALL_CONFIG};align-geom.mDetectors=none;GPU_global.deviceType=$GPUTYPE;GPU_proc.tpcIncreasedMinClustersPerRow=500000;GPU_proc.ignoreNonFatalGPUErrors=1;$GPU_CONFIG_KEY;GPU_global.tpcTriggeredMode=1;GPU_rec_tpc.clusterError2AdditionalY=0.1;GPU_rec_tpc.clusterError2AdditionalZ=0.15;GPU_rec_tpc.clustersShiftTimebinsClusterizer=35;GPU_proc.memoryScalingFactor=2" \
74-
| o2-tpc-laser-track-filter $ARGS_ALL \
75+
| o2-tpc-laser-track-filter ${ARGS_ALL} \
7576
| o2-dpl-output-proxy ${ARGS_ALL} \
7677
--dataspec "$PROXY_OUTSPEC" \
7778
--proxy-name tpc-laser-input-proxy \
7879
--proxy-channel-name tpc-laser-input-proxy \
7980
--channel-config "name=tpc-laser-input-proxy,method=connect,type=push,transport=zeromq,rateLogging=0" \
8081
| o2-qc ${ARGS_ALL} --config ${QC_CONFIG} --local --host ${HOST} \
81-
| o2-dpl-run $ARGS_ALL --dds ${WORKFLOWMODE_FILE} ${GLOBALDPLOPT}
82+
| o2-dpl-run ${ARGS_ALL} --dds ${WORKFLOWMODE_FILE} ${GLOBALDPLOPT}
8283

‎DATA/production/calib/tpc-pedestal.sh‎

Lines changed: 31 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ CCDB_PATH="http://o2-ccdb.internal"
1919

2020
HOST=localhost
2121

22-
QC_CONFIG="consul-json://alio2-cr1-hv-con01.cern.ch:8500/o2/components/qc/ANY/any/tpc-pedestal-calib-qcmn"
22+
#QC_CONFIG="consul-json://alio2-cr1-hv-con01.cern.ch:8500/o2/components/qc/ANY/any/tpc-pedestal-calib-qcmn"
23+
QC_CONFIG="/o2/components/qc/ANY/any/tpc-pedestal-calib-qcmn"
2324

2425
max_events=50
2526
publish_after=400
@@ -37,14 +38,32 @@ EXTRA_CONFIG=" --publish-after-tfs ${publish_after} --max-events ${max_events} -
3738

3839
#################################################################################################################################
3940

40-
o2-dpl-raw-proxy ${ARGS_ALL} --inject-missing-data \
41-
--dataspec "${PROXY_INSPEC}" \
42-
--readout-proxy '--channel-config "name=readout-proxy,type=pull,method=connect,address=ipc://@tf-builder-pipe-0,transport=shmem,rateLogging=1"' \
43-
| o2-tpc-calib-pad-raw ${ARGS_ALL} \
44-
--input-spec "${CALIB_INSPEC}" \
45-
--configKeyValues "${CALIB_CONFIG}" \
46-
${EXTRA_CONFIG} \
47-
| o2-calibration-ccdb-populator-workflow ${ARGS_ALL} \
48-
--ccdb-path ${CCDB_PATH} \
49-
| o2-qc ${ARGS_ALL} --config ${QC_CONFIG} --local --host ${HOST} \
50-
| o2-dpl-run ${ARGS_ALL} --dds ${WORKFLOWMODE_FILE} ${GLOBALDPLOPT}
41+
42+
WORKFLOW=
43+
add_W o2-dpl-raw-proxy "--dataspec \"$PROXY_INSPEC\" --inject-missing-data --channel-config \"name=readout-proxy,type=pull,method=connect,address=ipc://@tf-builder-pipe-0,transport=shmem,rateLogging=1\"" "" 0
44+
add_W o2-tpc-calib-pad-raw "--input-spec \"$CALIB_INSPEC\" --publish-after-tfs ${publish_after} --max-events ${max_events} --lanes 36"
45+
add_W o2-calibration-ccdb-populator-workflow "--ccdb-path \"http://o2-ccdb.internal\" " "" 0
46+
add_QC_from_consul "${QC_CONFIG}" "--local --host lcoalhost"
47+
48+
WORKFLOW+="o2-dpl-run ${ARGS_ALL} ${GLOBALDPLOPT}"
49+
50+
if [ $WORKFLOWMODE == "print" ]; then
51+
echo Workflow command:
52+
echo $WORKFLOW | sed "s/| */|\n/g"
53+
else
54+
# Execute the command we have assembled
55+
WORKFLOW+=" --$WORKFLOWMODE ${WORKFLOWMODE_FILE}"
56+
eval $WORKFLOW
57+
fi
58+
59+
#o2-dpl-raw-proxy ${ARGS_ALL} --inject-missing-data \
60+
# --dataspec "${PROXY_INSPEC}" \
61+
# --readout-proxy '--channel-config "name=readout-proxy,type=pull,method=connect,address=ipc://@tf-builder-pipe-0,transport=shmem,rateLogging=1"' \
62+
# | o2-tpc-calib-pad-raw ${ARGS_ALL} \
63+
# --input-spec "${CALIB_INSPEC}" \
64+
# --configKeyValues "${CALIB_CONFIG}" \
65+
# ${EXTRA_CONFIG} \
66+
# | o2-calibration-ccdb-populator-workflow ${ARGS_ALL} \
67+
# --ccdb-path ${CCDB_PATH} \
68+
# | o2-qc ${ARGS_ALL} --config ${QC_CONFIG} --local --host ${HOST} \
69+
# | o2-dpl-run ${ARGS_ALL} --dds ${WORKFLOWMODE_FILE} ${GLOBALDPLOPT}

‎DATA/production/calib/tpc-pulser-long.sh‎

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ CCDB_PATH="http://o2-ccdb.internal"
1818

1919
HOST=localhost
2020

21-
QC_CONFIG="consul-json://alio2-cr1-hv-con01.cern.ch:8500/o2/components/qc/ANY/any/tpc-raw-qcmn"
22-
21+
#QC_CONFIG="consul-json://alio2-cr1-hv-con01.cern.ch:8500/o2/components/qc/ANY/any/tpc-raw-qcmn"
22+
QC_CONFIG="/o2/components/qc/ANY/any/tpc-pulser-calib-qcmn"
2323
max_events=1000000
2424
publish_after=200
2525

@@ -35,15 +35,32 @@ EXTRA_CONFIG="--calib-type pulser --reset-after-publish --publish-after-tfs ${pu
3535

3636

3737
#################################################################################################################################
38+
WORKFLOW=
39+
add_W o2-dpl-raw-proxy "--dataspec \"$PROXY_INSPEC\" --inject-missing-data --channel-config \"name=readout-proxy,type=pull,method=connect,address=ipc://@tf-builder-pipe-0,transport=shmem,rateLogging=1\"" "" 0
40+
add_W o2-tpc-calib-pad-raw "--input-spec \"$CALIB_INSPEC\" --calib-type pulser --reset-after-publish --publish-after-tfs ${publish_after} --max-events ${max_events} --lanes 36 --check-calib-infos"
41+
add_W o2-calibration-ccdb-populator-workflow "--ccdb-path \"http://o2-ccdb.internal\" " "" 0
42+
add_QC_from_consul "${QC_CONFIG}" "--local --host lcoalhost"
43+
44+
WORKFLOW+="o2-dpl-run ${ARGS_ALL} ${GLOBALDPLOPT}"
45+
46+
if [ $WORKFLOWMODE == "print" ]; then
47+
echo Workflow command:
48+
echo $WORKFLOW | sed "s/| */|\n/g"
49+
else
50+
# Execute the command we have assembled
51+
WORKFLOW+=" --$WORKFLOWMODE ${WORKFLOWMODE_FILE}"
52+
eval $WORKFLOW
53+
fi
54+
3855

39-
o2-dpl-raw-proxy ${ARGS_ALL} --inject-missing-data \
40-
--dataspec ${PROXY_INSPEC} \
41-
--readout-proxy '--channel-config "name=readout-proxy,type=pull,method=connect,address=ipc://@tf-builder-pipe-0,transport=shmem,rateLogging=1"' \
42-
| o2-tpc-calib-pad-raw ${ARGS_ALL} \
43-
--input-spec ${CALIB_INSPEC} \
44-
--configKeyValues "${CALIB_CONFIG}" \
45-
${EXTRA_CONFIG} \
46-
| o2-calibration-ccdb-populator-workflow ${ARGS_ALL} \
47-
--ccdb-path ${CCDB_PATH} \
48-
| o2-qc ${ARGS_ALL} --config ${QC_CONFIG} --local --host ${HOST} \
49-
| o2-dpl-run ${ARGS_ALL} --dds ${WORKFLOWMODE_FILE}
56+
#o2-dpl-raw-proxy ${ARGS_ALL} --inject-missing-data \
57+
# --dataspec ${PROXY_INSPEC} \
58+
# --readout-proxy '--channel-config "name=readout-proxy,type=pull,method=connect,address=ipc://@tf-builder-pipe-0,transport=shmem,rateLogging=1"' \
59+
# | o2-tpc-calib-pad-raw ${ARGS_ALL} \
60+
# --input-spec ${CALIB_INSPEC} \
61+
# --configKeyValues "${CALIB_CONFIG}" \
62+
# ${EXTRA_CONFIG} \
63+
# | o2-calibration-ccdb-populator-workflow ${ARGS_ALL} \
64+
# --ccdb-path ${CCDB_PATH} \
65+
# | o2-qc ${ARGS_ALL} --config ${QC_CONFIG} --local --host ${HOST} \
66+
# | o2-dpl-run ${ARGS_ALL} --dds ${WORKFLOWMODE_FILE}

‎DATA/production/calib/tpc-pulser.sh‎

Lines changed: 31 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ CCDB_PATH="http://o2-ccdb.internal"
2020

2121
HOST=localhost
2222

23-
QC_CONFIG="consul-json://alio2-cr1-hv-con01.cern.ch:8500/o2/components/qc/ANY/any/tpc-pulser-calib-qcmn"
23+
#QC_CONFIG="consul-json://alio2-cr1-hv-con01.cern.ch:8500/o2/components/qc/ANY/any/tpc-pulser-calib-qcmn"
24+
QC_CONFIG="/o2/components/qc/ANY/any/tpc-pulser-calib-qcmn"
2425

2526
max_events=200
2627
publish_after=230
@@ -38,14 +39,32 @@ EXTRA_CONFIG="--calib-type pulser --publish-after-tfs ${publish_after} --max-eve
3839

3940
#################################################################################################################################
4041

41-
o2-dpl-raw-proxy ${ARGS_ALL} --inject-missing-data \
42-
--dataspec "${PROXY_INSPEC}" \
43-
--readout-proxy '--channel-config "name=readout-proxy,type=pull,method=connect,address=ipc://@tf-builder-pipe-0,transport=shmem,rateLogging=1"' \
44-
| o2-tpc-calib-pad-raw ${ARGS_ALL} \
45-
--input-spec "${CALIB_INSPEC}" \
46-
--configKeyValues "${CALIB_CONFIG}" \
47-
${EXTRA_CONFIG} \
48-
| o2-calibration-ccdb-populator-workflow ${ARGS_ALL} \
49-
--ccdb-path ${CCDB_PATH} \
50-
| o2-qc ${ARGS_ALL} --config ${QC_CONFIG} --local --host ${HOST} \
51-
| o2-dpl-run ${ARGS_ALL} --dds ${WORKFLOWMODE_FILE} ${GLOBALDPLOPT}
42+
43+
WORKFLOW=
44+
add_W o2-dpl-raw-proxy "--dataspec \"$PROXY_INSPEC\" --inject-missing-data --channel-config \"name=readout-proxy,type=pull,method=connect,address=ipc://@tf-builder-pipe-0,transport=shmem,rateLogging=1\"" "" 0
45+
add_W o2-tpc-calib-pad-raw "--input-spec \"$CALIB_INSPEC\" --calib-type pulser --publish-after-tfs ${publish_after} --max-events ${max_events} --lanes 36 --check-calib-infos" "${CALIB_CONFIG}"
46+
add_W o2-calibration-ccdb-populator-workflow "--ccdb-path \"http://o2-ccdb.internal\" " "" 0
47+
add_QC_from_consul "${QC_CONFIG}" "--local --host lcoalhost"
48+
49+
WORKFLOW+="o2-dpl-run ${ARGS_ALL} ${GLOBALDPLOPT}"
50+
51+
if [ $WORKFLOWMODE == "print" ]; then
52+
echo Workflow command:
53+
echo $WORKFLOW | sed "s/| */|\n/g"
54+
else
55+
# Execute the command we have assembled
56+
WORKFLOW+=" --$WORKFLOWMODE ${WORKFLOWMODE_FILE}"
57+
eval $WORKFLOW
58+
fi
59+
60+
#o2-dpl-raw-proxy ${ARGS_ALL} --inject-missing-data \
61+
# --dataspec "${PROXY_INSPEC}" \
62+
# --readout-proxy '--channel-config "name=readout-proxy,type=pull,method=connect,address=ipc://@tf-builder-pipe-0,transport=shmem,rateLogging=1"' \
63+
# | o2-tpc-calib-pad-raw ${ARGS_ALL} \
64+
# --input-spec "${CALIB_INSPEC}" \
65+
# --configKeyValues "${CALIB_CONFIG}" \
66+
# ${EXTRA_CONFIG} \
67+
# | o2-calibration-ccdb-populator-workflow ${ARGS_ALL} \
68+
# --ccdb-path ${CCDB_PATH} \
69+
# | o2-qc ${ARGS_ALL} --config ${QC_CONFIG} --local --host ${HOST} \
70+
# | o2-dpl-run ${ARGS_ALL} --dds ${WORKFLOWMODE_FILE} ${GLOBALDPLOPT}

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

Lines changed: 32 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,34 +7,43 @@ source common/gen_topo_helper_functions.sh
77
export SHMSIZE=$(( 128 << 30 )) # GB for the global SHMEM # for kr cluster finder
88

99

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

1313
NLANES=36
1414
SESSION="default"
1515
ARGS_FILES="keyval.output_dir=/dev/null"
1616
HOST=localhost
17-
QC_CONFIG="consul-json://alio2-cr1-hv-con01.cern.ch:8500/o2/components/qc/ANY/any/tpc-raw-qcmn"
17+
18+
#QC_CONFIG="consul-json://alio2-cr1-hv-con01.cern.ch:8500/o2/components/qc/ANY/any/tpc-krypton-raw-qcmn"
19+
QC_CONFIG="/o2/components/qc/ANY/any/tpc-krypton-raw-qcmn"
20+
21+
22+
23+
WRITER_TYPE="--writer-type EPN --meta-output-dir $EPN2EOS_METAFILES_DIR --output-dir $CALIB_DIR --max-tf-per-file 8000"
24+
25+
if [[ ! -z ${TPC_KRYPTON_NO_WRITEOUT:-} ]]; then
26+
WRITER_TYPE="--writer-type none"
27+
fi
28+
29+
1830

1931
# TODO use add_W function from gen_topo_helper_functions.sh to assemble workflow
2032
# as done for example in https://github.com/AliceO2Group/O2DPG/blob/master/DATA/production/calib/its-threshold-processing.sh
21-
o2-dpl-raw-proxy $ARGS_ALL \
22-
--dataspec "$PROXY_INSPEC" --inject-missing-data \
23-
--readout-proxy '--channel-config "name=readout-proxy,type=pull,method=connect,address=ipc://@tf-builder-pipe-0,transport=shmem,rateLogging=1"' \
24-
| o2-tpc-raw-to-digits-workflow $ARGS_ALL \
25-
--input-spec "$CALIB_INSPEC" \
26-
--configKeyValues "$ARGS_FILES" \
27-
--remove-duplicates \
28-
--pipeline tpc-raw-to-digits-0:24 \
29-
--pedestal-url "http://ccdb-test.cern.ch:8080" \
30-
| o2-tpc-krypton-raw-filter $ARGS_ALL \
31-
--configKeyValues "$ARGS_FILES" \
32-
--lanes $NLANES \
33-
--writer-type EPN \
34-
--meta-output-dir /data/epn2eos_tool/epn2eos/ \
35-
--output-dir /data/tf/raw \
36-
--threshold-max 20 \
37-
--max-tf-per-file 8000 \
38-
--time-bins-before 20 \
39-
| o2-qc $ARGS_ALL --config $QC_CONFIG --local --host $HOST \
40-
| o2-dpl-run $ARGS_ALL --dds ${WORKFLOWMODE_FILE} ${GLOBALDPLOPT}
33+
34+
WORKFLOW=
35+
add_W o2-dpl-raw-proxy "--dataspec \"$PROXY_INSPEC\" --inject-missing-data --channel-config \"name=readout-proxy,type=pull,method=connect,address=ipc://@tf-builder-pipe-0,transport=shmem,rateLogging=1\"" "" 0
36+
add_W o2-tpc-raw-to-digits-workflow "--ignore-grp --input-spec \"$CALIB_INSPEC\" --remove-duplicates --pedestal-url \"http://o2-ccdb.internal\" --pipeline tpc-raw-to-digits-0:24 " "\"${ARGS_FILES}\";TPCDigitDump.LastTimeBin=446"
37+
add_W o2-tpc-krypton-raw-filter "${WRITER_TYPE} --lanes $NLANES --threshold-max 20 --time-bins-before 20" "\"${ARGS_FILES}\""
38+
add_QC_from_consul "${QC_CONFIG}" "--local --host lcoalhost"
39+
WORKFLOW+="o2-dpl-run ${ARGS_ALL} ${GLOBALDPLOPT}"
40+
41+
if [ $WORKFLOWMODE == "print" ]; then
42+
echo Workflow command:
43+
echo $WORKFLOW | sed "s/| */|\n/g"
44+
else
45+
# Execute the command we have assembled
46+
WORKFLOW+=" --$WORKFLOWMODE ${WORKFLOWMODE_FILE}"
47+
eval $WORKFLOW
48+
fi
49+

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

Lines changed: 42 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,37 +13,60 @@ if [ $NUMAGPUIDS != 0 ]; then
1313
ARGS_ALL+=" --child-driver 'numactl --membind $NUMAID --cpunodebind $NUMAID'"
1414
fi
1515

16-
PROXY_INSPEC="A:TPC/RAWDATA;dd:FLP/DISTSUBTIMEFRAME/0;eos:***/INFORMATION"
17-
CALIB_INSPEC="A:TPC/RAWDATA;dd:FLP/DISTSUBTIMEFRAME/0;eos:***/INFORMATION"
16+
PROXY_INSPEC="A:TPC/RAWDATA;dd:FLP/DISTSUBTIMEFRAME/0"
17+
CALIB_INSPEC="A:TPC/RAWDATA;dd:FLP/DISTSUBTIMEFRAME/0"
1818

1919

2020
NLANES=1
2121
SESSION="default"
2222

2323
ARGS_FILES="keyval.output_dir=/dev/null"
2424

25-
QC_CONFIG="consul-json://alio2-cr1-hv-con01.cern.ch:8500/o2/components/qc/ANY/any/tpc-krypton-qcmn"
25+
#QC_CONFIG="consul-json://alio2-cr1-hv-con01.cern.ch:8500/o2/components/qc/ANY/any/tpc-krypton-qcmn"
26+
QC_CONFIG="/o2/components/qc/ANY/any/tpc-krypton-qcmn"
2627

2728
WRITER_TYPE="--writer-type EPN --meta-output-dir $EPN2EOS_METAFILES_DIR --output-dir $CALIB_DIR"
2829

29-
if [[ ${TPC_KRYPTON_NO_WRITEOUT:-} == 1 ]]; then
30+
31+
if [[ ! -z ${TPC_KRYPTON_NO_WRITEOUT:-} ]]; then
3032
WRITER_TYPE="--writer-type none"
3133
fi
3234

3335
# TODO use add_W function from gen_topo_helper_functions.sh to assemble workflow
3436
# as done for example in https://github.com/AliceO2Group/O2DPG/blob/master/DATA/production/calib/its-threshold-processing.sh
35-
o2-dpl-raw-proxy $ARGS_ALL \
36-
--dataspec "$PROXY_INSPEC" --inject-missing-data \
37-
--readout-proxy "--channel-config 'name=readout-proxy,type=pull,method=connect,address=ipc://@tf-builder-pipe-0,transport=shmem,rateLogging=1'" \
38-
| o2-tpc-raw-to-digits-workflow $ARGS_ALL \
39-
--input-spec "$CALIB_INSPEC" \
40-
--configKeyValues "$ARGS_FILES" \
41-
--remove-duplicates \
42-
--pipeline tpc-raw-to-digits-0:20 \
43-
| o2-tpc-krypton-clusterer $ARGS_ALL \
44-
${WRITER_TYPE} \
45-
--lanes $NLANES \
46-
--configKeyValues "$ARGS_FILES" \
47-
--configFile="/home/wiechula/processData/inputFilesTracking/krypton/krBoxCluster.largeBox.cuts.krMap.ini" \
48-
| o2-qc $ARGS_ALL --config $QC_CONFIG --local --host localhost \
49-
| o2-dpl-run $ARGS_ALL --dds ${WORKFLOWMODE_FILE} ${GLOBALDPLOPT}
37+
38+
39+
# Add binarry to workflow command USAGE: add_W [BINARY] [COMMAND_LINE_OPTIONS] [CONFIG_KEY_VALUES] [Add ARGS_ALL_CONFIG, optional, default = 1]
40+
41+
WORKFLOW=
42+
add_W o2-dpl-raw-proxy "--dataspec \"$PROXY_INSPEC\" --inject-missing-data --channel-config \"name=readout-proxy,type=pull,method=connect,address=ipc://@tf-builder-pipe-0,transport=shmem,rateLogging=1\"" "" 0
43+
add_W o2-tpc-raw-to-digits-workflow "--ignore-grp --input-spec \"$CALIB_INSPEC\" --remove-duplicates --pipeline tpc-raw-to-digits-0:20 " "\"${ARGS_FILES}\";TPCDigitDump.LastTimeBin=14256"
44+
add_W o2-tpc-krypton-clusterer "${WRITER_TYPE} --lanes $NLANES --configFile=\"/home/wiechula/processData/inputFilesTracking/krypton/krBoxCluster.largeBox.cuts.krMap.ini\"" "\"${ARGS_FILES}\""
45+
add_QC_from_consul "${QC_CONFIG}" "--local --host lcoalhost"
46+
WORKFLOW+="o2-dpl-run ${ARGS_ALL} ${GLOBALDPLOPT}"
47+
48+
if [ $WORKFLOWMODE == "print" ]; then
49+
echo Workflow command:
50+
echo $WORKFLOW | sed "s/| */|\n/g"
51+
else
52+
# Execute the command we have assembled
53+
WORKFLOW+=" --$WORKFLOWMODE ${WORKFLOWMODE_FILE}"
54+
eval $WORKFLOW
55+
fi
56+
57+
##o2-dpl-raw-proxy $ARGS_ALL \
58+
# --dataspec "$PROXY_INSPEC" --inject-missing-data \
59+
# --readout-proxy "--channel-config 'name=readout-proxy,type=pull,method=connect,address=ipc://@tf-builder-pipe-0,transport=shmem,rateLogging=1'" \
60+
# | o2-tpc-raw-to-digits-workflow $ARGS_ALL \
61+
# --ignore-grp \
62+
# --input-spec "$CALIB_INSPEC" \
63+
# --configKeyValues "$ARGS_FILES;TPCDigitDump.LastTimeBin=14256" \
64+
# --remove-duplicates \
65+
# --pipeline tpc-raw-to-digits-0:20 \
66+
# | o2-tpc-krypton-clusterer $ARGS_ALL \
67+
# ${WRITER_TYPE} \
68+
# --lanes $NLANES \
69+
# --configKeyValues "$ARGS_FILES" \
70+
## --configFile="/home/wiechula/processData/inputFilesTracking/krypton/krBoxCluster.largeBox.cuts.krMap.ini" \
71+
# | o2-qc $ARGS_ALL --config $QC_CONFIG --local --host localhost \
72+
# | o2-dpl-run $ARGS_ALL --dds ${WORKFLOWMODE_FILE} ${GLOBALDPLOPT}

0 commit comments

Comments
 (0)