Lokasi ngalangkungan proxy:   [ UP ]  
[Ngawartoskeun bug]   [Panyetelan cookie]                
Skip to content

[PWGJE] PhotonChargedTriggerCorrelation: Add MC information and make adjustments#16744

Open
jkinner2 wants to merge 8 commits into
AliceO2Group:masterfrom
jkinner2:changingChange
Open

[PWGJE] PhotonChargedTriggerCorrelation: Add MC information and make adjustments#16744
jkinner2 wants to merge 8 commits into
AliceO2Group:masterfrom
jkinner2:changingChange

Conversation

@jkinner2

Copy link
Copy Markdown
Contributor
  • add MC yield info for more detailed checks and corrections
  • add MC correlation info for checking correlation shape changes and corrections
  • add further associated particles in MC
  • add producer histograms
  • add option to split MC data into multiple parts
  • improve angular mixing by fixing a bug producing an asymmetry and introducing statistics scaling with pt
  • add DCAz distributions for photons

@github-actions

github-actions Bot commented Jun 19, 2026

Copy link
Copy Markdown

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

@jkinner2

Copy link
Copy Markdown
Contributor Author

The last update PAG was on 2026-06-22 (today): https://indico.cern.ch/event/1700220

@jkinner2 jkinner2 marked this pull request as ready for review June 22, 2026 15:05
@vkucera

vkucera commented Jun 22, 2026

Copy link
Copy Markdown
Collaborator

Please name the analysis in the title.

@jkinner2 jkinner2 changed the title [PWGJE] Update analysis with MC additions and overall adjustments [PWGJE] PhotonChargedTriggerCorrelation: Add MC information and make adjustments Jun 23, 2026
@alibuild

Copy link
Copy Markdown
Collaborator

Error while checking build/O2Physics/staging for e25f20a at 2026-06-30 17:16:

No log files found

Full log here.

@alibuild

Copy link
Copy Markdown
Collaborator

Error while checking build/O2Physics/o2 for e25f20a at 2026-06-30 19:26:

No log files found

Full log here.

@jkinner2

jkinner2 commented Jul 1, 2026

Copy link
Copy Markdown
Contributor Author

Hello @nzardosh @fjonasALICE, I opened this PR up for review on Monday last week. Is there anything that I can do, or that needs to be done for it to be merged? (I am only making changes to my analysis, and the data modelling did not change significantly)

@alibuild

alibuild commented Jul 1, 2026

Copy link
Copy Markdown
Collaborator

Error while checking build/O2Physics/code-check for e25f20a at 2026-07-02 00:19:

