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
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class SVertexHypothesis

bool check(float p2Pos, float p2Neg, float p2V0, float ptV0) const
{ // check if given mass and pt is matching to hypothesis
return check(calcMass(p2Pos, p2Neg, p2V0), ptV0);
return mPars[SigmaM] > 0 && check(calcMass(p2Pos, p2Neg, p2V0), ptV0);
}
bool check(float mass, float pt) const
{ // check if given mass and pt is matching to hypothesis
Expand Down Expand Up @@ -151,7 +151,7 @@ class SVertex3Hypothesis

bool check(float p2Pos, float p2Neg, float p2Bach, float p2Tot, float ptV0) const
{ // check if given mass and pt is matching to hypothesis
return check(calcMass(p2Pos, p2Neg, p2Bach, p2Tot), ptV0);
return mPars[SigmaM] > 0 && check(calcMass(p2Pos, p2Neg, p2Bach, p2Tot), ptV0);
}

bool check(float mass, float pt) const
Expand Down
10 changes: 9 additions & 1 deletion prodtests/full-system-test/dpl-workflow.sh
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ TPC_CORR_OPT=
TPC_CORR_KEY=
INTERACTION_TAG_CONFIG_KEY=
EVE_OPT=" --jsons-folder $EDJSONS_DIR"
: ${SECVTXK0ONLY:=}
: ${EVE_CONFIG:=}
: ${STRTRACKING:=}
: ${ITSEXTRAERR:=}
Expand Down Expand Up @@ -591,7 +592,14 @@ has_detector_reco ITS && has_detector_gpu ITS TPC && [[ -z "$DISABLE_ROOT_OUTPUT
has_detector_matching PRIMVTX && [[ ! -z "$VERTEXING_SOURCES" ]] && [[ $GLOBAL_READER_NEEDS_PV != 1 ]] && add_W o2-primary-vertexing-workflow "$DISABLE_MC $DISABLE_ROOT_INPUT $DISABLE_ROOT_OUTPUT $PVERTEX_CONFIG --pipeline $(get_N primary-vertexing MATCH REST 1 PRIMVTX),$(get_N pvertex-track-matching MATCH REST 1 PRIMVTXMATCH)" "${PVERTEXING_CONFIG_KEY};${INTERACTION_TAG_CONFIG_KEY};"

if [[ $BEAMTYPE != "cosmic" ]] && has_detectors_reco ITS && has_detector_matching SECVTX && [[ ! -z "$SVERTEXING_SOURCES" ]]; then
[[ $GLOBAL_READER_NEEDS_SV != 1 ]] && add_W o2-secondary-vertexing-workflow "$DISABLE_MC $STRTRACKING $DISABLE_ROOT_INPUT $DISABLE_ROOT_OUTPUT $TPC_CORR_OPT --vertexing-sources $SVERTEXING_SOURCES --threads $SVERTEX_THREADS --pipeline $(get_N secondary-vertexing MATCH REST $SVERTEX_THREADS SECVTX)" "$TPC_CORR_KEY"
: ${REDUCESV_OPT:=}
: ${REDUCESV_CONF:=}
if [[ $SYNCMODE == 1 ]] && [[ $SECVTXK0ONLY != 0 ]] ; then
: ${STRTRACKING:=" --disable-strangeness-tracker "}
: ${REDUCESV_OPT:=" --disable-cascade-finder --disable-3body-finder "}
: ${REDUCESV_CONF:="svertexer.pidCutsPhoton[0]=-1;svertexer.pidCutsLambda[0]=-1;svertexer.pidCutsHTriton[0]=-1;svertexer.pidCutsHhydrog4[0]=-1;"}
fi
[[ $GLOBAL_READER_NEEDS_SV != 1 ]] && add_W o2-secondary-vertexing-workflow "$DISABLE_MC $STRTRACKING $REDUCESV_OPT $DISABLE_ROOT_INPUT $DISABLE_ROOT_OUTPUT $TPC_CORR_OPT --vertexing-sources $SVERTEXING_SOURCES --threads $SVERTEX_THREADS --pipeline $(get_N secondary-vertexing MATCH REST $SVERTEX_THREADS SECVTX)" "$TPC_CORR_KEY;$REDUCESV_CONF"
SECTVTX_ON="1"
else
SECTVTX_ON="0"
Expand Down