Skip to content

[PWGEM] Add Photon-Finder, change conversion point calculation and change deduplication logic - #18412

Merged
jokonig merged 1 commit into
AliceO2Group:masterfrom
Steffimro:photon-builder-finder-resolver
Oct 22, 2026
Merged

jokonig merged 1 commit into
AliceO2Group:masterfrom
Steffimro:photon-builder-finder-resolver

Conversation

@Steffimro

Copy link
Copy Markdown
Contributor

New options

  • dedup_group.groupMatchingScoreThreshold (mode 2): quality-weighted objective, so that two poor candidates can no longer outweigh one good photon.
  • dedup_group.gapWeight, gapScale: helix-circle gap of the legs as an extra term of the dedup score.
  • dedup_group.useCosPA3D: 3D cosPA instead of the xy cosPA in the candidate (score and cosPA cut).
  • dedup_group.resolveSplitLegs, splitLegMaxDTgl, splitLegMaxChi2: of two stored photons that use two pieces of one track, keep the better one.
  • recovery_group.runFinder + finder* cuts: photon finder for free legs without ITS of the whole DF; its candidates enter the dedup (v0Id = -1).
  • recovery_group.finderFreeCollinearLegs: legs of collinear candidate pairs stay available to the finder.
  • recovery_group.runSwapResolver, swapMaxQ, swapMaxConvDist: for close stored photon pairs, fit the crossed leg pairing (no AP cut) and keep the pairing with the lower summed score.
  • dedup_group.cfgExtendedDiag (MC only): truth of the stored photons, close photon pairs, collision copies and resolver decisions.
  • v0cut_group.conversionPointMethod (default 0 = helix touching point as in older version). With 1, both legs are propagated inward through the material in 1 cm steps, and the conversion point is the radius where a common point and a common direction fit best. Without a valid minimum, the touching point is used.

@github-actions github-actions Bot added pwgem photon Photon and neutral meson PAG label labels Oct 22, 2026
@github-actions github-actions Bot changed the title Add Photon-Finder, change conversion point calculation and change deduplication logic [PWGEM] Add Photon-Finder, change conversion point calculation and change deduplication logic Oct 22, 2026
@github-actions

Copy link
Copy Markdown

O2 linter results: ❌ 0 errors, ⚠️ 107 warnings, 🔕 29 disabled

@Steffimro
Steffimro force-pushed the photon-builder-finder-resolver branch from 748c05e to 0418a9f Compare October 22, 2026 13:16
@Steffimro
Steffimro marked this pull request as ready for review October 22, 2026 13:27
@alibuild

Copy link
Copy Markdown
Collaborator

Error while checking build/O2Physics/code-check for 0418a9f at 2026-10-22 15:36:

## sw/BUILD/O2Physics-code-check-latest/log
--
========== List of issues found ==========
++ echo 'To reproduce the results below locally, run: '\''aliBuild build O2Physics-code-check -e ALIBUILD_BASE_HASH=upstream/master'\''.'
To reproduce the results below locally, run: 'aliBuild build O2Physics-code-check -e ALIBUILD_BASE_HASH=upstream/master'.
++ echo 'To apply all automatic fixes, add the '\''-e O2PHYSICS_CHECKER_FIX=1'\'' option.'
To apply all automatic fixes, add the '-e O2PHYSICS_CHECKER_FIX=1' option.
++ echo 'See the documentation for more details at: <https://aliceo2group.github.io/analysis-framework/docs/tools/#running-with-o2physics-code-check>.'
See the documentation for more details at: <https://aliceo2group.github.io/analysis-framework/docs/tools/#running-with-o2physics-code-check>.
++ echo 'Found 11 errors and 13 warnings.'
Found 11 errors and 13 warnings.
++ [[ 11 -gt 0 ]]
++ cat /sw/BUILD/a205e23b423215fdb574ad8f8ddd5fbf98a8f1cd/O2Physics-code-check/errors.txt
PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.h:544:128: error: arithmetic between enumeration type 'o2::pwgem::photonmeson::FinderStep' and floating-point type 'float' is deprecated [clang-diagnostic-deprecated-enum-float-conversion,-warnings-as-errors]
PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.h:1315:77: error: no header providing "o2::aod::track::TrackTimeAsym" is directly included [misc-include-cleaner,-warnings-as-errors]
PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.h:1329:64: error: no header providing "o2::aod::track::TrackTimeResIsRange" is directly included [misc-include-cleaner,-warnings-as-errors]
PWGEM/PhotonMeson/Utils/ConversionPointProfile.h:77:47: error: no header providing "o2::track::DirInward" is directly included [misc-include-cleaner,-warnings-as-errors]
PWGEM/PhotonMeson/Utils/ConversionPointProfile.h:116:65: error: no header providing "ROOT::Math::MatRepSym" is directly included [misc-include-cleaner,-warnings-as-errors]
PWGEM/PhotonMeson/Utils/ConversionPointProfile.h:129:50: error: no header providing "ROOT::Math::Similarity" is directly included [misc-include-cleaner,-warnings-as-errors]
PWGEM/PhotonMeson/Utils/PCMUtilities.h:38:1: error: included header algorithm is not used directly [misc-include-cleaner,-warnings-as-errors]
PWGEM/PhotonMeson/Utils/PCMUtilities.h:329:55: error: no header providing "o2::aod::track::TPCSideA" is directly included [misc-include-cleaner,-warnings-as-errors]
PWGEM/PhotonMeson/Utils/PCMUtilities.h:329:82: error: no header providing "o2::aod::track::TPCSideC" is directly included [misc-include-cleaner,-warnings-as-errors]
PWGEM/PhotonMeson/Utils/PCMUtilities.h:376:43: error: no header providing "o2::track::TrackPar" is directly included [misc-include-cleaner,-warnings-as-errors]
PWGEM/PhotonMeson/Utils/PCMUtilities.h:440:41: error: no header providing "ROOT::Math::Similarity" is directly included [misc-include-cleaner,-warnings-as-errors]
++ [[ 13 -gt 0 ]]
++ cat /sw/BUILD/a205e23b423215fdb574ad8f8ddd5fbf98a8f1cd/O2Physics-code-check/warnings.txt
PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.h:1152:20: warning: use designated initializer list to initialize 'PairFit' [modernize-use-designated-initializers]
PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.h:1276:19: warning: use designated initializer list to initialize 'CandKey' [modernize-use-designated-initializers]
PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.h:1613:33: warning: use designated initializer list to initialize 'CandKey' [modernize-use-designated-initializers]
PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.h:1614:33: warning: use designated initializer list to initialize 'CandKey' [modernize-use-designated-initializers]
PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.h:1709:43: warning: use designated initializer list to initialize 'CandKey' [modernize-use-designated-initializers]
PWGEM/PhotonMeson/Utils/V0DedupUtilities.h:274:3: warning: use designated initializer list to initialize 'FinderScoreTable' [modernize-use-designated-initializers]
PWGEM/PhotonMeson/Utils/V0DedupUtilities.h:275:3: warning: use designated initializer list to initialize 'FinderScoreTable' [modernize-use-designated-initializers]
PWGEM/PhotonMeson/Utils/V0DedupUtilities.h:276:3: warning: use designated initializer list to initialize 'FinderScoreTable' [modernize-use-designated-initializers]
PWGEM/PhotonMeson/Utils/V0DedupUtilities.h:277:3: warning: use designated initializer list to initialize 'FinderScoreTable' [modernize-use-designated-initializers]
PWGEM/PhotonMeson/Utils/V0DedupUtilities.h:278:3: warning: use designated initializer list to initialize 'FinderScoreTable' [modernize-use-designated-initializers]
PWGEM/PhotonMeson/Utils/V0DedupUtilities.h:279:3: warning: use designated initializer list to initialize 'FinderScoreTable' [modernize-use-designated-initializers]
PWGEM/PhotonMeson/Utils/V0DedupUtilities.h:280:3: warning: use designated initializer list to initialize 'FinderScoreTable' [modernize-use-designated-initializers]
PWGEM/PhotonMeson/Utils/V0DedupUtilities.h:281:3: warning: use designated initializer list to initialize 'FinderScoreTable' [modernize-use-designated-initializers]
++ [[ 11 -gt 0 ]]
++ exit 1
--