## sw/BUILD/O2Physics-code-check-latest/log
--
========== List of issues found ==========
++ echo 'Found 36 errors and 139 warnings.'
Found 36 errors and 139 warnings.
++ [[ 36 -gt 0 ]]
++ cat /sw/BUILD/766bbdbcebef314158264b115a8ff40e486ebb45/O2Physics-code-check/errors.txt
PWGJE/Tasks/photonChargedTriggerCorrelation.cxx:71:43: error: macro replacement list should be enclosed in parentheses [bugprone-macro-parentheses,-warnings-as-errors]
PWGJE/Tasks/photonChargedTriggerCorrelation.cxx:72:45: error: macro replacement list should be enclosed in parentheses [bugprone-macro-parentheses,-warnings-as-errors]
PWGJE/Tasks/photonChargedTriggerCorrelation.cxx:89:8: error: constructor does not initialize these fields: absEtaMax, ccdb, pdg, h1PtCorrectionTrigger [cppcoreguidelines-pro-type-member-init,-warnings-as-errors]
PWGJE/Tasks/photonChargedTriggerCorrelation.cxx:183:17: error: member 'noLaterThanCcdb' of type 'const int64_t' (aka 'const long') is const qualified [cppcoreguidelines-avoid-const-or-ref-data-members,-warnings-as-errors]
PWGJE/Tasks/photonChargedTriggerCorrelation.cxx:204:86: error: member 'prependValueToVector' of type 'const std::function<std::vector<double> (const std::vector<double> &, const double)>' is const qualified [cppcoreguidelines-avoid-const-or-ref-data-members,-warnings-as-errors]
PWGJE/Tasks/photonChargedTriggerCorrelation.cxx:220:5: error: function 'pt' should be marked [[nodiscard]] [modernize-use-nodiscard,-warnings-as-errors]
PWGJE/Tasks/photonChargedTriggerCorrelation.cxx:221:5: error: function 'phi' should be marked [[nodiscard]] [modernize-use-nodiscard,-warnings-as-errors]
PWGJE/Tasks/photonChargedTriggerCorrelation.cxx:222:5: error: function 'eta' should be marked [[nodiscard]] [modernize-use-nodiscard,-warnings-as-errors]
PWGJE/Tasks/photonChargedTriggerCorrelation.cxx:279:42: error: use designated initializer list to initialize 'MixingTrigger' [modernize-use-designated-initializers,-warnings-as-errors]
PWGJE/Tasks/photonChargedTriggerCorrelation.cxx:294:5: error: function 'getTriggers' should be marked [[nodiscard]] [modernize-use-nodiscard,-warnings-as-errors]
PWGJE/Tasks/photonChargedTriggerCorrelation.cxx:301:5: error: function 'getBinSizeMin' should be marked [[nodiscard]] [modernize-use-nodiscard,-warnings-as-errors]
PWGJE/Tasks/photonChargedTriggerCorrelation.cxx:307:18: error: member 'zPvRoundingErrorAdjust' of type 'const double' is const qualified [cppcoreguidelines-avoid-const-or-ref-data-members,-warnings-as-errors]
PWGJE/Tasks/photonChargedTriggerCorrelation.cxx:309:18: error: member 'nBinsZPv' of type 'const size_t' (aka 'const unsigned long') is const qualified [cppcoreguidelines-avoid-const-or-ref-data-members,-warnings-as-errors]
PWGJE/Tasks/photonChargedTriggerCorrelation.cxx:311:18: error: member 'nBinsMult' of type 'const size_t' (aka 'const unsigned long') is const qualified [cppcoreguidelines-avoid-const-or-ref-data-members,-warnings-as-errors]
PWGJE/Tasks/photonChargedTriggerCorrelation.cxx:313:18: error: member 'nTriggerPerBinLimit' of type 'const size_t' (aka 'const unsigned long') is const qualified [cppcoreguidelines-avoid-const-or-ref-data-members,-warnings-as-errors]
PWGJE/Tasks/photonChargedTriggerCorrelation.cxx:316:5: error: function 'getZPvBin' should be marked [[nodiscard]] [modernize-use-nodiscard,-warnings-as-errors]
PWGJE/Tasks/photonChargedTriggerCorrelation.cxx:324:5: error: function 'getMultBin' should be marked [[nodiscard]] [modernize-use-nodiscard,-warnings-as-errors]
PWGJE/Tasks/photonChargedTriggerCorrelation.cxx:525:29: error: redundant call to 'data' [readability-redundant-string-cstr,-warnings-as-errors]
PWGJE/Tasks/photonChargedTriggerCorrelation.cxx:526:29: error: redundant call to 'data' [readability-redundant-string-cstr,-warnings-as-errors]
PWGJE/Tasks/photonChargedTriggerCorrelation.cxx:527:29: error: redundant call to 'data' [readability-redundant-string-cstr,-warnings-as-errors]
PWGJE/Tasks/photonChargedTriggerCorrelation.cxx:529:29: error: redundant call to 'data' [readability-redundant-string-cstr,-warnings-as-errors]
PWGJE/Tasks/photonChargedTriggerCorrelation.cxx:530:29: error: redundant call to 'data' [readability-redundant-string-cstr,-warnings-as-errors]
PWGJE/Tasks/photonChargedTriggerCorrelation.cxx:531:29: error: redundant call to 'data' [readability-redundant-string-cstr,-warnings-as-errors]
PWGJE/Tasks/photonChargedTriggerCorrelation.cxx:533:29: error: redundant call to 'data' [readability-redundant-string-cstr,-warnings-as-errors]
PWGJE/Tasks/photonChargedTriggerCorrelation.cxx:534:29: error: redundant call to 'data' [readability-redundant-string-cstr,-warnings-as-errors]
PWGJE/Tasks/photonChargedTriggerCorrelation.cxx:593:14: error: redundant boolean literal in conditional return statement [readability-simplify-boolean-expr,-warnings-as-errors]
PWGJE/Tasks/photonChargedTriggerCorrelation.cxx:622:36: error: the parameter 'mcParticle' is copied for each invocation but only used as a const reference; consider making it a const reference [performance-unnecessary-value-param,-warnings-as-errors]
PWGJE/Tasks/photonChargedTriggerCorrelation.cxx:647:54: error: the const qualified parameter 'mcParticle' is copied for each invocation; consider making it a reference [performance-unnecessary-value-param,-warnings-as-errors]
PWGJE/Tasks/photonChargedTriggerCorrelation.cxx:796:39: error: forwarding reference parameter 'funcPlain' is never forwarded inside the function body [cppcoreguidelines-missing-std-forward,-warnings-as-errors]
PWGJE/Tasks/photonChargedTriggerCorrelation.cxx:808:51: error: forwarding reference parameter 'funcCorrelation' is never forwarded inside the function body [cppcoreguidelines-missing-std-forward,-warnings-as-errors]
PWGJE/Tasks/photonChargedTriggerCorrelation.cxx:828:41: error: forwarding reference parameter 'funcMixing' is never forwarded inside the function body [cppcoreguidelines-missing-std-forward,-warnings-as-errors]
PWGJE/Tasks/photonChargedTriggerCorrelation.cxx:1246:26: error: do not declare C-style arrays, use 'std::array' instead [modernize-avoid-c-arrays,-warnings-as-errors]
PWGJE/Tasks/photonChargedTriggerCorrelation.cxx:1919:20: error: do not declare C-style arrays, use 'std::array' instead [modernize-avoid-c-arrays,-warnings-as-errors]
PWGJE/Tasks/photonChargedTriggerProducer.cxx:63:8: error: constructor does not initialize these fields: pdg [cppcoreguidelines-pro-type-member-init,-warnings-as-errors]
PWGJE/Tasks/photonChargedTriggerProducer.cxx:144:12: error: variable 'absPosZ' is not initialized [cppcoreguidelines-init-variables,-warnings-as-errors]
PWGJE/Tasks/photonChargedTriggerProducer.cxx:172:16: error: redundant boolean literal in conditional return statement [readability-simplify-boolean-expr,-warnings-as-errors]
++ [[ 139 -gt 0 ]]
++ cat /sw/BUILD/766bbdbcebef314158264b115a8ff40e486ebb45/O2Physics-code-check/warnings.txt
PWGJE/Tasks/photonChargedTriggerCorrelation.cxx:239:31: warning: statement should be inside braces [readability-braces-around-statements]
PWGJE/Tasks/photonChargedTriggerCorrelation.cxx:241:46: warning: statement should be inside braces [readability-braces-around-statements]
PWGJE/Tasks/photonChargedTriggerCorrelation.cxx:242:41: warning: statement should be inside braces [readability-braces-around-statements]
PWGJE/Tasks/photonChargedTriggerCorrelation.cxx:592:52: warning: statement should be inside braces [readability-braces-around-statements]
[0 more errors; see full log]

