-
Notifications
You must be signed in to change notification settings - Fork 668
[PWGCF,PWGDQ,PWGLF] Add new version of StraEvSels table #16486
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
lhusova
merged 24 commits into
AliceO2Group:master
from
romainschotter:NewStraEvSelDataModel
Jun 2, 2026
Merged
Changes from all commits
Commits
Show all changes
24 commits
Select commit
Hold shift + click to select a range
b04f601
Update strangeness data model to reduce derived data size (in pp)
53fc054
Add converters for new data model
8f12b02
Update task producing or subscribing to StraEvSels
a3cea84
Please consider the following formatting changes
alibuild 5959fc9
Merge pull request #71 from alibuild/alibot-cleanup-16486
romainschotter 2f144fe
Merge branch 'master' into NewStraEvSelDataModel
romainschotter 2f97dd4
Remove unused McCollisionExtra.h include
romainschotter 212bc72
Fix CMakeLists.txt for strangeness converters
romainschotter 1d8a0d0
Add workflow for stradautracksconverter
romainschotter b8ac0da
Update sigmaanalysis.cxx
romainschotter 23efd26
Update strangenessderivedbinnedinfo
romainschotter 8dd4508
Update taskLambdaSpinCorr
romainschotter d15190a
Update lambdapolsp
romainschotter 5deaeb7
Update derivedupcanalysis.cxx
romainschotter ccb309e
Update higherMassResonances
romainschotter c4d35ed
Update strderivedGenQA
romainschotter f05fb2a
Update cascadeflow
romainschotter abb19f0
Update quarkoniaToHyperons
romainschotter 54289cf
Update flowEfficiencyCasc
romainschotter 6af29bd
Fix warning about unused variables
romainschotter 0e13b5a
Fix formatting copyright line 1/3
romainschotter 760d79c
Fix formatting copyright line 2/3
romainschotter 92a8f80
Fix formatting copyright line 3/3
romainschotter 7eb8dee
Fix warning about unused variables
romainschotter File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
66 changes: 66 additions & 0 deletions
66
PWGLF/TableProducer/Strangeness/Converters/straevselextrasconverter.cxx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| // Copyright 2019-2020 CERN and copyright holders of ALICE O2. | ||
| // See https://alice-o2.web.cern.ch/copyright for details of the copyright holders. | ||
| // All rights not expressly granted are reserved. | ||
| // | ||
| // This software is distributed under the terms of the GNU General Public | ||
| // License v3 (GPL Version 3), copied verbatim in the file "COPYING". | ||
| // | ||
| // In applying this license CERN does not waive the privileges and immunities | ||
| // granted to it by virtue of its status as an Intergovernmental Organization | ||
| // or submit itself to any jurisdiction. | ||
|
|
||
| #include "PWGLF/DataModel/LFStrangenessTables.h" | ||
|
|
||
| #include "CCDB/BasicCCDBManager.h" | ||
| #include "DataFormatsParameters/AggregatedRunInfo.h" | ||
| #include "Framework/AnalysisDataModel.h" | ||
| #include "Framework/AnalysisTask.h" | ||
| #include "Framework/runDataProcessing.h" | ||
|
|
||
| using namespace o2; | ||
| using namespace o2::framework; | ||
| using namespace o2::aod::evsel; | ||
|
|
||
| // Converts straevselsextrasconverter1 converts StraEvSelExtras_000 into StraEvSelExtras_001 | ||
| struct straevselextrasconverter { | ||
| Produces<aod::StraEvSelExtras_001> straEvSelExtras_001; | ||
|
|
||
| void process(soa::Join<aod::StraEvSels_005, aod::StraEvSelExtras_000> const& straEvSels_005) | ||
| { | ||
| for (auto& values : straEvSels_005) { | ||
| straEvSelExtras_001(values.multZNA(), | ||
| values.multZNC(), | ||
| values.multZEM1(), | ||
| values.multZEM2(), | ||
| values.multZPA(), | ||
| values.multZPC(), | ||
| values.multNTracksITSTPC(), | ||
| values.multAllTracksTPCOnly(), | ||
| values.multAllTracksITSTPC(), | ||
| values.trackOccupancyInTimeRange(), | ||
| values.ft0cOccupancyInTimeRange(), | ||
| values.timeFDDA(), | ||
| values.timeFDDC(), | ||
| values.timeFV0A(), | ||
| values.timeFT0A(), | ||
| values.timeFT0C(), | ||
| values.triggerMaskFT0(), | ||
| values.gapSide(), | ||
| values.totalFT0AmplitudeA(), | ||
| values.totalFT0AmplitudeC(), | ||
| values.totalFV0AmplitudeA(), | ||
| values.totalFDDAmplitudeA(), | ||
| values.totalFDDAmplitudeC(), | ||
| values.timeZNA(), | ||
| values.timeZNC(), | ||
| values.energyCommonZNA(), | ||
| values.energyCommonZNC()); | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| WorkflowSpec defineDataProcessing(ConfigContext const& cfgc) | ||
| { | ||
| return WorkflowSpec{ | ||
| adaptAnalysisTask<straevselextrasconverter>(cfgc)}; | ||
| } | ||
66 changes: 66 additions & 0 deletions
66
PWGLF/TableProducer/Strangeness/Converters/straevselextrasconverter2.cxx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| // Copyright 2019-2020 CERN and copyright holders of ALICE O2. | ||
| // See https://alice-o2.web.cern.ch/copyright for details of the copyright holders. | ||
| // All rights not expressly granted are reserved. | ||
| // | ||
| // This software is distributed under the terms of the GNU General Public | ||
| // License v3 (GPL Version 3), copied verbatim in the file "COPYING". | ||
| // | ||
| // In applying this license CERN does not waive the privileges and immunities | ||
| // granted to it by virtue of its status as an Intergovernmental Organization | ||
| // or submit itself to any jurisdiction. | ||
|
|
||
| #include "PWGLF/DataModel/LFStrangenessTables.h" | ||
|
|
||
| #include "CCDB/BasicCCDBManager.h" | ||
| #include "DataFormatsParameters/AggregatedRunInfo.h" | ||
| #include "Framework/AnalysisDataModel.h" | ||
| #include "Framework/AnalysisTask.h" | ||
| #include "Framework/runDataProcessing.h" | ||
|
|
||
| using namespace o2; | ||
| using namespace o2::framework; | ||
| using namespace o2::aod::evsel; | ||
|
|
||
| // Produce dummy StraEvSelExtras for analysis subscribing to StraEvSelExtras but not saved in the strangeness derived data (typically when running over pp strangeness derived data) | ||
| struct straevselextrasconverter2 { | ||
| Produces<aod::StraEvSelExtras> straEvSelExtras; | ||
|
|
||
| void process(aod::StraEvSels const& straEvSels) | ||
| { | ||
| for (int ii = 0; ii < straEvSels.size(); ii++) { | ||
| straEvSelExtras(-999., // dummy multZNA, | ||
| -999., // dummy multZNC, | ||
| -999., // dummy multZEM1, | ||
| -999., // dummy multZEM2, | ||
| -999., // dummy multZPA, | ||
| -999., // dummy multZPC, | ||
| -999., // dummy multNTracksITSTPC, | ||
| -999., // dummy multAllTracksTPCOnly, | ||
| -999., // dummy multAllTracksITSTPC, | ||
| -999., // dummy trackOccupancyInTimeRange, | ||
| -999., // dummy ft0cOccupancyInTimeRange, | ||
| -999., // dummy timeFDDA, | ||
| -999., // dummy timeFDDC, | ||
| -999., // dummy timeFV0A, | ||
| -999., // dummy timeFT0A, | ||
| -999., // dummy timeFT0C, | ||
| 0, // dummy triggerMaskFT0, | ||
| -999, // dummy gapSide, | ||
| -999., // dummy totalFT0AmplitudeA, | ||
| -999., // dummy totalFT0AmplitudeC, | ||
| -999., // dummy totalFV0AmplitudeA, | ||
| -999., // dummy totalFDDAmplitudeA, | ||
| -999., // dummy totalFDDAmplitudeC, | ||
| -999., // dummy timeZNA, | ||
| -999., // dummy timeZNC, | ||
| -999., // dummy energyCommonZNA, | ||
| -999.); // dummy energyCommonZNC); | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| WorkflowSpec defineDataProcessing(ConfigContext const& cfgc) | ||
| { | ||
| return WorkflowSpec{ | ||
| adaptAnalysisTask<straevselextrasconverter2>(cfgc)}; | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wrong format.