Skip to content

Commit 90c24e4

Browse files
chiarazampollichiarazampolli
committed
Possibility to set the inputs from the qc-wf
1 parent 3ad4520 commit 90c24e4

File tree

5 files changed

+109
-23
lines changed

5 files changed

+109
-23
lines changed

‎DATA/common/gen_topo_helper_functions.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ has_detector_matching()
4949
[[ $WORKFLOW_DETECTORS_MATCHING =~ (^|,)"ALL"(,|$) ]] || [[ $WORKFLOW_DETECTORS_MATCHING =~ (^|,)"$1"(,|$) ]]
5050
}
5151

52+
has_secvtx_source()
53+
{
54+
[[ $SVERTEXING_SOURCES =~ (^|,)"ALL"(,|$) ]] || [[ $SVERTEXING_SOURCES =~ (^|,)"$1"(,|$) ]]
55+
}
56+
5257
has_detector_qc()
5358
{
5459
has_detector $1 && [[ $WORKFLOW_DETECTORS_QC =~ (^|,)"$1"(,|$) ]]

‎DATA/production/configurations/asyncReco/setenv_extra.sh‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -712,7 +712,10 @@ fi
712712
if [[ $ALIEN_JDL_QCOFF != "1" ]]; then
713713
export WORKFLOW_PARAMETERS="QC,${WORKFLOW_PARAMETERS}"
714714
fi
715-
export QC_CONFIG_PARAM="--local-batch=QC.root --override-values \"qc.config.Activity.number=$RUNNUMBER;qc.config.Activity.passName=$PASS;qc.config.Activity.periodName=$PERIOD\""
715+
716+
export QC_CONFIG_OVERRIDE+=";qc.config.Activity.number=$RUNNUMBER;qc.config.Activity.passName=$PASS;qc.config.Activity.periodName=$PERIOD;"
717+
718+
export QC_CONFIG_PARAM+=" --local-batch=QC.root "
716719
export GEN_TOPO_WORKDIR="./"
717720
#export QC_JSON_FROM_OUTSIDE="QC-20211214.json"
718721

‎DATA/production/qc-async/itstpc.json‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"dataSource" : {
4040
"type" : "direct",
4141
"query_comment" : "checking every matched track",
42-
"query" : "trackITSTPC:GLO/TPCITS/0;trackITSTPCABREFS:GLO/TPCITSAB_REFS/0;trackITSTPCABCLID:GLO/TPCITSAB_CLID/0;trackTPC:TPC/TRACKS;trackTPCClRefs:TPC/CLUSREFS;trackITS:ITS/TRACKS/0;trackITSROF:ITS/ITSTrackROF/0;trackITSClIdx:ITS/TRACKCLSID/0;alpparITS:ITS/ALPIDEPARAM/0?lifetime=condition&ccdb-path=ITS/Config/AlpideParam"
42+
"query" : "trackITSTPC:GLO/TPCITS/0;trackITSTPCABREFS:GLO/TPCITSAB_REFS/0;trackITSTPCABCLID:GLO/TPCITSAB_CLID/0;trackTPC:TPC/TRACKS;trackTPCClRefs:TPC/CLUSREFS;trackITS:ITS/TRACKS/0;trackITSROF:ITS/ITSTrackROF/0;trackITSClIdx:ITS/TRACKCLSID/0;alpparITS:ITS/ALPIDEPARAM/0?lifetime=condition&ccdb-path=ITS/Config/AlpideParam;SVParam:GLO/SVPARAM/0?lifetime=condition&ccdb-path=GLO/Config/SVertexerParam;p2decay3body:GLO/PVTX_3BODYREFS/0;decay3body:GLO/DECAYS3BODY/0;decay3bodyIdx:GLO/DECAYS3BODY_IDX/0;p2cascs:GLO/PVTX_CASCREFS/0;cascs:GLO/CASCS/0;cascsIdx:GLO/CASCS_IDX/0;p2v0s:GLO/PVTX_V0REFS/0;v0s:GLO/V0S/0;v0sIdx:GLO/V0S_IDX/0;pvtx_tref:GLO/PVTX_TRMTCREFS/0;pvtx_trmtc:GLO/PVTX_TRMTC/0;pvtx:GLO/PVTX/0;SVParam:GLO/SVPARAM/0?lifetime=condition&ccdb-path=GLO/Config/SVertexerParam;clusTPCoccmap:TPC/TPCOCCUPANCYMAP/0;clusTPC:TPC/CLUSTERNATIVE;clusTPCshmap:TPC/CLSHAREDMAP/0;trigTPC:TPC/TRIGGERWORDS/0;trigITSTPCTRD:TRD/TRGREC_ITSTPC/0;trackITSTPCTRD:TRD/MATCH_ITSTPC/0;matchITSTPCTOF:TOF/MTC_ITSTPC/0;matchITSTPCTRDTOF:TOF/MTC_ITSTPCTRD/0;trigTPCTRD:TRD/TRGREC_TPC/0;trackTPCTRD:TRD/MATCH_TPC/0;matchTPCTOF:TOF/MTC_TPC/0;trackTPCTOF:TOF/TOFTRACKS_TPC/0;matchTPCTRDTOF/TOF/MTC_TPCTRD/0;tofcluster:TOF/CLUSTERS/0"
4343
},
4444
"taskParameters" : {
4545
"GID" : "ITS-TPC,ITS",
@@ -55,19 +55,23 @@
5555
"minDCACutY": "10.f",
5656
"minPtCut": "0.f",
5757
"maxPtCut": "1e10f",
58-
"etaCut": "1e10f"
58+
"etaCut": "1e10f",
59+
"cutK0Mass": "0.05f",
60+
"maxEtaK0": "0.8f",
61+
"doK0QC": "true",
62+
"trackSourcesK0": "ITS,TPC,ITS-TPC,ITS-TPC-TOF,TPC-TOF,TPC-TRD,ITS-TPC-TRD,TPC-TRD-TOF,ITS-TPC-TOF,ITS-TPC-TRD-TOF"
5963
},
6064
"grpGeomRequest" : {
6165
"geomRequest": "None",
62-
"askGRPECS": "false",
63-
"askGRPLHCIF": "false",
66+
"askGRPECS": "true",
67+
"askGRPLHCIF": "true",
6468
"askGRPMagField": "true",
6569
"askMatLUT": "false",
6670
"askTime": "false",
6771
"askOnceAllButField": "true",
6872
"needPropagatorD": "false"
6973
},
70-
"saveObjectsToFile" : "ITSTPCmatched.root",
74+
"saveObjectsToFile" : "ITSTPCmatched_allTracks_enabledK0.root",
7175
"" : "For debugging, path to the file where to save. If empty or missing it won't save."
7276
}
7377
}

