Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions DATA/common/setenv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@aferrero2707 : Sorry, but this line must stay in setenv.sh, since this one is also used in online :(.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@davidrohr why you say this is needed for online as well? AFAIK we are not using the option for multiple candidates in online.

In the previous PR I have put the lines in setenv.sh because I was not aware of the setenv_extra.sh specific for async processing...

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, ok, I didn't know that.
I thought also MFTMCH_NCANDIDATES_OPT must be set for sync, since it is used.
But it is actually used like [[ ! -z ${MFTMCH_NCANDIDATES_OPT:-} ]] && , so ok if unset.
I'll revert my moving of the fail. Thx for checking and sorry for the confusion.

[[ ! -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
Expand Down
13 changes: 13 additions & 0 deletions DATA/production/configurations/asyncReco/setenv_extra.sh
Original file line number Diff line number Diff line change
Expand Up @@ -583,6 +583,19 @@ if [[ $BEAMTYPE == "pp" ]]; then
export CONFIG_EXTRA_PROCESS_o2_mch_reco_workflow+=";MCHTracking.chamberResolutionX=0.4;MCHTracking.chamberResolutionY=0.4;MCHTracking.sigmaCutForTracking=7;MCHTracking.sigmaCutForImprovement=6"
fi

# ad-hoc settings for MFT-MCH matching
# Number of MFT-MCH matching candidates to be stored in AO2Ds
# Setting MUON_MATCHING_NCANDIDATES=0 disables the storage of multiple candidates
if [[ -z "${MUON_MATCHING_NCANDIDATES:-}" ]]; then
MUON_MATCHING_NCANDIDATES=0 # disable the saving of nCandidated by default
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
if [[ $ADD_CALIB == "1" ]]; then
Expand Down