From 44d8163c75cd2b1147c617fe20c86cc6215fd47c Mon Sep 17 00:00:00 2001 From: David Rohr Date: Wed, 12 Mar 2025 11:22:08 +0100 Subject: [PATCH] Revert "Move some part back to setenv.sh" This reverts commit a0c44bc6c1330e84deee2813a7e3bb2343127a62. --- DATA/common/setenv.sh | 3 --- DATA/production/configurations/asyncReco/setenv_extra.sh | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/DATA/common/setenv.sh b/DATA/common/setenv.sh index 3cefedeca..2f11efdf8 100755 --- a/DATA/common/setenv.sh +++ b/DATA/common/setenv.sh @@ -169,9 +169,6 @@ ITSMFT_STROBES="" [[ ! -z ${ITS_STROBE:-} ]] && ITSMFT_STROBES+="ITSAlpideParam.roFrameLengthInBC=$ITS_STROBE;" [[ ! -z ${MFT_STROBE:-} ]] && ITSMFT_STROBES+="MFTAlpideParam.roFrameLengthInBC=$MFT_STROBE;" -MFTMCH_NCANDIDATES_OPT= -[[ ! -z ${MUON_MATCHING_NCANDIDATES:-} ]] && MFTMCH_NCANDIDATES_OPT+="FwdMatching.saveMode=3;FwdMatching.nCandidates=${MUON_MATCHING_NCANDIDATES};" - # Set active reconstruction steps (defaults added according to SYNCMODE) for i in `echo $LIST_OF_GLORECO | sed "s/,/ /g"`; do diff --git a/DATA/production/configurations/asyncReco/setenv_extra.sh b/DATA/production/configurations/asyncReco/setenv_extra.sh index 067c66cd3..987819c2f 100644 --- a/DATA/production/configurations/asyncReco/setenv_extra.sh +++ b/DATA/production/configurations/asyncReco/setenv_extra.sh @@ -608,6 +608,10 @@ if [[ -z "${MUON_MATCHING_NCANDIDATES:-}" ]]; then if [[ $BEAMTYPE == "pp" ]]; then MUON_MATCHING_NCANDIDATES=5; fi if [[ $BEAMTYPE == "PbPb" ]]; then MUON_MATCHING_NCANDIDATES=20; fi fi +if [[ "x${MUON_MATCHING_NCANDIDATES}" != "x0" ]]; then + export CONFIG_EXTRA_PROCESS_o2_globalfwd_matcher_workflow+=";FwdMatching.saveMode=3;FwdMatching.nCandidates=${MUON_MATCHING_NCANDIDATES};" +fi + # possibly adding calib steps as done online # could be done better, so that more could be enabled in one go