Skip to content

Commit 2e9f722

Browse files
rmunzerrmunzer
authored
TPC - Workflow cleanup (#1588)
* Change tpc_pulser to apricot * Fix path of qc for krypton_raw * Change workflow creation for pattern-generator * cleanup tpc_krypton file * Change tpc-laser to use generation scripts * fix tpc-laser.sh * Modified tpc-laser-multi to use common routines for building workflow * Fix output proxy and add TPC_CORR_SCALIG option
1 parent 6843faf commit 2e9f722

File tree

9 files changed

+162
-152
lines changed

9 files changed

+162
-152
lines changed

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

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ HOST=localhost
1414

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

17+
QC_CONFIG_CONSUL="/o2/components/qc/ANY/any/tpc-raw-qcmn"
1718
max_events=300
1819
publish_after=440
1920
min_tracks=0
@@ -44,16 +45,33 @@ fi
4445

4546

4647

47-
o2-dpl-raw-proxy $ARGS_ALL \
48-
--proxy-name tpc-laser-input-proxy \
49-
--dataspec "${PROXY_INSPEC}" \
50-
--network-interface ib0 \
51-
--channel-config "name=tpc-laser-input-proxy,method=bind,type=pull,rateLogging=0,transport=zeromq" \
52-
| o2-tpc-calib-laser-tracks ${ARGS_ALL} --use-filtered-tracks ${EXTRA_CONFIG_TRACKS} --min-tfs=${min_tracks} \
53-
--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" \
54-
| o2-tpc-calib-pad-raw ${ARGS_ALL} \
55-
--configKeyValues ${CALIB_CONFIG} ${EXTRA_CONFIG} \
56-
| o2-calibration-ccdb-populator-workflow ${ARGS_ALL} \
57-
--ccdb-path ${CCDB_PATH} \
58-
| o2-dpl-run $ARGS_ALL --dds ${WORKFLOWMODE_FILE}
48+
WORKFLOW=
49+
add_W o2-dpl-raw-proxy " --proxy-name tpc-laser-input-proxy --dataspec \"$PROXY_INSPEC\" --network-interface ib0 --channel-config \"name=tpc-laser-input-proxy,method=bind,type=pull,rateLogging=0,transport=zeromq\"" "" 0
50+
add_W o2-tpc-calib-laser-tracks "--use-filtered-tracks ${EXTRA_CONFIG_TRACKS} --min-tfs=${min_tracks}"
51+
add_W o2-tpc-calib-pad-raw " ${EXTRA_CONFIG}" "${CALIB_CONFIG}"
52+
add_W o2-calibration-ccdb-populator-workflow "--ccdb-path ${CCDB_PATH}" "" 0
53+
#add_QC_from_consul "${QC_CONFIG_CONSUL}" "--local --host lcoalhost"
54+
55+
WORKFLOW+="o2-dpl-run ${ARGS_ALL} ${GLOBALDPLOPT}"
56+
if [ $WORKFLOWMODE == "print" ]; then
57+
echo Workflow command:
58+
echo $WORKFLOW | sed "s/| */|\n/g"
59+
else
60+
# Execute the command we have assembled
61+
WORKFLOW+=" --$WORKFLOWMODE ${WORKFLOWMODE_FILE}"
62+
eval $WORKFLOW
63+
fi
64+
65+
#o2-dpl-raw-proxy $ARGS_ALL \
66+
# --proxy-name tpc-laser-input-proxy \
67+
# --dataspec "${PROXY_INSPEC}" \
68+
# --network-interface ib0 \
69+
# --channel-config "name=tpc-laser-input-proxy,method=bind,type=pull,rateLogging=0,transport=zeromq" \
70+
# | o2-tpc-calib-laser-tracks ${ARGS_ALL} --use-filtered-tracks ${EXTRA_CONFIG_TRACKS} --min-tfs=${min_tracks} \
71+
# --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" \
72+
# | o2-tpc-calib-pad-raw ${ARGS_ALL} \
73+
# --configKeyValues ${CALIB_CONFIG} ${EXTRA_CONFIG} \
74+
# | o2-calibration-ccdb-populator-workflow ${ARGS_ALL} \
75+
# --ccdb-path ${CCDB_PATH} \
76+
# | o2-dpl-run $ARGS_ALL --dds ${WORKFLOWMODE_FILE}
5977

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

Lines changed: 64 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ FILEWORKDIR="/home/wiechula/processData/inputFilesTracking/triggeredLaser"
1111
FILEWORKDIR2="/home/epn/odc/files/"
1212

1313
#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"
14+
#ARGS_ALL_CONFIG+="NameConf.mDirGRP=$FILEWORKDIR;NameConf.mDirGeom=$FILEWORKDIR2;NameConf.mDirCollContext=$FILEWORKDIR;NameConf.mDirMatLUT=$FILEWORKDIR"
1515

1616
if [ ${NUMAGPUIDS} != 0 ]; then
1717
ARGS_ALL+=" --child-driver 'numactl --membind $NUMAID --cpunodebind $NUMAID'"
@@ -44,41 +44,72 @@ PROXY_INSPEC="A:TPC/RAWDATA;dd:FLP/DISTSUBTIMEFRAME/0"
4444
CALIB_INSPEC="A:TPC/RAWDATA;dd:FLP/DISTSUBTIMEFRAME/0"
4545
PROXY_OUTSPEC="A:TPC/LASERTRACKS;B:TPC/CEDIGITS;D:TPC/CLUSREFS"
4646

47-
48-
LASER_DECODER_ADD=''
49-
5047
HOST=localhost
5148

5249
QC_CONFIG="consul-json://alio2-cr1-hv-con01.cern.ch:8500/o2/components/qc/ANY/any/tpc-laser-calib-qcmn"
53-
54-
if [[ ! -z ${TPC_LASER_ILBZS:-} ]]; then
55-
LASER_DECODER_ADD="--pedestal-url /home/wiechula/processData/inputFilesTracking/triggeredLaser/pedestals.openchannels.root -decode-type 0"
50+
QC_CONFIG_CONSUL=/o2/components/qc/ANY/any/tpc-laser-calib-qcmn
51+
52+
53+
RAWDIGIT_CONFIG="TPCDigitDump.NoiseThreshold=3;TPCDigitDump.LastTimeBin=600;NameConf.mDirGRP=$FILEWORKDIR;NameConf.mDirGeom=$FILEWORKDIR2;NameConf.mDirCollContext=$FILEWORKDIR;NameConf.mDirMatLUT=$FILEWORKDIR"
54+
REMAP="--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\" "
55+
RECO_CONFIG="NameConf.mDirGRP=$FILEWORKDIR;"
56+
RECO_CONFIG+="NameConf.mDirGeom=$FILEWORKDIR2;"
57+
RECO_CONFIG+="NameConf.mDirCollContext=$FILEWORKDIR;"
58+
RECO_CONFIG+="NameConf.mDirMatLUT=$FILEWORKDIR;"
59+
RECO_CONFIG+="align-geom.mDetectors=none;"
60+
RECO_CONFIG+="GPU_global.deviceType=$GPUTYPE;"
61+
RECO_CONFIG+="GPU_proc.tpcIncreasedMinClustersPerRow=500000;"
62+
RECO_CONFIG+="GPU_proc.ignoreNonFatalGPUErrors=1;$GPU_CONFIG_KEY;"
63+
RECO_CONFIG+="GPU_global.tpcTriggeredMode=1;"
64+
RECO_CONFIG+="GPU_rec_tpc.clusterError2AdditionalY=0.1;"
65+
RECO_CONFIG+="GPU_rec_tpc.clusterError2AdditionalZ=0.15;"
66+
RECO_CONFIG+="GPU_rec_tpc.clustersShiftTimebinsClusterizer=35;"
67+
RECO_CONFIG+="GPU_proc.memoryScalingFactor=2;"
68+
RECO_CONFIG+="GPU_proc_param.tpcTriggerHandling=0"
69+
70+
71+
WORKFLOW=
72+
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
73+
add_W o2-tpc-raw-to-digits-workflow "--ignore-grp --input-spec \"$CALIB_INSPEC\" --remove-duplicates --pipeline tpc-raw-to-digits-0:20 --send-ce-digits " "${RAWDIGIT_CONFIG}"
74+
add_W o2-tpc-reco-workflow " ${TPC_CORR_SCALING:-} --disable-ctp-lumi-request --input-type digitizer --output-type \"tracks,disable-writer,clusters\" --disable-mc --pipeline tpc-zsEncoder:20,tpc-tracker:8 ${GPU_CONFIG} ${REMAP} " "${RECO_CONFIG}"
75+
add_W o2-tpc-laser-track-filter "" "" 0
76+
add_W o2-dpl-output-proxy " --proxy-name tpc-laser-input-proxy --proxy-channel-name tpc-laser-input-proxy --dataspec \"$PROXY_OUTSPEC\" --channel-config \"name=tpc-laser-input-proxy,method=connect,type=push,transport=zeromq,rateLogging=0\" " "" 0
77+
add_QC_from_consul "${QC_CONFIG_CONSUL}" "--local --host lcoalhost"
78+
79+
WORKFLOW+="o2-dpl-run ${ARGS_ALL} ${GLOBALDPLOPT}"
80+
if [ $WORKFLOWMODE == "print" ]; then
81+
echo Workflow command:
82+
echo $WORKFLOW | sed "s/| */|\n/g"
83+
else
84+
# Execute the command we have assembled
85+
WORKFLOW+=" --$WORKFLOWMODE ${WORKFLOWMODE_FILE}"
86+
eval $WORKFLOW
5687
fi
5788

58-
o2-dpl-raw-proxy ${ARGS_ALL} \
59-
--dataspec "$PROXY_INSPEC" --inject-missing-data \
60-
--readout-proxy "--channel-config 'name=readout-proxy,type=pull,method=connect,address=ipc://@tf-builder-pipe-0,transport=shmem,rateLogging=1'" \
61-
| o2-tpc-raw-to-digits-workflow ${ARGS_ALL} ${LASER_DECODER_ADD} \
62-
--input-spec "$CALIB_INSPEC" \
63-
--configKeyValues "TPCDigitDump.NoiseThreshold=3;TPCDigitDump.LastTimeBin=600;$ARGS_ALL_CONFIG" \
64-
--pipeline tpc-raw-to-digits-0:20 \
65-
--remove-duplicates \
66-
--send-ce-digits \
67-
| o2-tpc-reco-workflow ${ARGS_ALL} ${TPC_CORR_SCALING:-} \
68-
--input-type digitizer \
69-
--output-type "tracks,disable-writer,clusters" \
70-
--disable-ctp-lumi-request \
71-
--disable-mc \
72-
--pipeline tpc-zsEncoder:20,tpc-tracker:8 \
73-
${GPU_CONFIG} \
74-
--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" \
75-
--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;GPU_proc_param.tpcTriggerHandling=0" \
76-
| o2-tpc-laser-track-filter ${ARGS_ALL} \
77-
| o2-dpl-output-proxy ${ARGS_ALL} \
78-
--dataspec "$PROXY_OUTSPEC" \
79-
--proxy-name tpc-laser-input-proxy \
80-
--proxy-channel-name tpc-laser-input-proxy \
81-
--channel-config "name=tpc-laser-input-proxy,method=connect,type=push,transport=zeromq,rateLogging=0" \
82-
| o2-qc ${ARGS_ALL} --config ${QC_CONFIG} --local --host ${HOST} \
83-
| o2-dpl-run ${ARGS_ALL} --dds ${WORKFLOWMODE_FILE} ${GLOBALDPLOPT}
89+
#o2-dpl-raw-proxy ${ARGS_ALL} \
90+
# --dataspec "$PROXY_INSPEC" --inject-missing-data \
91+
# --readout-proxy "--channel-config 'name=readout-proxy,type=pull,method=connect,address=ipc://@tf-builder-pipe-0,transport=shmem,rateLogging=1'" \
92+
# | o2-tpc-raw-to-digits-workflow ${ARGS_ALL} ${LASER_DECODER_ADD} \
93+
# --input-spec "$CALIB_INSPEC" \
94+
# --configKeyValues "TPCDigitDump.NoiseThreshold=3;TPCDigitDump.LastTimeBin=600;$ARGS_ALL_CONFIG" \
95+
# --pipeline tpc-raw-to-digits-0:20 \
96+
# --remove-duplicates \
97+
# --send-ce-digits \
98+
# | o2-tpc-reco-workflow ${ARGS_ALL} ${TPC_CORR_SCALING:-} \
99+
# --input-type digitizer \
100+
# --output-type "tracks,disable-writer,clusters" \
101+
# --disable-ctp-lumi-request \
102+
# --disable-mc \
103+
# --pipeline tpc-zsEncoder:20,tpc-tracker:8 \
104+
# ${GPU_CONFIG} \
105+
# --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" \
106+
# --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;GPU_proc_param.tpcTriggerHandling=0" \
107+
# | o2-tpc-laser-track-filter ${ARGS_ALL} \
108+
# | o2-dpl-output-proxy ${ARGS_ALL} \
109+
# --dataspec "$PROXY_OUTSPEC" \
110+
# --proxy-name tpc-laser-input-proxy \
111+
# --proxy-channel-name tpc-laser-input-proxy \
112+
# --channel-config "name=tpc-laser-input-proxy,method=connect,type=push,transport=zeromq,rateLogging=0" \
113+
# | o2-qc ${ARGS_ALL} --config ${QC_CONFIG} --local --host ${HOST} \
114+
# | o2-dpl-run ${ARGS_ALL} --dds ${WORKFLOWMODE_FILE} ${GLOBALDPLOPT}
84115

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

Lines changed: 50 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ CCDB_PATH="http://o2-ccdb.internal"
4646

4747
HOST=localhost
4848

49+
4950
QC_CONFIG="consul-json://alio2-cr1-hv-con01.cern.ch:8500/o2/components/qc/ANY/any/tpc-raw-qcmn"
51+
QC_CONFIG_CONSUL="/o2/components/qc/ANY/any/tpc-raw-qcmn"
5052

5153
max_events=300
5254
publish_after=440
@@ -81,31 +83,54 @@ if [[ ${TPC_CALIB_TRACKS_PUBLISH_EOS:-} == 1 ]]; then
8183
EXTRA_CONFIG_TRACKS="--only-publish-on-eos"
8284
fi
8385

86+
RAWDIGIT_CONFIG="TPCDigitDump.NoiseThreshold=3;TPCDigitDump.LastTimeBin=600"
87+
REMAP="--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\" "
88+
RECO_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"
89+
90+
WORKFLOW=
91+
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
92+
add_W o2-tpc-raw-to-digits-workflow "--ignore-grp --input-spec \"$CALIB_INSPEC\" --remove-duplicates --pipeline tpc-raw-to-digits-0:20 --send-ce-digits " "${RAWDIGIT_CONFIG}"
93+
add_W o2-tpc-reco-workflow " --disable-ctp-lumi-request --input-type digitizer --output-type \"tracks,disable-writer\" --disable-mc --pipeline tpc-zsEncoder:20,tpc-tracker:8 ${GPU_CONFIG} ${REMAP}" "${RECO_CONFIG}"
94+
add_W o2-tpc-laser-track-filter "" "" 0
95+
add_W o2-tpc-calib-laser-tracks "--use-filtered-tracks ${EXTRA_CONFIG_TRACKS} --min-tfs=${min_tracks}"
96+
add_W o2-tpc-calib-pad-raw " ${EXTRA_CONFIG}" "${CALIB_CONFIG}"
97+
add_W o2-calibration-ccdb-populator-workflow "--ccdb-path ${CCDB_PATH}" "" 0
98+
add_QC_from_consul "${QC_CONFIG_CONSUL}" "--local --host lcoalhost"
99+
100+
WORKFLOW+="o2-dpl-run ${ARGS_ALL} ${GLOBALDPLOPT}"
101+
if [ $WORKFLOWMODE == "print" ]; then
102+
echo Workflow command:
103+
echo $WORKFLOW | sed "s/| */|\n/g"
104+
else
105+
# Execute the command we have assembled
106+
WORKFLOW+=" --$WORKFLOWMODE ${WORKFLOWMODE_FILE}"
107+
eval $WORKFLOW
108+
fi
84109

85-
o2-dpl-raw-proxy $ARGS_ALL --inject-missing-data \
86-
--dataspec "$PROXY_INSPEC" \
87-
--readout-proxy "--channel-config 'name=readout-proxy,type=pull,method=connect,address=ipc://@tf-builder-pipe-0,transport=shmem,rateLogging=1'" \
88-
| o2-tpc-raw-to-digits-workflow $ARGS_ALL ${LASER_DECODER_ADD}\
89-
--input-spec "$CALIB_INSPEC" \
90-
--configKeyValues "TPCDigitDump.NoiseThreshold=3;TPCDigitDump.LastTimeBin=600;$ARGS_ALL_CONFIG" \
91-
--pipeline tpc-raw-to-digits-0:20 \
92-
--remove-duplicates \
93-
--send-ce-digits \
94-
| o2-tpc-reco-workflow $ARGS_ALL \
95-
--input-type digitizer \
96-
--output-type "tracks,disable-writer" \
97-
--disable-mc \
98-
--pipeline tpc-zsEncoder:20,tpc-tracker:8 \
99-
$GPU_CONFIG \
100-
--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" \
101-
--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" \
102-
| o2-tpc-laser-track-filter $ARGS_ALL \
103-
| o2-tpc-calib-laser-tracks $ARGS_ALL --use-filtered-tracks ${EXTRA_CONFIG_TRACKS} --min-tfs=${min_tracks}\
104-
| o2-tpc-calib-pad-raw ${ARGS_ALL} \
105-
--configKeyValues ${CALIB_CONFIG} ${EXTRA_CONFIG} \
106-
| o2-calibration-ccdb-populator-workflow $ARGS_ALL \
107-
--ccdb-path ${CCDB_PATH} \
108-
| o2-qc ${ARGS_ALL} --config ${QC_CONFIG} --local --host ${HOST} \
109-
| o2-dpl-run ${ARGS_ALL} --dds ${WORKFLOWMODE_FILE} ${GLOBALDPLOPT}
110+
#o2-dpl-raw-proxy $ARGS_ALL --inject-missing-data \
111+
# --dataspec "$PROXY_INSPEC" \
112+
# --readout-proxy "--channel-config 'name=readout-proxy,type=pull,method=connect,address=ipc://@tf-builder-pipe-0,transport=shmem,rateLogging=1'" \
113+
# | o2-tpc-raw-to-digits-workflow $ARGS_ALL ${LASER_DECODER_ADD}\
114+
# --input-spec "$CALIB_INSPEC" \
115+
# --configKeyValues ";$ARGS_ALL_CONFIG" \
116+
# --pipeline tpc-raw-to-digits-0:20 \
117+
# --remove-duplicates \
118+
# --send-ce-digits \
119+
# | o2-tpc-reco-workflow $ARGS_ALL \
120+
# --input-type digitizer \
121+
# --output-type "tracks,disable-writer" \
122+
# --disable-mc \
123+
# --pipeline tpc-zsEncoder:20,tpc-tracker:8 \
124+
# $GPU_CONFIG \
125+
# --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" \
126+
# --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" \
127+
# | o2-tpc-laser-track-filter $ARGS_ALL \
128+
# | o2-tpc-calib-laser-tracks $ARGS_ALL --use-filtered-tracks ${EXTRA_CONFIG_TRACKS} --min-tfs=${min_tracks}\
129+
# | o2-tpc-calib-pad-raw ${ARGS_ALL} \
130+
# --configKeyValues ${CALIB_CONFIG} ${EXTRA_CONFIG} \
131+
# | o2-calibration-ccdb-populator-workflow $ARGS_ALL \
132+
# --ccdb-path ${CCDB_PATH} \
133+
# | o2-qc ${ARGS_ALL} --config ${QC_CONFIG} --local --host ${HOST} \
134+
# | o2-dpl-run ${ARGS_ALL} --dds ${WORKFLOWMODE_FILE} ${GLOBALDPLOPT}
110135

111136

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

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ fi
1313
PROXY_INSPEC="A:TPC/RAWDATA;dd:FLP/DISTSUBTIMEFRAME/0"
1414
CALIB_INSPEC="A:TPC/RAWDATA;dd:FLP/DISTSUBTIMEFRAME/0"
1515

16-
CALIB_CONFIG="TPCCalibPedestal.LastTimeBin=12000;keyval.output_dir=/dev/null"
17-
1816
CCDB_PATH="http://o2-ccdb.internal"
1917

2018
HOST=localhost
@@ -33,8 +31,6 @@ if [[ ! -z ${TPC_CALIB_PUBLISH_AFTER:-} ]]; then
3331
publish_after=${TPC_CALIB_PUBLISH_AFTER}
3432
fi
3533

36-
EXTRA_CONFIG=" --publish-after-tfs ${publish_after} --max-events ${max_events} --lanes 36"
37-
3834

3935
#################################################################################################################################
4036

@@ -56,14 +52,3 @@ else
5652
eval $WORKFLOW
5753
fi
5854

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.sh‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ 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-pulser-calib-qcmn"
2322
QC_CONFIG="/o2/components/qc/ANY/any/tpc-pulser-calib-qcmn"
2423

2524
max_events=200
@@ -33,8 +32,6 @@ if [[ ! -z ${TPC_CALIB_PUBLISH_AFTER:-} ]]; then
3332
publish_after=${TPC_CALIB_PUBLISH_AFTER}
3433
fi
3534

36-
EXTRA_CONFIG="--calib-type pulser --publish-after-tfs ${publish_after} --max-events ${max_events} --lanes 36 --check-calib-infos"
37-
3835

3936
#################################################################################################################################
4037

@@ -54,16 +51,4 @@ else
5451
# Execute the command we have assembled
5552
WORKFLOW+=" --$WORKFLOWMODE ${WORKFLOWMODE_FILE}"
5653
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}
54+
fi

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ if [[ ! -z ${TPC_KRYPTON_LANES:-} ]]; then
2121
NLANES=${TPC_KRYPTON_LANES}
2222
fi
2323

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

2727

2828

0 commit comments

Comments
 (0)