Full log here.

@alibuild

Copy link
Copy Markdown
Collaborator

Error while checking build/O2Physics/staging for 0418a9f at 2026-10-22 15:38:

## sw/BUILD/O2Physics-latest/log
/sw/SOURCES/O2Physics/slc9_x86-64-slc9_x86-64/0/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.h:544:128: error: arithmetic between enumeration type 'o2::pwgem::photonmeson::FinderStep' and floating-point type 'float' is deprecated [-Werror=deprecated-enum-float-conversion]
/sw/SOURCES/O2Physics/slc9_x86-64-slc9_x86-64/0/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.h:544:128: error: arithmetic between enumeration type 'o2::pwgem::photonmeson::FinderStep' and floating-point type 'float' is deprecated [-Werror=deprecated-enum-float-conversion]
/sw/SOURCES/O2Physics/slc9_x86-64-slc9_x86-64/0/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.h:544:128: error: arithmetic between enumeration type 'o2::pwgem::photonmeson::FinderStep' and floating-point type 'float' is deprecated [-Werror=deprecated-enum-float-conversion]
/sw/SOURCES/O2Physics/slc9_x86-64-slc9_x86-64/0/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.h:544:128: error: arithmetic between enumeration type 'o2::pwgem::photonmeson::FinderStep' and floating-point type 'float' is deprecated [-Werror=deprecated-enum-float-conversion]
ninja: build stopped: subcommand failed.

Full log here.

@alibuild

Copy link
Copy Markdown
Collaborator

Error while checking build/O2Physics/o2 for 0418a9f at 2026-10-22 16:33:

## sw/BUILD/O2Physics-latest/log
/sw/SOURCES/O2Physics/slc9_x86-64-slc9_x86-64/0/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.h:544:128: error: arithmetic between enumeration type 'o2::pwgem::photonmeson::FinderStep' and floating-point type 'float' is deprecated [-Werror=deprecated-enum-float-conversion]
/sw/SOURCES/O2Physics/slc9_x86-64-slc9_x86-64/0/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.h:544:128: error: arithmetic between enumeration type 'o2::pwgem::photonmeson::FinderStep' and floating-point type 'float' is deprecated [-Werror=deprecated-enum-float-conversion]
/sw/SOURCES/O2Physics/slc9_x86-64-slc9_x86-64/0/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.h:544:128: error: arithmetic between enumeration type 'o2::pwgem::photonmeson::FinderStep' and floating-point type 'float' is deprecated [-Werror=deprecated-enum-float-conversion]
/sw/SOURCES/O2Physics/slc9_x86-64-slc9_x86-64/0/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.h:544:128: error: arithmetic between enumeration type 'o2::pwgem::photonmeson::FinderStep' and floating-point type 'float' is deprecated [-Werror=deprecated-enum-float-conversion]
ninja: build stopped: subcommand failed.

Full log here.

@Steffimro
Steffimro marked this pull request as draft October 22, 2026 14:51
@Steffimro
Steffimro force-pushed the photon-builder-finder-resolver branch from 0418a9f to 389ae58 Compare October 22, 2026 14:56
@Steffimro
Steffimro marked this pull request as ready for review October 22, 2026 16:10
@alibuild

Copy link
Copy Markdown
Collaborator

Error while checking build/O2Physics/staging for 389ae58 at 2026-10-22 18:14:

No log files found

Full log here.

@jokonig
jokonig merged commit 2ced90d into AliceO2Group:master Oct 22, 2026
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

photon Photon and neutral meson PAG label pwgem

Development

Successfully merging this pull request may close these issues.

3 participants