‎DATA/production/qc-sync/glo-itstpc-mtch-qcmn-epn.json‎

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,29 @@
3232
"maxNumberCycles" : "-1",
3333
"dataSource" : {
3434
"type" : "dataSamplingPolicy",
35-
"name" : "ITSTPCmSamp"
35+
"name" : "ITSTPCmSampK0"
3636
},
3737
"taskParameters" : {
38-
"GID" : "ITS-TPC,ITS",
39-
"verbose" : "false",
40-
"minPtCut" : "0.1f",
41-
"etaCut" : "1.4f",
42-
"minNTPCClustersCut" : "60",
43-
"minDCACut" : "100.f",
44-
"minDCACutY" : "10.f"
38+
"GID": "ITS-TPC,ITS",
39+
"verbose": "false",
40+
"minPtITSCut": "0.f",
41+
"etaITSCut": "1e10f",
42+
"minNITSClustersCut": "0",
43+
"maxChi2PerClusterITS": "100000",
44+
"minPtTPCCut": "0.1f",
45+
"etaTPCCut": "0.9f",
46+
"minNTPCClustersCut": "60",
47+
"minDCACut": "100.f",
48+
"minDCACutY": "10.f",
49+
"minPtCut": "0.f",
50+
"maxPtCut": "1e10f",
51+
"etaCut": "1e10f",
52+
"cutK0Mass": "0.05f",
53+
"maxEtaK0": "0.8f",
54+
"doK0QC": "true",
55+
"trackSourcesK0": ""
4556
},
46-
"grpGeomRequest" : {
57+
"grpGeomRequest" : {
4758
"geomRequest": "None",
4859
"askGRPECS": "false",
4960
"askGRPLHCIF": "false",
@@ -54,23 +65,23 @@
5465
"needPropagatorD": "false"
5566
},
5667
"location" : "local",
57-
"localMachines": [
68+
"localMachines": [
5869
"epn",
59-
"localhost"
70+
"localhost"
6071
],
6172
"remoteMachine": "alio2-cr1-qc07.cern.ch",
62-
"remotePort": "47761",
63-
"localControl": "odc"
73+
"remotePort": "47761",
74+
"localControl": "odc"
6475
}
6576
}
6677
},
6778
"dataSamplingPolicies" : [
6879
{
69-
"id" : "ITSTPCmSamp",
80+
"id" : "ITSTPCmSampK0",
7081
"active" : "true",
7182
"machines" : [],
7283
"query_comment" : "checking every 10% matched track",
73-
"query" : "trackITSTPC:GLO/TPCITS/0;trackITSTPCABREFS:GLO/TPCITSAB_REFS/0;trackITSTPCABCLID:GLO/TPCITSAB_CLID/0;trackTPC:TPC/TRACKS;trackTPCClRefs:TPC/CLUSREFS;trackITS:ITS/TRACKS/0;trackITSROF:ITS/ITSTrackROF/0;trackITSClIdx:ITS/TRACKCLSID/0;alpparITS:ITS/ALPIDEPARAM/0?lifetime=condition&ccdb-path=ITS/Config/AlpideParam",
84+
"query" : "",
7485
"samplingConditions" : [
7586
{
7687
"condition" : "random",

‎DATA/production/qc-workflow.sh‎

Lines changed: 65 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,10 @@ add_QC_JSON() {
5050
OUTPUT_SUFFIX+="-$1"
5151
}
5252

53+
JSON_TEMP_FILES="()"
54+
5355
QC_CONFIG=
54-
QC_CONFIG_OVERRIDE=
56+
: ${QC_CONFIG_OVERRIDE:=} # set to empty string only if not already set externally
5557
: ${QC_DETECTOR_CONFIG_OVERRIDE:=} # set to empty string only if not already set externally
5658
if [[ -z ${QC_JSON_FROM_OUTSIDE:-} && ! -z ${GEN_TOPO_QC_JSON_FILE:-} && -f $GEN_TOPO_QC_JSON_FILE ]]; then
5759
QC_JSON_FROM_OUTSIDE=$GEN_TOPO_QC_JSON_FILE
@@ -266,7 +268,61 @@ elif [[ -z ${QC_JSON_FROM_OUTSIDE:-} ]]; then
266268
DET_JSON_FILE="QC_JSON_GLO_$i"
267269
if has_matching_qc $i && [ ! -z "${!DET_JSON_FILE:-}" ]; then
268270
if [[ $i == "PRIMVTX" ]] && ! has_detector_reco ITS; then continue; fi
269-
if [[ $i == "ITSTPC" ]] && ! has_detectors_reco ITS TPC; then continue; fi
271+
if [[ $i == "ITSTPC" ]] ; then
272+
if ! has_detectors_reco ITS TPC; then continue
273+
else
274+
# replace the input sources depending on the detector compostition and matching detectors
275+
ITSTPCMatchQuery="trackITSTPC:GLO/TPCITS/0;trackITSTPCABREFS:GLO/TPCITSAB_REFS/0;trackITSTPCABCLID:GLO/TPCITSAB_CLID/0;trackTPC:TPC/TRACKS;trackTPCClRefs:TPC/CLUSREFS/0;trackITS:ITS/TRACKS/0;trackITSROF:ITS/ITSTrackROF/0;trackITSClIdx:ITS/TRACKCLSID/0;alpparITS:ITS/ALPIDEPARAM/0?lifetime=condition&ccdb-path=ITS/Config/AlpideParam;SVParam:GLO/SVPARAM/0?lifetime=condition&ccdb-path=GLO/Config/SVertexerParam"
276+
if [[ $SYNCMODE == 1 ]] || [[ $EPNSYNCMODE == 1 ]] ; then
277+
HAS_K0_ENABLED=$(jq -r .qc.tasks.MTCITSTPC.taskParameters.doK0QC "${!DET_JSON_FILE}")
278+
else
279+
HAS_K0_ENABLED=$(jq -r .qc.tasks.GLOMatchTrITSTPC.taskParameters.doK0QC "${!DET_JSON_FILE}")
280+
fi
281+
TRACKSOURCESK0="ITS,TPC,ITS-TPC"
282+
if [[ $HAS_K0_ENABLED == "true" ]]; then
283+
ITSTPCMatchQuery+=";p2decay3body:GLO/PVTX_3BODYREFS/0;decay3body:GLO/DECAYS3BODY/0;decay3bodyIdx:GLO/DECAYS3BODY_IDX/0;p2cascs:GLO/PVTX_CASCREFS/0;cascs:GLO/CASCS/0;cascsIdx:GLO/CASCS_IDX/0;p2v0s:GLO/PVTX_V0REFS/0;v0s:GLO/V0S/0;v0sIdx:GLO/V0S_IDX/0;pvtx_tref:GLO/PVTX_TRMTCREFS/0;pvtx_trmtc:GLO/PVTX_TRMTC/0;pvtx:GLO/PVTX/0;clusTPCoccmap:TPC/TPCOCCUPANCYMAP/0;clusTPC:TPC/CLUSTERNATIVE;clusTPCshmap:TPC/CLSHAREDMAP/0;trigTPC:TPC/TRIGGERWORDS/0"
284+
if has_secvtx_source ITS-TPC-TRD ; then
285+
ITSTPCMatchQuery+=";trigITSTPCTRD:TRD/TRGREC_ITSTPC/0;trackITSTPCTRD:TRD/MATCH_ITSTPC/0"
286+
TRACKSOURCESK0+=",ITS-TPC-TRD"
287+
fi
288+
if has_secvtx_source ITS-TPC-TOF ; then
289+
ITSTPCMatchQuery+=";matchITSTPCTOF:TOF/MTC_ITSTPC/0"
290+
TRACKSOURCESK0+=",ITS-TPC-TOF"
291+
fi
292+
if has_secvtx_source ITS-TPC-TRD-TOF ; then
293+
ITSTPCMatchQuery+=";matchITSTPCTRDTOF:TOF/MTC_ITSTPCTRD/0"
294+
TRACKSOURCESK0+=",ITS-TPC-TRD-TOF"
295+
fi
296+
if has_secvtx_source TPC-TRD ; then
297+
ITSTPCMatchQuery+=";trigTPCTRD:TRD/TRGREC_TPC/0;trackTPCTRD:TRD/MATCH_TPC/0"
298+
TRACKSOURCESK0+=",TPC-TRD"
299+
fi
300+
if has_secvtx_source TPC-TOF ; then
301+
ITSTPCMatchQuery+=";matchTPCTOF:TOF/MTC_TPC/0;trackTPCTOF:TOF/TOFTRACKS_TPC/0"
302+
TRACKSOURCESK0+=",TPC-TOF"
303+
fi
304+
if has_secvtx_source TPC-TRD-TOF ; then
305+
ITSTPCMatchQuery+=";matchTPCTRDTOF/TOF/MTC_TPCTRD/0"
306+
TRACKSOURCESK0+=",TPC-TRD-TOF"
307+
fi
308+
if has_secvtx_source TOF ; then
309+
ITSTPCMatchQuery+=";tofcluster:TOF/CLUSTERS/0"
310+
TRACKSOURCESK0+=",TOF"
311+
fi
312+
if has_secvtx_source TRD ; then
313+
TRACKSOURCESK0+=",TRD"
314+
fi
315+
fi
316+
TEMP_FILE=$(mktemp "${i}"_XXXXXXX)
317+
if [[ $SYNCMODE == 1 ]] || [[ $EPNSYNCMODE == 1 ]] ; then
318+
cat "${!DET_JSON_FILE}" | jq "(.dataSamplingPolicies[] | select(.id == \"ITSTPCmSampK0\") | .query) = \"$ITSTPCMatchQuery\" | .qc.tasks.MTCITSTPC.taskParameters.trackSourcesK0 = \"$TRACKSOURCESK0\"" > "$TEMP_FILE"
319+
else
320+
cat "${!DET_JSON_FILE}" | jq ".qc.tasks.GLOMatchTrITSTPC.dataSource.query = \"$ITSTPCMatchQuery\" | .qc.tasks.GLOMatchTrITSTPC.taskParameters.trackSourcesK0 = \"$TRACKSOURCESK0\"" > "$TEMP_FILE"
321+
fi
322+
DET_JSON_FILE=TEMP_FILE
323+
JSON_TEMP_FILES+=("$TEMP_FILE")
324+
fi
325+
fi
270326
add_QC_JSON GLO_$i ${!DET_JSON_FILE}
271327
fi
272328
done
@@ -324,6 +380,11 @@ elif [[ -z ${QC_JSON_FROM_OUTSIDE:-} ]]; then
324380
fi
325381
MERGED_JSON_FILENAME=$(realpath $MERGED_JSON_FILENAME)
326382

383+
# Clean up: delete the temporary files after use
384+
for tf in "${JSON_TEMP_FILES[@]}"; do
385+
rm -f "$tf"
386+
done
387+
327388
if [[ "${QC_REDIRECT_MERGER_TO_LOCALHOST:-}" == "1" ]]; then
328389
sed -i.bak -E 's/( *)"remoteMachine" *: *".*"(,?) *$/\1"remoteMachine": "127.0.0.1"\2/' $MERGED_JSON_FILENAME
329390
unlink $MERGED_JSON_FILENAME.bak
@@ -362,7 +423,9 @@ if [[ ! -z "${QC_JSON_FROM_OUTSIDE:-}" ]]; then
362423
QC_CONFIG_PARAM="--local-batch=QC.root"
363424
fi
364425
fi
426+
365427
add_W o2-qc "--config json://$QC_JSON_FROM_OUTSIDE ${QC_CONFIG_PARAM} ${QC_CONFIG}"
428+
366429
fi
367430

368431
if [[ ! -z ${GEN_TOPO_QC_JSON_FILE:-} ]]; then

0 commit comments

Comments
 (0)