From e676c67037f1dcde0c17afd276cf1ee4fae06170 Mon Sep 17 00:00:00 2001 From: Anton Alkin Date: Mon, 1 Nov 2021 14:45:41 +0100 Subject: [PATCH 01/11] Use process switches for 2/3 prong creators, D0 and Lc tasks --- codeHF/config_tasks.sh | 9 +++ codeHF/dpl-config_run3.json | 126 +++--------------------------- codeHF/dpl-config_run5_hf.json | 36 +++------ codeHF/dpl-config_run5_oniaX.json | 21 +++-- codeHF/workflows.yml | 46 +++++++++-- 5 files changed, 79 insertions(+), 159 deletions(-) diff --git a/codeHF/config_tasks.sh b/codeHF/config_tasks.sh index e979ac23..2503ba10 100644 --- a/codeHF/config_tasks.sh +++ b/codeHF/config_tasks.sh @@ -125,6 +125,15 @@ function AdjustJson { JSON="$JSON_EDIT" fi + if [[ $ISMC -eq 1 ]] + then + MsgWarn "\nEnabling MC" + ReplaceString "\"processMC\": \"false\"" "\"processMC\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON." + else + MsgWarn "\nUsing data" + ReplaceString "\"processMC\": \"true\"" "\"processMC\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON." + fi + # Enable D0 selection. if [ $APPLYCUTS_D0 -eq 1 ]; then MsgWarn "\nUsing D0 selection cuts" diff --git a/codeHF/dpl-config_run3.json b/codeHF/dpl-config_run3.json index 915b7d82..73e6c042 100644 --- a/codeHF/dpl-config_run3.json +++ b/codeHF/dpl-config_run3.json @@ -176,6 +176,9 @@ "d_minrelchi2change": "0.9", "b_dovalplots": "true" }, + "hf-cand-creator-2prong-expressions": { + "processMC": "true" + }, "hf-cand-creator-3prong": { "d_bz": "5.", "b_propdca": "true", @@ -185,6 +188,9 @@ "d_minrelchi2change": "0.9", "b_dovalplots": "true" }, + "hf-cand-creator-3prong-expressions": { + "processMC": "true" + }, "hf-d0-candidate-selector": { "d_pTCandMin": "0.", "d_pTCandMax": "50.", @@ -464,12 +470,8 @@ "50", "100" ] - } - }, - "hf-task-d0-mc": { - "cutYCandMax": "0.8", - "d_selectionFlagD0": "0", - "d_selectionFlagD0bar": "0" + }, + "processMC": "true" }, "hf-task-dplus": { "cutYCandMax": "0.8", @@ -620,116 +622,8 @@ "9.9", "10.0" ] - } - }, - "hf-task-lc-mc": { - "cutYCandMax": "0.8", - "d_selectionFlagLc": "0", - "pTBins": { - "values": [ - "0.0", - "0.1", - "0.2", - "0.3", - "0.4", - "0.5", - "0.6", - "0.7", - "0.8", - "0.9", - "1.0", - "1.1", - "1.2", - "1.3", - "1.4", - "1.5", - "1.6", - "1.7", - "1.8", - "1.9", - "2.0", - "2.1", - "2.2", - "2.3", - "2.4", - "2.5", - "2.6", - "2.7", - "2.8", - "2.9", - "3.0", - "3.1", - "3.2", - "3.3", - "3.4", - "3.5", - "3.6", - "3.7", - "3.8", - "3.9", - "4.0", - "4.1", - "4.2", - "4.3", - "4.4", - "4.5", - "4.6", - "4.7", - "4.8", - "4.9", - "5.0", - "5.1", - "5.2", - "5.3", - "5.4", - "5.5", - "5.6", - "5.7", - "5.8", - "5.9", - "6.0", - "6.1", - "6.2", - "6.3", - "6.4", - "6.5", - "6.6", - "6.7", - "6.8", - "6.9", - "7.0", - "7.1", - "7.2", - "7.3", - "7.4", - "7.5", - "7.6", - "7.7", - "7.8", - "7.9", - "8.0", - "8.1", - "8.2", - "8.3", - "8.4", - "8.5", - "8.6", - "8.7", - "8.8", - "8.9", - "9.0", - "9.1", - "9.2", - "9.3", - "9.4", - "9.5", - "9.6", - "9.7", - "9.8", - "9.9", - "10.0" - ] - } + }, + "processMC": "true" }, "hf-task-xic": { "cutEtaCandMax": "0.8", diff --git a/codeHF/dpl-config_run5_hf.json b/codeHF/dpl-config_run5_hf.json index 18fdad19..fbc2d10d 100644 --- a/codeHF/dpl-config_run5_hf.json +++ b/codeHF/dpl-config_run5_hf.json @@ -176,6 +176,9 @@ "d_minrelchi2change": "0.9", "b_dovalplots": "true" }, + "hf-cand-creator-2prong-expressions": { + "processMC": "true" + }, "hf-cand-creator-3prong": { "d_bz": "5.", "b_propdca": "true", @@ -185,6 +188,9 @@ "d_minrelchi2change": "0.9", "b_dovalplots": "true" }, + "hf-cand-creator-3prong-expressions": { + "processMC": "true" + }, "hf-cand-creator-xicc": { "d_bz": "20", "b_propdca": "true", @@ -552,12 +558,8 @@ "50", "100" ] - } - }, - "hf-task-d0-mc": { - "cutYCandMax": "0.8", - "d_selectionFlagD0": "0", - "d_selectionFlagD0bar": "0" + }, + "processMC": "true" }, "hf-task-dplus": { "cutYCandMax": "0.8", @@ -618,26 +620,8 @@ "24", "36" ] - } - }, - "hf-task-lc-mc": { - "cutYCandMax": "2.0", - "d_selectionFlagLc": "0", - "pTBins": { - "values": [ - "0", - "1", - "2", - "3", - "4", - "5", - "6", - "8", - "12", - "24", - "36" - ] - } + }, + "processMC": "true" }, "hf-task-xic": { "cutEtaCandMax": "-1", diff --git a/codeHF/dpl-config_run5_oniaX.json b/codeHF/dpl-config_run5_oniaX.json index 231ba327..4965567f 100644 --- a/codeHF/dpl-config_run5_oniaX.json +++ b/codeHF/dpl-config_run5_oniaX.json @@ -176,6 +176,9 @@ "d_minrelchi2change": "0.9", "b_dovalplots": "true" }, + "hf-cand-creator-2prong-expressions": { + "processMC": "true" + }, "hf-cand-creator-3prong": { "d_bz": "20.", "b_propdca": "true", @@ -185,6 +188,9 @@ "d_minrelchi2change": "0.9", "b_dovalplots": "true" }, + "hf-cand-creator-3prong-expressions": { + "processMC": "true" + }, "hf-d0-candidate-selector": { "d_pTCandMin": "0.", "d_pTCandMax": "50.", @@ -473,12 +479,8 @@ "50", "100" ] - } - }, - "hf-task-d0-mc": { - "cutYCandMax": "0.8", - "d_selectionFlagD0": "0", - "d_selectionFlagD0bar": "0" + }, + "processMC": "true" }, "hf-task-dplus": { "cutYCandMax": "0.8", @@ -539,11 +541,8 @@ "24", "36" ] - } - }, - "hf-task-lc-mc": { - "cutYCandMax": "2.0", - "d_selectionFlagLc": "0" + }, + "processMC": "true" }, "hf-task-xic": { "cutEtaCandMax": "0.8", diff --git a/codeHF/workflows.yml b/codeHF/workflows.yml index e2ad3695..3e94d999 100644 --- a/codeHF/workflows.yml +++ b/codeHF/workflows.yml @@ -23,6 +23,12 @@ workflows: # Skimming o2-analysis-hf-track-index-skims-creator: &skim_creator + dependencies: o2-analysis-trackextension + executable: o2-analysis-hf-track-index-skims-creator + tables: [HFSELTRACK, HFTRACKIDXP2, HFTRACKIDXP3] + + o2-analysis-hf-track-index-skims-creator-alice3: &skim_creator_alice3 + dependencies: o2-analysis-alice3-trackextension executable: o2-analysis-hf-track-index-skims-creator tables: [HFSELTRACK, HFTRACKIDXP2, HFTRACKIDXP3] @@ -49,8 +55,6 @@ workflows: o2-analysis-hf-candidate-creator-2prong: &cand_creator dependencies: - o2-analysis-hf-track-index-skims-creator - options: - mc: "--doMC" tables: default: [HFCANDP2BASE, HFCANDP2EXT] mc: [HFCANDP2MCREC, HFCANDP2MCGEN] @@ -61,8 +65,17 @@ workflows: default: [HFCANDP3BASE, HFCANDP3EXT] mc: [HFCANDP3MCREC, HFCANDP3MCGEN] + o2-analysis-hf-candidate-creator-3prong-alice3: + dependencies: + - o2-analysis-hf-track-index-skims-creator-alice3 + tables: + default: [HFCANDP3BASE, HFCANDP3EXT] + mc: [HFCANDP3MCREC, HFCANDP3MCGEN] + o2-analysis-hf-candidate-creator-cascade: <<: *cand_creator + options: + mc: "--doMC" tables: default: [HFCANDCASCBASE, HFCANDCASCEXT] mc: [HFCANDCASCMCREC, HFCANDCASCMCGEN] @@ -126,6 +139,13 @@ workflows: <<: *selector_3prong tables: HFSELLCCAND + o2-analysis-hf-lc-candidate-selector-alice3: + dependencies: + - o2-analysis-hf-candidate-creator-3prong-alice3 + - o2-analysis-pid-tpc-full + - o2-analysis-pid-tof-full + tables: HFSELLCCAND + o2-analysis-hf-xic-topkpi-candidate-selector: <<: *selector_3prong tables: HFSELXICCAND @@ -157,11 +177,11 @@ workflows: o2-analysis-hf-task-d0: &task dependencies: o2-analysis-hf-d0-candidate-selector - options: - mc: "--doMC" o2-analysis-hf-task-jpsi: <<: *task + options: + mc: "--doMC" dependencies: - o2-analysis-hf-jpsi-candidate-selector @@ -170,31 +190,45 @@ workflows: dependencies: o2-analysis-hf-dplus-topikpi-candidate-selector o2-analysis-hf-task-lc: - <<: *task - dependencies: [o2-analysis-hf-lc-candidate-selector, o2-analysis-alice3-trackextension] + dependencies: o2-analysis-hf-lc-candidate-selector + + o2-analysis-hf-task-lc-alice3: + dependencies: o2-analysis-hf-lc-candidate-selector-alice3 o2-analysis-hf-task-xic: <<: *task + options: + mc: "--doMC" dependencies: o2-analysis-hf-xic-topkpi-candidate-selector o2-analysis-hf-task-bplus: <<: *task + options: + mc: "--doMC" dependencies: o2-analysis-hf-bplus-tod0pi-candidate-selector o2-analysis-hf-task-x: <<: *task + options: + mc: "--doMC" dependencies: o2-analysis-hf-x-tojpsipipi-candidate-selector o2-analysis-hf-task-lc-tok0sp: <<: *task + options: + mc: "--doMC" dependencies: o2-analysis-hf-lc-tok0sp-candidate-selector o2-analysis-hf-task-xicc: <<: *task + options: + mc: "--doMC" dependencies: o2-analysis-hf-xicc-topkpipi-candidate-selector o2-analysis-hf-task-chic: <<: *task + options: + mc: "--doMC" dependencies: o2-analysis-hf-chic-tojpsigamma-candidate-selector o2-analysis-hf-task-correlation-ddbar: &taskddbar From 20b6d2cb77600a880d3c2bc216427953466f76e4 Mon Sep 17 00:00:00 2001 From: Anton Alkin Date: Wed, 3 Nov 2021 13:56:18 +0100 Subject: [PATCH 02/11] fixup! Use process switches for 2/3 prong creators, D0 and Lc tasks --- codeHF/dpl-config_run3.json | 4 ++-- codeHF/dpl-config_run5_hf.json | 4 ++-- codeHF/dpl-config_run5_oniaX.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/codeHF/dpl-config_run3.json b/codeHF/dpl-config_run3.json index 73e6c042..609ec0a7 100644 --- a/codeHF/dpl-config_run3.json +++ b/codeHF/dpl-config_run3.json @@ -471,7 +471,7 @@ "100" ] }, - "processMC": "true" + "processMC": "true" }, "hf-task-dplus": { "cutYCandMax": "0.8", @@ -623,7 +623,7 @@ "10.0" ] }, - "processMC": "true" + "processMC": "true" }, "hf-task-xic": { "cutEtaCandMax": "0.8", diff --git a/codeHF/dpl-config_run5_hf.json b/codeHF/dpl-config_run5_hf.json index fbc2d10d..5905f0f9 100644 --- a/codeHF/dpl-config_run5_hf.json +++ b/codeHF/dpl-config_run5_hf.json @@ -559,7 +559,7 @@ "100" ] }, - "processMC": "true" + "processMC": "true" }, "hf-task-dplus": { "cutYCandMax": "0.8", @@ -621,7 +621,7 @@ "36" ] }, - "processMC": "true" + "processMC": "true" }, "hf-task-xic": { "cutEtaCandMax": "-1", diff --git a/codeHF/dpl-config_run5_oniaX.json b/codeHF/dpl-config_run5_oniaX.json index 4965567f..bc9a3cb8 100644 --- a/codeHF/dpl-config_run5_oniaX.json +++ b/codeHF/dpl-config_run5_oniaX.json @@ -480,7 +480,7 @@ "100" ] }, - "processMC": "true" + "processMC": "true" }, "hf-task-dplus": { "cutYCandMax": "0.8", @@ -542,7 +542,7 @@ "36" ] }, - "processMC": "true" + "processMC": "true" }, "hf-task-xic": { "cutEtaCandMax": "0.8", From 0787afc2e5ced9029e4aeb75a10dcae76c433c42 Mon Sep 17 00:00:00 2001 From: Anton Alkin Date: Fri, 5 Nov 2021 16:56:00 +0100 Subject: [PATCH 03/11] Adapt to switches in timestamps and event-selection --- codeHF/config_input.sh | 16 +++++++++++++++- codeHF/config_tasks.sh | 28 ++++++++++++++++++++++++++++ codeHF/dpl-config_run3.json | 14 ++++++++++++++ codeHF/dpl-config_run5_hf.json | 14 ++++++++++++++ codeHF/dpl-config_run5_oniaX.json | 14 ++++++++++++++ codeHF/workflows.yml | 4 ---- 6 files changed, 85 insertions(+), 5 deletions(-) diff --git a/codeHF/config_input.sh b/codeHF/config_input.sh index 1aecfca8..727f83a2 100644 --- a/codeHF/config_input.sh +++ b/codeHF/config_input.sh @@ -25,31 +25,45 @@ JSONRUN5_ONIAX="dpl-config_run5_oniaX.json" JSON="$JSONRUN3" INPUT_FILES="AliESDs.root" # Input file pattern +INPUT_SYS="" +INPUT_RUN="2" case $INPUT_CASE in 1) INPUT_LABEL="Run 2, p-p real LHC17p" - INPUT_DIR="/mnt/data/Run2/LHC17p_pass1_CENT_woSDD/282341";; + INPUT_DIR="/mnt/data/Run2/LHC17p_pass1_CENT_woSDD/282341" + INPUT_SYS="pp" + INPUT_RUN="2";; 2) INPUT_LABEL="Run 2, p-p MC LHC17p" INPUT_DIR="/mnt/data/Run2/LHC18a4a2_cent/282099" + INPUT_SYS="pp" + INPUT_RUN="2" ISMC=1;; 3) INPUT_LABEL="Run 2, p-p MC LHC17p" INPUT_DIR="/mnt/data/Run2/LHC18a4a2_cent/282341" + INPUT_SYS="pp" + INPUT_RUN="2" ISMC=1;; 4) INPUT_LABEL="Run 2, Pb-Pb real LHC15o" INPUT_DIR="/mnt/data/Run2/LHC15o/246751/pass1" + INPUT_SYS="PbPb" + INPUT_RUN="2" TRIGGERSTRINGRUN2="CV0L7-B-NOPF-CENT" TRIGGERBITRUN3=5;; #FIXME 5) INPUT_LABEL="Run 2, Pb-Pb MC LHC15o" INPUT_DIR="/mnt/data/Run2/LHC15k1a3/246391" + INPUT_SYS="PbPb" + INPUT_RUN="2" ISMC=1;; 6) INPUT_LABEL="Run 2, p-p MC LHC16p, dedicated Ξc" INPUT_DIR="/mnt/data/Run2/LHC19g6f3/264347" + INPUT_SYS="pp" + INPUT_RUN="2" ISMC=1;; 7) INPUT_LABEL="Run 5, p-p MC 14 TeV MB, Layout v1, HF analysis" diff --git a/codeHF/config_tasks.sh b/codeHF/config_tasks.sh index 2503ba10..34e3e663 100644 --- a/codeHF/config_tasks.sh +++ b/codeHF/config_tasks.sh @@ -125,13 +125,41 @@ function AdjustJson { JSON="$JSON_EDIT" fi + # Set Run2/3/5 and MC switches if [[ $ISMC -eq 1 ]] then MsgWarn "\nEnabling MC" ReplaceString "\"processMC\": \"false\"" "\"processMC\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON." + ReplaceString "\"isMC\": \"false\"" "\"isMC\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON." + if [[ "$INPUT_RUN" = "2" ]] + then + ReplaceString "\"isRun2MC\": \"false\"" "\"isRun2MC\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON." + fi else MsgWarn "\nUsing data" ReplaceString "\"processMC\": \"true\"" "\"processMC\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON." + ReplaceString "\"isMC\": \"true\"" "\"isMC\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON." + if [[ "$INPUT_RUN" = "2" ]] + then + ReplaceString "\"isRun2MC\": \"true\"" "\"isRun2MC\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON." + fi + fi + if [[ -n "$INPUT_SYS" ]] + then + ReplaceString "\"syst\": \"pp\"" "\"syst\": \"$INPUT_SYS\"" "$JSON" || ErrExit "Failed to edit $JSON." + fi + if [[ -n "$INPUT_RUN" ]] + then + if [[ $INPUT_RUN -eq 2 ]] + then + ReplaceString "\"processRun2\": \"false\"" "\"processRun2\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON." + ReplaceString "\"processRun3\": \"true\"" "\"processRun3\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON." + fi + if [[ $INPUT_RUN -eq 3 ]] + then + ReplaceString "\"processRun2\": \"true\"" "\"processRun2\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON." + ReplaceString "\"processRun3\": \"false\"" "\"processRun3\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON." + fi fi # Enable D0 selection. diff --git a/codeHF/dpl-config_run3.json b/codeHF/dpl-config_run3.json index 609ec0a7..395d99b1 100644 --- a/codeHF/dpl-config_run3.json +++ b/codeHF/dpl-config_run3.json @@ -6,6 +6,20 @@ "step-value-enumeration": "1", "aod-file": "@list_o2.txt" }, + "o2-analysis-timestamp": { + "isRun2MC": "true" + }, + "bc-selection-task": { + "processRun2": "true", + "processRun3": "false" + }, + "event-selection-task": { + "syst": "pp", + "muonSelection": "0", + "isMC": "true", + "processRun2": "true", + "processRun3": "false" + }, "hf-tag-sel-collisions": { "fillHistograms": "true", "xVertexMin": "-100", diff --git a/codeHF/dpl-config_run5_hf.json b/codeHF/dpl-config_run5_hf.json index 5905f0f9..5594abc3 100644 --- a/codeHF/dpl-config_run5_hf.json +++ b/codeHF/dpl-config_run5_hf.json @@ -6,6 +6,20 @@ "step-value-enumeration": "1", "aod-file": "@list_o2.txt" }, + "o2-analysis-timestamp": { + "isRun2MC": "false" + }, + "bc-selection-task": { + "processRun2": "false", + "processRun3": "true" + }, + "event-selection-task": { + "syst": "pp", + "muonSelection": "0", + "isMC": "true", + "processRun2": "false", + "processRun3": "true" + }, "hf-tag-sel-collisions": { "fillHistograms": "true", "xVertexMin": "-100", diff --git a/codeHF/dpl-config_run5_oniaX.json b/codeHF/dpl-config_run5_oniaX.json index bc9a3cb8..8d95b4de 100644 --- a/codeHF/dpl-config_run5_oniaX.json +++ b/codeHF/dpl-config_run5_oniaX.json @@ -6,6 +6,20 @@ "step-value-enumeration": "1", "aod-file": "@list_o2.txt" }, + "o2-analysis-timestamp": { + "isRun2MC": "false" + }, + "bc-selection-task": { + "processRun2": "false", + "processRun3": "true" + }, + "event-selection-task": { + "syst": "pp", + "muonSelection": "0", + "isMC": "true", + "processRun2": "false", + "processRun3": "true" + }, "hf-tag-sel-collisions": { "fillHistograms": "true", "xVertexMin": "-100", diff --git a/codeHF/workflows.yml b/codeHF/workflows.yml index 3e94d999..2bdf86c0 100644 --- a/codeHF/workflows.yml +++ b/codeHF/workflows.yml @@ -13,12 +13,8 @@ workflows: # Event selection o2-analysis-timestamp: - options: - mc: "--isMC 1" o2-analysis-event-selection: - options: - mc: "--isMC 1" # Skimming From e1cbbdfdb42d116fd481c4c9a93e7ed27891fb36 Mon Sep 17 00:00:00 2001 From: Anton Alkin Date: Sat, 6 Nov 2021 10:51:02 +0100 Subject: [PATCH 04/11] fix yml; add more Run 3 switch adjustments --- codeHF/config_tasks.sh | 3 +++ codeHF/dpl-config_run3.json | 4 +++- codeHF/dpl-config_run5_hf.json | 4 +++- codeHF/dpl-config_run5_oniaX.json | 4 +++- codeHF/workflows.yml | 4 ++-- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/codeHF/config_tasks.sh b/codeHF/config_tasks.sh index 34e3e663..6163ef6f 100644 --- a/codeHF/config_tasks.sh +++ b/codeHF/config_tasks.sh @@ -159,6 +159,9 @@ function AdjustJson { then ReplaceString "\"processRun2\": \"true\"" "\"processRun2\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON." ReplaceString "\"processRun3\": \"false\"" "\"processRun3\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON." + ReplaceString "\"processTrigSel\": \"true\"" "\"processTrigSel\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON." + ReplaceString "\"processNoTrigSel\": \"false\"" "\"processNoTrigSel\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON." + ReplaceString "\"doCutQuality\": \"true\"" "\"doCutQuality\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON." fi fi diff --git a/codeHF/dpl-config_run3.json b/codeHF/dpl-config_run3.json index 395d99b1..60e905f6 100644 --- a/codeHF/dpl-config_run3.json +++ b/codeHF/dpl-config_run3.json @@ -30,7 +30,9 @@ "zVertexMax": "100", "nContribMin": "0", "chi2Max": "0", - "triggerClassName": "kINT7" + "triggerClassName": "kINT7", + "processTrigSel": "true", + "processNoTrigSel": "false" }, "hf-tag-sel-tracks": { "fillHistograms": "true", diff --git a/codeHF/dpl-config_run5_hf.json b/codeHF/dpl-config_run5_hf.json index 5594abc3..ba27fb02 100644 --- a/codeHF/dpl-config_run5_hf.json +++ b/codeHF/dpl-config_run5_hf.json @@ -30,7 +30,9 @@ "zVertexMax": "100", "nContribMin": "0", "chi2Max": "0", - "triggerClassName": "" + "triggerClassName": "", + "processTrigSel": "false", + "processNoTrigSel": "true" }, "hf-tag-sel-tracks": { "fillHistograms": "true", diff --git a/codeHF/dpl-config_run5_oniaX.json b/codeHF/dpl-config_run5_oniaX.json index 8d95b4de..b60f16df 100644 --- a/codeHF/dpl-config_run5_oniaX.json +++ b/codeHF/dpl-config_run5_oniaX.json @@ -30,7 +30,9 @@ "zVertexMax": "100", "nContribMin": "0", "chi2Max": "0", - "triggerClassName": "" + "triggerClassName": "", + "processTrigSel": "false", + "processNoTrigSel": "true" }, "hf-tag-sel-tracks": { "fillHistograms": "true", diff --git a/codeHF/workflows.yml b/codeHF/workflows.yml index 2bdf86c0..27506ba2 100644 --- a/codeHF/workflows.yml +++ b/codeHF/workflows.yml @@ -12,9 +12,9 @@ workflows: # Event selection - o2-analysis-timestamp: + o2-analysis-timestamp: {} - o2-analysis-event-selection: + o2-analysis-event-selection: {} # Skimming From 7fb50c44520ca7e4759eb46fef18d3e75d0c6895 Mon Sep 17 00:00:00 2001 From: Anton Alkin Date: Sat, 6 Nov 2021 13:45:22 +0100 Subject: [PATCH 05/11] normalize comparisons in config_tasks --- codeHF/config_tasks.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/codeHF/config_tasks.sh b/codeHF/config_tasks.sh index 6163ef6f..01b5aa99 100644 --- a/codeHF/config_tasks.sh +++ b/codeHF/config_tasks.sh @@ -126,12 +126,12 @@ function AdjustJson { fi # Set Run2/3/5 and MC switches - if [[ $ISMC -eq 1 ]] + if [ $ISMC -eq 1 ] then MsgWarn "\nEnabling MC" ReplaceString "\"processMC\": \"false\"" "\"processMC\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON." ReplaceString "\"isMC\": \"false\"" "\"isMC\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON." - if [[ "$INPUT_RUN" = "2" ]] + if [ $INPUT_RUN -eq 2 ] then ReplaceString "\"isRun2MC\": \"false\"" "\"isRun2MC\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON." fi @@ -139,23 +139,23 @@ function AdjustJson { MsgWarn "\nUsing data" ReplaceString "\"processMC\": \"true\"" "\"processMC\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON." ReplaceString "\"isMC\": \"true\"" "\"isMC\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON." - if [[ "$INPUT_RUN" = "2" ]] + if [ $INPUT_RUN -eq 2 ] then ReplaceString "\"isRun2MC\": \"true\"" "\"isRun2MC\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON." fi fi - if [[ -n "$INPUT_SYS" ]] + if [ -n "$INPUT_SYS" ] then ReplaceString "\"syst\": \"pp\"" "\"syst\": \"$INPUT_SYS\"" "$JSON" || ErrExit "Failed to edit $JSON." fi - if [[ -n "$INPUT_RUN" ]] + if [ -n "$INPUT_RUN" ] then - if [[ $INPUT_RUN -eq 2 ]] + if [ $INPUT_RUN -eq 2 ] then ReplaceString "\"processRun2\": \"false\"" "\"processRun2\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON." ReplaceString "\"processRun3\": \"true\"" "\"processRun3\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON." fi - if [[ $INPUT_RUN -eq 3 ]] + if [ $INPUT_RUN -eq 3 ] then ReplaceString "\"processRun2\": \"true\"" "\"processRun2\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON." ReplaceString "\"processRun3\": \"false\"" "\"processRun3\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON." From 75d667c06e116f583f24fc98997981c3b8775700 Mon Sep 17 00:00:00 2001 From: Anton Alkin Date: Sat, 6 Nov 2021 13:48:51 +0100 Subject: [PATCH 06/11] add messages --- codeHF/config_tasks.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/codeHF/config_tasks.sh b/codeHF/config_tasks.sh index 01b5aa99..e2d76042 100644 --- a/codeHF/config_tasks.sh +++ b/codeHF/config_tasks.sh @@ -152,11 +152,13 @@ function AdjustJson { then if [ $INPUT_RUN -eq 2 ] then + MsgWarn "\nUsing Run 2" ReplaceString "\"processRun2\": \"false\"" "\"processRun2\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON." ReplaceString "\"processRun3\": \"true\"" "\"processRun3\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON." fi if [ $INPUT_RUN -eq 3 ] then + MsgWarn "\nUsing Run 3" ReplaceString "\"processRun2\": \"true\"" "\"processRun2\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON." ReplaceString "\"processRun3\": \"false\"" "\"processRun3\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON." ReplaceString "\"processTrigSel\": \"true\"" "\"processTrigSel\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON." From 5685fdc8835c004196544b1f9210ab1bd3dd9756 Mon Sep 17 00:00:00 2001 From: Anton Alkin Date: Sat, 6 Nov 2021 14:30:49 +0100 Subject: [PATCH 07/11] add missing track-extension to JSON --- codeHF/dpl-config_run3.json | 4 ++++ codeHF/dpl-config_run5_hf.json | 4 ++++ codeHF/dpl-config_run5_oniaX.json | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/codeHF/dpl-config_run3.json b/codeHF/dpl-config_run3.json index 60e905f6..ee00ee65 100644 --- a/codeHF/dpl-config_run3.json +++ b/codeHF/dpl-config_run3.json @@ -20,6 +20,10 @@ "processRun2": "true", "processRun3": "false" }, + "track-extension": { + "processRun2": "true", + "processRun3": "false" + }, "hf-tag-sel-collisions": { "fillHistograms": "true", "xVertexMin": "-100", diff --git a/codeHF/dpl-config_run5_hf.json b/codeHF/dpl-config_run5_hf.json index ba27fb02..f133bbc2 100644 --- a/codeHF/dpl-config_run5_hf.json +++ b/codeHF/dpl-config_run5_hf.json @@ -20,6 +20,10 @@ "processRun2": "false", "processRun3": "true" }, + "track-extension": { + "processRun2": "false", + "processRun3": "true" + }, "hf-tag-sel-collisions": { "fillHistograms": "true", "xVertexMin": "-100", diff --git a/codeHF/dpl-config_run5_oniaX.json b/codeHF/dpl-config_run5_oniaX.json index b60f16df..7e86437d 100644 --- a/codeHF/dpl-config_run5_oniaX.json +++ b/codeHF/dpl-config_run5_oniaX.json @@ -20,6 +20,10 @@ "processRun2": "false", "processRun3": "true" }, + "track-extension": { + "processRun2": "false", + "processRun3": "true" + }, "hf-tag-sel-collisions": { "fillHistograms": "true", "xVertexMin": "-100", From c97bc0f1197660830c5b24368e1fbf3075966979 Mon Sep 17 00:00:00 2001 From: Anton Alkin Date: Sat, 6 Nov 2021 14:33:38 +0100 Subject: [PATCH 08/11] comply with linter --- codeHF/config_tasks.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/codeHF/config_tasks.sh b/codeHF/config_tasks.sh index e2d76042..b8d96cec 100644 --- a/codeHF/config_tasks.sh +++ b/codeHF/config_tasks.sh @@ -126,12 +126,12 @@ function AdjustJson { fi # Set Run2/3/5 and MC switches - if [ $ISMC -eq 1 ] + if [ "$ISMC" -eq 1 ] then MsgWarn "\nEnabling MC" ReplaceString "\"processMC\": \"false\"" "\"processMC\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON." ReplaceString "\"isMC\": \"false\"" "\"isMC\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON." - if [ $INPUT_RUN -eq 2 ] + if [ "$INPUT_RUN" -eq 2 ] then ReplaceString "\"isRun2MC\": \"false\"" "\"isRun2MC\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON." fi @@ -139,7 +139,7 @@ function AdjustJson { MsgWarn "\nUsing data" ReplaceString "\"processMC\": \"true\"" "\"processMC\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON." ReplaceString "\"isMC\": \"true\"" "\"isMC\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON." - if [ $INPUT_RUN -eq 2 ] + if [ "$INPUT_RUN" -eq 2 ] then ReplaceString "\"isRun2MC\": \"true\"" "\"isRun2MC\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON." fi @@ -150,13 +150,13 @@ function AdjustJson { fi if [ -n "$INPUT_RUN" ] then - if [ $INPUT_RUN -eq 2 ] + if [ "$INPUT_RUN" -eq 2 ] then MsgWarn "\nUsing Run 2" ReplaceString "\"processRun2\": \"false\"" "\"processRun2\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON." ReplaceString "\"processRun3\": \"true\"" "\"processRun3\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON." fi - if [ $INPUT_RUN -eq 3 ] + if [ "$INPUT_RUN" -eq 3 ] then MsgWarn "\nUsing Run 3" ReplaceString "\"processRun2\": \"true\"" "\"processRun2\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON." From cedfdd0235019a1f62e1fc24a59a068536f2e612 Mon Sep 17 00:00:00 2001 From: Anton Alkin Date: Sat, 6 Nov 2021 16:02:19 +0100 Subject: [PATCH 09/11] remove extra quotes --- codeHF/config_input.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/codeHF/config_input.sh b/codeHF/config_input.sh index 727f83a2..f4ed34c6 100644 --- a/codeHF/config_input.sh +++ b/codeHF/config_input.sh @@ -26,44 +26,44 @@ JSON="$JSONRUN3" INPUT_FILES="AliESDs.root" # Input file pattern INPUT_SYS="" -INPUT_RUN="2" +INPUT_RUN=2 case $INPUT_CASE in 1) INPUT_LABEL="Run 2, p-p real LHC17p" INPUT_DIR="/mnt/data/Run2/LHC17p_pass1_CENT_woSDD/282341" INPUT_SYS="pp" - INPUT_RUN="2";; + INPUT_RUN=2;; 2) INPUT_LABEL="Run 2, p-p MC LHC17p" INPUT_DIR="/mnt/data/Run2/LHC18a4a2_cent/282099" INPUT_SYS="pp" - INPUT_RUN="2" + INPUT_RUN=2 ISMC=1;; 3) INPUT_LABEL="Run 2, p-p MC LHC17p" INPUT_DIR="/mnt/data/Run2/LHC18a4a2_cent/282341" INPUT_SYS="pp" - INPUT_RUN="2" + INPUT_RUN=2 ISMC=1;; 4) INPUT_LABEL="Run 2, Pb-Pb real LHC15o" INPUT_DIR="/mnt/data/Run2/LHC15o/246751/pass1" INPUT_SYS="PbPb" - INPUT_RUN="2" + INPUT_RUN=2 TRIGGERSTRINGRUN2="CV0L7-B-NOPF-CENT" TRIGGERBITRUN3=5;; #FIXME 5) INPUT_LABEL="Run 2, Pb-Pb MC LHC15o" INPUT_DIR="/mnt/data/Run2/LHC15k1a3/246391" INPUT_SYS="PbPb" - INPUT_RUN="2" + INPUT_RUN=2 ISMC=1;; 6) INPUT_LABEL="Run 2, p-p MC LHC16p, dedicated Ξc" INPUT_DIR="/mnt/data/Run2/LHC19g6f3/264347" INPUT_SYS="pp" - INPUT_RUN="2" + INPUT_RUN=2 ISMC=1;; 7) INPUT_LABEL="Run 5, p-p MC 14 TeV MB, Layout v1, HF analysis" From 27d3891337f1f8064fa9db9ad7194b84626bf4f9 Mon Sep 17 00:00:00 2001 From: Anton Alkin Date: Sat, 6 Nov 2021 16:17:30 +0100 Subject: [PATCH 10/11] add comments --- codeHF/config_tasks.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/codeHF/config_tasks.sh b/codeHF/config_tasks.sh index b8d96cec..1b4292de 100644 --- a/codeHF/config_tasks.sh +++ b/codeHF/config_tasks.sh @@ -161,8 +161,10 @@ function AdjustJson { MsgWarn "\nUsing Run 3" ReplaceString "\"processRun2\": \"true\"" "\"processRun2\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON." ReplaceString "\"processRun3\": \"false\"" "\"processRun3\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON." + # do not use trigger selection for Run 3 ReplaceString "\"processTrigSel\": \"true\"" "\"processTrigSel\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON." ReplaceString "\"processNoTrigSel\": \"false\"" "\"processNoTrigSel\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON." + # do not perform track quality cuts for Run 3 until they are updated ReplaceString "\"doCutQuality\": \"true\"" "\"doCutQuality\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON." fi fi From 5aaae942843a7734dc1948325af23d8595113017 Mon Sep 17 00:00:00 2001 From: Anton Alkin Date: Fri, 12 Nov 2021 15:59:02 +0100 Subject: [PATCH 11/11] fix timestamp task name in JSON --- codeHF/dpl-config_run3.json | 2 +- codeHF/dpl-config_run5_hf.json | 2 +- codeHF/dpl-config_run5_oniaX.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/codeHF/dpl-config_run3.json b/codeHF/dpl-config_run3.json index ee00ee65..edfe0f2f 100644 --- a/codeHF/dpl-config_run3.json +++ b/codeHF/dpl-config_run3.json @@ -6,7 +6,7 @@ "step-value-enumeration": "1", "aod-file": "@list_o2.txt" }, - "o2-analysis-timestamp": { + "timestamp-task": { "isRun2MC": "true" }, "bc-selection-task": { diff --git a/codeHF/dpl-config_run5_hf.json b/codeHF/dpl-config_run5_hf.json index f133bbc2..edae0afd 100644 --- a/codeHF/dpl-config_run5_hf.json +++ b/codeHF/dpl-config_run5_hf.json @@ -6,7 +6,7 @@ "step-value-enumeration": "1", "aod-file": "@list_o2.txt" }, - "o2-analysis-timestamp": { + "timestamp-task": { "isRun2MC": "false" }, "bc-selection-task": { diff --git a/codeHF/dpl-config_run5_oniaX.json b/codeHF/dpl-config_run5_oniaX.json index 7e86437d..0a77241b 100644 --- a/codeHF/dpl-config_run5_oniaX.json +++ b/codeHF/dpl-config_run5_oniaX.json @@ -6,7 +6,7 @@ "step-value-enumeration": "1", "aod-file": "@list_o2.txt" }, - "o2-analysis-timestamp": { + "timestamp-task": { "isRun2MC": "false" }, "bc-selection-task": {