From 876e7816c07071cabf496432967ab52aa65be462 Mon Sep 17 00:00:00 2001 From: JianLIUhep Date: Thu, 24 Mar 2022 19:22:45 +0100 Subject: [PATCH 1/4] Added ITS MC Track task --- MC/config/QC/json/its-mc-tracks-qc.json | 65 +++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 MC/config/QC/json/its-mc-tracks-qc.json diff --git a/MC/config/QC/json/its-mc-tracks-qc.json b/MC/config/QC/json/its-mc-tracks-qc.json new file mode 100644 index 000000000..807f0ccd7 --- /dev/null +++ b/MC/config/QC/json/its-mc-tracks-qc.json @@ -0,0 +1,65 @@ +{ + "qc" : { + "config" : { + "database" : { + "implementation" : "CCDB", + "host" : "ccdb-test.cern.ch:8080", + "username" : "not_applicable", + "password" : "not_applicable", + "name" : "not_applicable" + }, + "Activity" : { + "number" : "42", + "type" : "2", + "provenance": "qc_mc", + "passName": "passMC", + "periodName": "SimChallenge" + }, + "monitoring" : { + "url" : "infologger:///debug?qc" + }, + "consul" : { + "url" : "http://consul-test.cern.ch:8500" + }, + "conditionDB" : { + "url" : "ccdb-test.cern.ch:8080" + } + }, + "tasks" : { + "ITSTrackSimTask" : { + "active" : "true", + "className" : "o2::quality_control_modules::its::ITSTrackSimTask", + "moduleName" : "QcITS", + "detectorName" : "ITS", + "cycleDurationSeconds" : "30", + "maxNumberCycles" : "-1", + "dataSource_comment" : "The other type of dataSource is \"direct\", see basic-no-sampling.json.", + "dataSource" : { + "type" : "dataSamplingPolicy", + "name" : "tracksim" + }, + "location" : "remote", + "taskParameters" : { } + + } + } + }, + + "dataSamplingPolicies" : [ + { + "id" : "tracksim", + "active" : "true", + "machines" : [], + "query" : "tracks:ITS/TRACKS/0;mstruth:ITS/TRACKSMCTR/0;compclus:ITS/COMPCLUSTERS/0;mcclustruth:ITS/CLUSTERSMCTR/0", + "samplingConditions" : [ + { + "condition" : "random", + "fraction" : "1", + "seed" : "1441" + } + ], + + "blocking" : "false" + } + ] +} From f7d60a08e39fc7cdf9f78ec69a3ba05788df0cec Mon Sep 17 00:00:00 2001 From: JianLIUhep Date: Thu, 24 Mar 2022 19:27:12 +0100 Subject: [PATCH 2/4] Added forgotten files --- MC/bin/o2dpg_qc_finalization_workflow.py | 2 +- MC/bin/o2dpg_sim_workflow.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/MC/bin/o2dpg_qc_finalization_workflow.py b/MC/bin/o2dpg_qc_finalization_workflow.py index 47877ed7c..c3aebb31c 100755 --- a/MC/bin/o2dpg_qc_finalization_workflow.py +++ b/MC/bin/o2dpg_qc_finalization_workflow.py @@ -61,7 +61,7 @@ def add_QC_finalization(taskName, qcConfigPath, needs=None): add_QC_finalization('TOFMatchQC', 'json://${O2DPG_ROOT}/MC/config/QC/json/tofMatchedTracks_ITSTPCTOF_TPCTOF_direct_MC.json') add_QC_finalization('tofDigitsQC', 'json://${O2DPG_ROOT}/MC/config/QC/json/tofdigits.json') add_QC_finalization('TOFMatchWithTRDQC', 'json://${O2DPG_ROOT}/MC/config/QC/json/tofMatchedTracks_AllTypes_direct_MC.json') - + add_QC_finalization('ITSTrackSimTask', 'json://${O2DPG_ROOT}/MC/config/QC/json/its-mc-tracks-qc.json') return stages diff --git a/MC/bin/o2dpg_sim_workflow.py b/MC/bin/o2dpg_sim_workflow.py index 625cc688d..641bbdace 100755 --- a/MC/bin/o2dpg_sim_workflow.py +++ b/MC/bin/o2dpg_sim_workflow.py @@ -928,6 +928,11 @@ def addQCPerTF(taskName, needs, readerCommand, configFilePath, objectsFile=''): needs=[TOFTPCMATCHERtask['name']], readerCommand='o2-global-track-cluster-reader --track-types "ITS-TPC-TOF,TPC-TOF,TPC,ITS-TPC-TRD,ITS-TPC-TRD-TOF,TPC-TRD,TPC-TRD-TOF" --cluster-types none', configFilePath='json://${O2DPG_ROOT}/MC/config/QC/json/tofMatchedTracks_AllTypes_direct_MC.json') + ### ITS + addQCPerTF(taskName='ITSTrackSimTask', + needs=[ITSRECOtask['name']], + readerCommand='o2-its-reco-workflow', + configFilePath='json://${O2DPG_ROOT}/MC/config/QC/json/its-mc-tracks-qc.json') #secondary vertexer svfinder_threads = ' --threads 1 ' From 759bdb28254d536b3717b5489efd1bdf8d2e08dd Mon Sep 17 00:00:00 2001 From: JianLIUhep Date: Mon, 28 Mar 2022 12:54:13 +0200 Subject: [PATCH 3/4] Cleared .json file, global-track-reader instead of o2-its-reco --- MC/bin/o2dpg_sim_workflow.py | 2 +- MC/config/QC/json/its-mc-tracks-qc.json | 27 ++++--------------------- 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/MC/bin/o2dpg_sim_workflow.py b/MC/bin/o2dpg_sim_workflow.py index 641bbdace..15816f951 100755 --- a/MC/bin/o2dpg_sim_workflow.py +++ b/MC/bin/o2dpg_sim_workflow.py @@ -931,7 +931,7 @@ def addQCPerTF(taskName, needs, readerCommand, configFilePath, objectsFile=''): ### ITS addQCPerTF(taskName='ITSTrackSimTask', needs=[ITSRECOtask['name']], - readerCommand='o2-its-reco-workflow', + readerCommand='o2-global-track-cluster-reader --track-types "ITS" --cluster-types "ITS"', configFilePath='json://${O2DPG_ROOT}/MC/config/QC/json/its-mc-tracks-qc.json') #secondary vertexer diff --git a/MC/config/QC/json/its-mc-tracks-qc.json b/MC/config/QC/json/its-mc-tracks-qc.json index 807f0ccd7..59ab24a23 100644 --- a/MC/config/QC/json/its-mc-tracks-qc.json +++ b/MC/config/QC/json/its-mc-tracks-qc.json @@ -19,7 +19,7 @@ "url" : "infologger:///debug?qc" }, "consul" : { - "url" : "http://consul-test.cern.ch:8500" + "url" : "" }, "conditionDB" : { "url" : "ccdb-test.cern.ch:8080" @@ -35,31 +35,12 @@ "maxNumberCycles" : "-1", "dataSource_comment" : "The other type of dataSource is \"direct\", see basic-no-sampling.json.", "dataSource" : { - "type" : "dataSamplingPolicy", - "name" : "tracksim" + "type" : "direct", + "query" : "tracks:ITS/TRACKS/0;mstruth:ITS/TRACKSMCTR/0;compclus:ITS/COMPCLUSTERS/0;mcclustruth:ITS/CLUSTERSMCTR/0" }, - "location" : "remote", "taskParameters" : { } } } - }, - - "dataSamplingPolicies" : [ - { - "id" : "tracksim", - "active" : "true", - "machines" : [], - "query" : "tracks:ITS/TRACKS/0;mstruth:ITS/TRACKSMCTR/0;compclus:ITS/COMPCLUSTERS/0;mcclustruth:ITS/CLUSTERSMCTR/0", - "samplingConditions" : [ - { - "condition" : "random", - "fraction" : "1", - "seed" : "1441" - } - ], - - "blocking" : "false" - } - ] + } } From 75af9a88c799854137de6a015669ed4bd1a45c92 Mon Sep 17 00:00:00 2001 From: JianLIUhep Date: Tue, 29 Mar 2022 19:32:31 +0200 Subject: [PATCH 4/4] Returned QC task parameters in accordance to new ITS QC PR --- MC/config/QC/json/its-mc-tracks-qc.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/MC/config/QC/json/its-mc-tracks-qc.json b/MC/config/QC/json/its-mc-tracks-qc.json index 59ab24a23..f05ca422e 100644 --- a/MC/config/QC/json/its-mc-tracks-qc.json +++ b/MC/config/QC/json/its-mc-tracks-qc.json @@ -38,7 +38,10 @@ "type" : "direct", "query" : "tracks:ITS/TRACKS/0;mstruth:ITS/TRACKSMCTR/0;compclus:ITS/COMPCLUSTERS/0;mcclustruth:ITS/CLUSTERSMCTR/0" }, - "taskParameters" : { } + "taskParameters" : { + "O2GrpPath" : "./o2sim_grp.root", + "collisionsContextPath": "./collisioncontext.root" + } } }