Full log here.

@alibuild

alibuild commented Jul 2, 2026

Copy link
Copy Markdown
Collaborator

Error while checking build/O2Physics/code-check for 5c4393e at 2026-07-02 14:38:

## sw/BUILD/O2Physics-code-check-latest/log
--
========== List of issues found ==========
++ echo 'Found 1 errors and 0 warnings.'
Found 1 errors and 0 warnings.
++ [[ 1 -gt 0 ]]
++ cat /sw/BUILD/57846a49fe630aab0cfc7cf3224eea0dc3d6a1e6/O2Physics-code-check/errors.txt
PWGJE/Tasks/photonChargedTriggerCorrelation.cxx:1279:25: error: no header providing "std::array" is directly included [misc-include-cleaner,-warnings-as-errors]
++ [[ 0 -gt 0 ]]
++ [[ 1 -gt 0 ]]
++ exit 1
--

Full log here.

@nzardosh

nzardosh commented Jul 2, 2026

Copy link
Copy Markdown
Collaborator

Hello @nzardosh @fjonasALICE, I opened this PR up for review on Monday last week. Is there anything that I can do, or that needs to be done for it to be merged? (I am only making changes to my analysis, and the data modelling did not change significantly)

Hi, as this is a pure photon analysis I will leave the review up to Florian and the other EMCal experts

@jkinner2

jkinner2 commented Jul 3, 2026

Copy link
Copy Markdown
Contributor Author

Hello @nzardosh @fjonasALICE, I opened this PR up for review on Monday last week. Is there anything that I can do, or that needs to be done for it to be merged? (I am only making changes to my analysis, and the data modelling did not change significantly)

Hi, as this is a pure photon analysis I will leave the review up to Florian and the other EMCal experts

@nzardosh Thank you for the reply. Just to clarify, I currently still only use PCM for the photon measurements and not the EMCal. Would this still leave the review up to @fjonasALICE, or is there another PCM/photon expert who should be asked?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Development

Successfully merging this pull request may close these issues.

4 participants