From ac9fea6429d87b3d672606d1afdbfcf497d12fa3 Mon Sep 17 00:00:00 2001 From: Mattia Faggin Date: Fri, 20 Sep 2024 15:14:15 +0200 Subject: [PATCH 1/4] [AOT] Fix analysisQC for TPC PID. --- MC/config/analysis_testing/json/analyses_config.json | 2 +- ...-analysis-pid-tpc-full.json => o2-analysis-pid-tpc.json} | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) rename MC/config/analysis_testing/json/dpl/{o2-analysis-pid-tpc-full.json => o2-analysis-pid-tpc.json} (76%) diff --git a/MC/config/analysis_testing/json/analyses_config.json b/MC/config/analysis_testing/json/analyses_config.json index d72ab52a1..f2849bd9f 100644 --- a/MC/config/analysis_testing/json/analyses_config.json +++ b/MC/config/analysis_testing/json/analyses_config.json @@ -75,7 +75,7 @@ "o2-analysis-pid-tof-qa-beta", "o2-analysis-pid-tpc-qa", "o2-analysis-pid-tpc-base", - "o2-analysis-pid-tpc-full"] + "o2-analysis-pid-tpc"] }, { "name": "PWGMMMFT", diff --git a/MC/config/analysis_testing/json/dpl/o2-analysis-pid-tpc-full.json b/MC/config/analysis_testing/json/dpl/o2-analysis-pid-tpc.json similarity index 76% rename from MC/config/analysis_testing/json/dpl/o2-analysis-pid-tpc-full.json rename to MC/config/analysis_testing/json/dpl/o2-analysis-pid-tpc.json index f16d2bf26..3d3b5c089 100644 --- a/MC/config/analysis_testing/json/dpl/o2-analysis-pid-tpc-full.json +++ b/MC/config/analysis_testing/json/dpl/o2-analysis-pid-tpc.json @@ -1,10 +1,11 @@ { - "tpc-pid-full": { + "pid-tpc": { "autofetchNetworks": "1", "ccdb-timestamp": "0", "ccdb-url": "http://alice-ccdb.cern.ch", "ccdbPath": "Analysis/PID/TPC/Response", "enableNetworkOptimizations": "1", + "enableTuneOnDataTable": "1", "networkPathCCDB": "Analysis/PID/TPC/ML", "networkPathLocally": "network.onnx", "networkSetNumThreads": "0", @@ -18,6 +19,9 @@ "pid-pi": "-1", "pid-pr": "-1", "pid-tr": "-1", + "processMcTuneOnData": "!ANALYSIS_QC_is_mc!", + "processStandard": "!ANALYSIS_QC_is_data!", + "skipTPCOnly": "1", "useNetworkCorrection": "0" } } From 6e7fd281fd339baf6d4ef14020669cbddff30c28 Mon Sep 17 00:00:00 2001 From: Mattia Faggin Date: Fri, 20 Sep 2024 15:43:08 +0200 Subject: [PATCH 2/4] Fix TPC-full also for other workflows, for consistency. --- MC/config/analysis_testing/json/analyses_config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MC/config/analysis_testing/json/analyses_config.json b/MC/config/analysis_testing/json/analyses_config.json index f2849bd9f..8d9f43dc6 100644 --- a/MC/config/analysis_testing/json/analyses_config.json +++ b/MC/config/analysis_testing/json/analyses_config.json @@ -47,7 +47,7 @@ "o2-analysis-pid-tof", "o2-analysis-pid-tof-full", "o2-analysis-pid-tpc-base", - "o2-analysis-pid-tpc-full", + "o2-analysis-pid-tpc", "o2-analysis-event-selection", "o2-analysis-timestamp", "o2-analysis-multiplicity-table", @@ -146,7 +146,7 @@ "o2-analysis-track-propagation", "o2-analysis-trackselection", "o2-analysis-event-selection", - "o2-analysis-pid-tpc-full", + "o2-analysis-pid-tpc", "o2-analysis-pid-tpc-base" ] }, From 99928673d65359777cc5784cc856e62cdb050aaf Mon Sep 17 00:00:00 2001 From: Mattia Faggin Date: Tue, 1 Oct 2024 18:19:40 +0200 Subject: [PATCH 3/4] Restore wagon name for TPC PID. --- MC/config/analysis_testing/json/dpl/o2-analysis-pid-tpc.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MC/config/analysis_testing/json/dpl/o2-analysis-pid-tpc.json b/MC/config/analysis_testing/json/dpl/o2-analysis-pid-tpc.json index 3d3b5c089..ea1387c2c 100644 --- a/MC/config/analysis_testing/json/dpl/o2-analysis-pid-tpc.json +++ b/MC/config/analysis_testing/json/dpl/o2-analysis-pid-tpc.json @@ -1,5 +1,5 @@ { - "pid-tpc": { + "tpc-pid": { "autofetchNetworks": "1", "ccdb-timestamp": "0", "ccdb-url": "http://alice-ccdb.cern.ch", From aa0af0404020a5580b4a68b3cbf47e09f0aa1cdd Mon Sep 17 00:00:00 2001 From: Mattia Faggin Date: Tue, 1 Oct 2024 18:21:27 +0200 Subject: [PATCH 4/4] Autodetect ev. sel isMC based on metadata. --- .../analysis_testing/json/dpl/o2-analysis-event-selection.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MC/config/analysis_testing/json/dpl/o2-analysis-event-selection.json b/MC/config/analysis_testing/json/dpl/o2-analysis-event-selection.json index f2022152e..3fc3aac53 100644 --- a/MC/config/analysis_testing/json/dpl/o2-analysis-event-selection.json +++ b/MC/config/analysis_testing/json/dpl/o2-analysis-event-selection.json @@ -1,6 +1,6 @@ { "event-selection-task": { - "isMC": "!ANALYSIS_QC_is_mc!", + "isMC": "-1", "muonSelection": "0", "processRun2": "false", "processRun3": "true",