From 90c27424166ffa04800a4229c6b13ecc195ac750 Mon Sep 17 00:00:00 2001 From: Nasir Mehdi Malik <89008506+nasirmehdimalik@users.noreply.github.com> Date: Fri, 16 Feb 2024 18:26:55 +0530 Subject: [PATCH 1/7] TRD;) tracking task in mc workflow --- MC/bin/o2dpg_qc_finalization_workflow.py | 1 + MC/bin/o2dpg_sim_workflow.py | 5 +++ MC/config/QC/json/trd-digits-task.json | 13 ++++++- MC/config/QC/json/trd-tracking-task.json | 48 ++++++++++++++++++++++++ 4 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 MC/config/QC/json/trd-tracking-task.json diff --git a/MC/bin/o2dpg_qc_finalization_workflow.py b/MC/bin/o2dpg_qc_finalization_workflow.py index 373989f20..0a6cb6bff 100755 --- a/MC/bin/o2dpg_qc_finalization_workflow.py +++ b/MC/bin/o2dpg_qc_finalization_workflow.py @@ -84,6 +84,7 @@ def add_QC_postprocessing(taskName, qcConfigPath, needs, runSpecific, prodSpecif #add_QC_finalization('tpcTrackingQC', 'json://${O2DPG_ROOT}/MC/config/QC/json/tpc-qc-tracking-direct.json') add_QC_finalization('tpcStandardQC', 'json://${O2DPG_ROOT}/MC/config/QC/json/tpc-qc-standard-direct.json') add_QC_finalization('trdDigitsQC', 'json://${O2DPG_ROOT}/MC/config/QC/json/trd-digits-task.json') + add_QC_finalization('trdTrackingQC', 'json://${O2DPG_ROOT}/MC/config/QC/json/trd-tracking-task.json') add_QC_finalization('vertexQC', 'json://${O2DPG_ROOT}/MC/config/QC/json/vertexing-qc-direct-mc.json') add_QC_finalization('ITSTPCmatchQC', 'json://${O2DPG_ROOT}/MC/config/QC/json/ITSTPCmatchedTracks_direct_MC.json') add_QC_finalization('TOFMatchQC', 'json://${O2DPG_ROOT}/MC/config/QC/json/tofMatchedTracks_ITSTPCTOF_TPCTOF_direct_MC.json') diff --git a/MC/bin/o2dpg_sim_workflow.py b/MC/bin/o2dpg_sim_workflow.py index 5b236027e..c5a929266 100755 --- a/MC/bin/o2dpg_sim_workflow.py +++ b/MC/bin/o2dpg_sim_workflow.py @@ -1210,6 +1210,11 @@ def addQCPerTF(taskName, needs, readerCommand, configFilePath, objectsFile=''): readerCommand='o2-trd-trap-sim', configFilePath='json://${O2DPG_ROOT}/MC/config/QC/json/trd-digits-task.json') + addQCPerTF(taskName='trdTrackingQC', + needs=[TRDTRACKINGtask2['name']], + readerCommand='o2-global-track-cluster-reader --track-types "ITS-TPC-TRD" --cluster-types none', + configFilePath='json://${O2DPG_ROOT}/MC/config/QC/json/trd-tracking-task.json') + ### TOF addQCPerTF(taskName='tofDigitsQC', needs=[getDigiTaskName("TOF")], diff --git a/MC/config/QC/json/trd-digits-task.json b/MC/config/QC/json/trd-digits-task.json index ae05bdfd3..a2feefa83 100644 --- a/MC/config/QC/json/trd-digits-task.json +++ b/MC/config/QC/json/trd-digits-task.json @@ -43,7 +43,18 @@ "pulseheightpeaklower": "1.0", "pulseheightpeakupper": "5.0" } - } + }, + "Tracklets": { + "active": "true", + "className": "o2::quality_control_modules::trd::TrackletsTask", + "moduleName": "QcTRD", + "detectorName": "TRD", + "cycleDurationSeconds": "60", + "dataSource": { + "type": "direct", + "query": "digits:TRD/DIGITS;tracklets:TRD/TRACKLETS;triggers:TRD/TRKTRGRD;noiseMap:TRD/NOISEMAP/0?lifetime=condition&ccdb-path=TRD/Calib/NoiseMapMCM;chamberStatus:TRD/CHSTATUS/0?lifetime=condition&ccdb-path=TRD/Calib/HalfChamberStatusQC;fedChamberStatus:TRD/FCHSTATUS/0?lifetime=condition&ccdb-path=TRD/Calib/DCSDPsFedChamberStatus" + } + } }, "dataSamplingPolicies": [] } diff --git a/MC/config/QC/json/trd-tracking-task.json b/MC/config/QC/json/trd-tracking-task.json new file mode 100644 index 000000000..bb88515d5 --- /dev/null +++ b/MC/config/QC/json/trd-tracking-task.json @@ -0,0 +1,48 @@ +{ + "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": "no-op://" + }, + "consul": { + "url": "" + }, + "conditionDB": { + "url": "alice-ccdb.cern.ch" + } + }, + "tasks": { + "Tracking": { + "active": "true", + "className": "o2::quality_control_modules::trd::TrackingTask", + "moduleName": "QcTRD", + "detectorName": "TRD", + "cycleDurationSeconds": "60", + "maxNumberCycles": "-1", + "dataSource": { + "type": "direct", + "query": "trackITSTPCTRD:TRD/MATCH_ITSTPC;trigITSTPCTRD:TRD/TRGREC_ITSTPC" + }, + "taskParameters": { + "detailedQC": "false", + "trackSources": "ITS-TPC-TRD" + } + } + }, + "dataSamplingPolicies": [] + } +} From 0330c7cfe31655937fce0c74ff61174af5dd6363 Mon Sep 17 00:00:00 2001 From: Nasir Mehdi Malik <89008506+nasirmehdimalik@users.noreply.github.com> Date: Sat, 17 Feb 2024 12:37:57 +0530 Subject: [PATCH 2/7] rmove digit query from tracklet task --- MC/config/QC/json/trd-digits-task.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MC/config/QC/json/trd-digits-task.json b/MC/config/QC/json/trd-digits-task.json index a2feefa83..58dcff1c0 100644 --- a/MC/config/QC/json/trd-digits-task.json +++ b/MC/config/QC/json/trd-digits-task.json @@ -52,7 +52,7 @@ "cycleDurationSeconds": "60", "dataSource": { "type": "direct", - "query": "digits:TRD/DIGITS;tracklets:TRD/TRACKLETS;triggers:TRD/TRKTRGRD;noiseMap:TRD/NOISEMAP/0?lifetime=condition&ccdb-path=TRD/Calib/NoiseMapMCM;chamberStatus:TRD/CHSTATUS/0?lifetime=condition&ccdb-path=TRD/Calib/HalfChamberStatusQC;fedChamberStatus:TRD/FCHSTATUS/0?lifetime=condition&ccdb-path=TRD/Calib/DCSDPsFedChamberStatus" + "query": "tracklets:TRD/TRACKLETS;triggers:TRD/TRKTRGRD;noiseMap:TRD/NOISEMAP/0?lifetime=condition&ccdb-path=TRD/Calib/NoiseMapMCM;chamberStatus:TRD/CHSTATUS/0?lifetime=condition&ccdb-path=TRD/Calib/HalfChamberStatusQC;fedChamberStatus:TRD/FCHSTATUS/0?lifetime=condition&ccdb-path=TRD/Calib/DCSDPsFedChamberStatus" } } }, From ceb7e222c0999aa1883a94a3418a9bd53bd44f50 Mon Sep 17 00:00:00 2001 From: Nasir Mehdi Malik <89008506+nasirmehdimalik@users.noreply.github.com> Date: Mon, 26 Feb 2024 18:14:01 +0530 Subject: [PATCH 3/7] removed not maxNumberCycles, applicable items --- MC/config/QC/json/trd-digits-task.json | 10 +++------- MC/config/QC/json/trd-tracking-task.json | 8 ++------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/MC/config/QC/json/trd-digits-task.json b/MC/config/QC/json/trd-digits-task.json index 58dcff1c0..8ad3f7523 100644 --- a/MC/config/QC/json/trd-digits-task.json +++ b/MC/config/QC/json/trd-digits-task.json @@ -3,11 +3,8 @@ "config": { "database": { "implementation": "CCDB", - "host": "ccdb-test.cern.ch:8080", - "username": "not_applicable", - "password": "not_applicable", - "name": "not_applicable" - }, + "host": "ccdb-test.cern.ch:8080" + }, "Activity": { "number": "42", "type": "2", @@ -31,8 +28,7 @@ "className": "o2::quality_control_modules::trd::DigitsTask", "moduleName": "QcTRD", "detectorName": "TRD", - "cycleDurationSeconds": "60", - "maxNumberCycles": "-1", + "cycleDurationSeconds": "60", "dataSource": { "type": "direct", "query": "digits:TRD/DIGITS;tracklets:TRD/TRACKLETS;triggers:TRD/TRKTRGRD;noiseMap:TRD/NOISEMAP/0?lifetime=condition&ccdb-path=TRD/Calib/NoiseMapMCM;chamberStatus:TRD/CHSTATUS/0?lifetime=condition&ccdb-path=TRD/Calib/HalfChamberStatusQC;fedChamberStatus:TRD/FCHSTATUS/0?lifetime=condition&ccdb-path=TRD/Calib/DCSDPsFedChamberStatus" diff --git a/MC/config/QC/json/trd-tracking-task.json b/MC/config/QC/json/trd-tracking-task.json index bb88515d5..204a3efea 100644 --- a/MC/config/QC/json/trd-tracking-task.json +++ b/MC/config/QC/json/trd-tracking-task.json @@ -3,11 +3,8 @@ "config": { "database": { "implementation": "CCDB", - "host": "ccdb-test.cern.ch:8080", - "username": "not_applicable", - "password": "not_applicable", - "name": "not_applicable" - }, + "host": "ccdb-test.cern.ch:8080" + }, "Activity": { "number": "42", "type": "2", @@ -32,7 +29,6 @@ "moduleName": "QcTRD", "detectorName": "TRD", "cycleDurationSeconds": "60", - "maxNumberCycles": "-1", "dataSource": { "type": "direct", "query": "trackITSTPCTRD:TRD/MATCH_ITSTPC;trigITSTPCTRD:TRD/TRGREC_ITSTPC" From a626c0322f533c80bc401032dd643b90418837f2 Mon Sep 17 00:00:00 2001 From: Nasir Mehdi Malik <89008506+nasirmehdimalik@users.noreply.github.com> Date: Mon, 26 Feb 2024 18:32:06 +0530 Subject: [PATCH 4/7] trd-digit-task name change to trd-standalone-task --- MC/bin/o2dpg_qc_finalization_workflow.py | 2 +- MC/bin/o2dpg_sim_workflow.py | 2 +- .../QC/json/{trd-digits-task.json => trd-standalone-task.json} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename MC/config/QC/json/{trd-digits-task.json => trd-standalone-task.json} (100%) diff --git a/MC/bin/o2dpg_qc_finalization_workflow.py b/MC/bin/o2dpg_qc_finalization_workflow.py index 0a6cb6bff..6908b4956 100755 --- a/MC/bin/o2dpg_qc_finalization_workflow.py +++ b/MC/bin/o2dpg_qc_finalization_workflow.py @@ -83,7 +83,7 @@ def add_QC_postprocessing(taskName, qcConfigPath, needs, runSpecific, prodSpecif add_QC_finalization('emcBCQC', 'json://${O2DPG_ROOT}/MC/config/QC/json/emc-reco-tasks.json') #add_QC_finalization('tpcTrackingQC', 'json://${O2DPG_ROOT}/MC/config/QC/json/tpc-qc-tracking-direct.json') add_QC_finalization('tpcStandardQC', 'json://${O2DPG_ROOT}/MC/config/QC/json/tpc-qc-standard-direct.json') - add_QC_finalization('trdDigitsQC', 'json://${O2DPG_ROOT}/MC/config/QC/json/trd-digits-task.json') + add_QC_finalization('trdDigitsQC', 'json://${O2DPG_ROOT}/MC/config/QC/json/trd-standalone-task.json') add_QC_finalization('trdTrackingQC', 'json://${O2DPG_ROOT}/MC/config/QC/json/trd-tracking-task.json') add_QC_finalization('vertexQC', 'json://${O2DPG_ROOT}/MC/config/QC/json/vertexing-qc-direct-mc.json') add_QC_finalization('ITSTPCmatchQC', 'json://${O2DPG_ROOT}/MC/config/QC/json/ITSTPCmatchedTracks_direct_MC.json') diff --git a/MC/bin/o2dpg_sim_workflow.py b/MC/bin/o2dpg_sim_workflow.py index c5a929266..906551b23 100755 --- a/MC/bin/o2dpg_sim_workflow.py +++ b/MC/bin/o2dpg_sim_workflow.py @@ -1208,7 +1208,7 @@ def addQCPerTF(taskName, needs, readerCommand, configFilePath, objectsFile=''): addQCPerTF(taskName='trdDigitsQC', needs=[TRDDigitask['name']], readerCommand='o2-trd-trap-sim', - configFilePath='json://${O2DPG_ROOT}/MC/config/QC/json/trd-digits-task.json') + configFilePath='json://${O2DPG_ROOT}/MC/config/QC/json/trd-standalone-task.json') addQCPerTF(taskName='trdTrackingQC', needs=[TRDTRACKINGtask2['name']], diff --git a/MC/config/QC/json/trd-digits-task.json b/MC/config/QC/json/trd-standalone-task.json similarity index 100% rename from MC/config/QC/json/trd-digits-task.json rename to MC/config/QC/json/trd-standalone-task.json From 4381a4f1db14894977c80b7230fc869747cf1568 Mon Sep 17 00:00:00 2001 From: Nasir Mehdi Malik <89008506+nasirmehdimalik@users.noreply.github.com> Date: Mon, 4 Mar 2024 18:20:02 +0530 Subject: [PATCH 5/7] Update MC/config/QC/json/trd-tracking-task.json Co-authored-by: Ole Schmidt --- MC/config/QC/json/trd-tracking-task.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MC/config/QC/json/trd-tracking-task.json b/MC/config/QC/json/trd-tracking-task.json index 204a3efea..b9e4952ca 100644 --- a/MC/config/QC/json/trd-tracking-task.json +++ b/MC/config/QC/json/trd-tracking-task.json @@ -35,7 +35,7 @@ }, "taskParameters": { "detailedQC": "false", - "trackSources": "ITS-TPC-TRD" + "trackSources": "ITS-TPC-TRD,TPC-TRD" } } }, From 4ae352d9e15743f6890480045f1a7fd387ddac88 Mon Sep 17 00:00:00 2001 From: Ole Schmidt Date: Mon, 4 Mar 2024 13:55:28 +0100 Subject: [PATCH 6/7] Update MC/config/QC/json/trd-tracking-task.json --- MC/config/QC/json/trd-tracking-task.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MC/config/QC/json/trd-tracking-task.json b/MC/config/QC/json/trd-tracking-task.json index b9e4952ca..f8093814f 100644 --- a/MC/config/QC/json/trd-tracking-task.json +++ b/MC/config/QC/json/trd-tracking-task.json @@ -31,7 +31,7 @@ "cycleDurationSeconds": "60", "dataSource": { "type": "direct", - "query": "trackITSTPCTRD:TRD/MATCH_ITSTPC;trigITSTPCTRD:TRD/TRGREC_ITSTPC" + "query": "trackITSTPCTRD:TRD/MATCH_ITSTPC;trigITSTPCTRD:TRD/TRGREC_ITSTPC;trackTPCTRD:TRD/MATCH_TPC;trigTPCTRD:TRD/TRGREC_TPC" }, "taskParameters": { "detailedQC": "false", From f9cba953fa37b5233a267993438479b2bcfed086 Mon Sep 17 00:00:00 2001 From: Nasir Mehdi Malik <89008506+nasirmehdimalik@users.noreply.github.com> Date: Tue, 5 Mar 2024 18:02:39 +0530 Subject: [PATCH 7/7] readerCommand configured with TPC_TRD --- MC/bin/o2dpg_sim_workflow.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MC/bin/o2dpg_sim_workflow.py b/MC/bin/o2dpg_sim_workflow.py index 906551b23..93cb68788 100755 --- a/MC/bin/o2dpg_sim_workflow.py +++ b/MC/bin/o2dpg_sim_workflow.py @@ -1212,7 +1212,7 @@ def addQCPerTF(taskName, needs, readerCommand, configFilePath, objectsFile=''): addQCPerTF(taskName='trdTrackingQC', needs=[TRDTRACKINGtask2['name']], - readerCommand='o2-global-track-cluster-reader --track-types "ITS-TPC-TRD" --cluster-types none', + readerCommand='o2-global-track-cluster-reader --track-types "ITS-TPC-TRD,TPC-TRD" --cluster-types none', configFilePath='json://${O2DPG_ROOT}/MC/config/QC/json/trd-tracking-task.json') ### TOF