Skip to content
Merged
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
12 changes: 7 additions & 5 deletions PWGEM/PhotonMeson/Tasks/compconvbuilder.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
using MyTracksIUMC = soa::Join<aod::TracksIU, aod::McTrackLabels>;
using MyMCParticles = aod::McParticles;

using V0DerivedMCDatas = soa::Join<aod::V0Cores, aod::V0CollRefs, aod::V0Extras, aod::V0Indices, aod::V0TOFNSigmas, aod::V0MCMothers, aod::V0CoreMCLabels, aod::V0LambdaMLScores, aod::V0AntiLambdaMLScores, aod::V0GammaMLScores>;
using V0DerivedMCDatas = soa::Join<aod::V0Cores, aod::V0CollRefs, aod::V0Extras, aod::V0Indices, aod::V0MCMothers, aod::V0CoreMCLabels, aod::V0GammaMLScores>;

using dauTracks = soa::Join<aod::DauTrackExtras, aod::DauTrackTPCPIDs>;

Expand Down Expand Up @@ -168,7 +168,7 @@
kTHnSparseF,
{{200, -100, 100},
{200, 0, 100},
{90, 0, 2 * M_PI},

Check failure on line 171 in PWGEM/PhotonMeson/Tasks/compconvbuilder.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[external-pi]

Use the PI constant (and its multiples and fractions) defined in o2::constants::math.
{200, -1.0f, 1.0f},
{500, 0, 10},
{120, -30, 30}
Expand All @@ -180,7 +180,7 @@
kTHnSparseF,
{{200, -100, 100},
{200, 0, 100},
{90, 0, 2 * M_PI},

Check failure on line 183 in PWGEM/PhotonMeson/Tasks/compconvbuilder.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[external-pi]

Use the PI constant (and its multiples and fractions) defined in o2::constants::math.
{200, -1.0f, 1.0f},
{500, 0, 10},
{120, -30, 30}
Expand All @@ -192,7 +192,7 @@
kTHnSparseF,
{{200, -100, 100},
{200, 0, 100},
{90, 0, 2 * M_PI},

Check failure on line 195 in PWGEM/PhotonMeson/Tasks/compconvbuilder.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[external-pi]

Use the PI constant (and its multiples and fractions) defined in o2::constants::math.
{200, -1.0f, 1.0f},
{500, 0, 10},
{100, -0.2f, 0.2f}
Expand All @@ -204,7 +204,7 @@
kTHnSparseF,
{{200, -100, 100},
{200, 0, 100},
{90, 0, 2 * M_PI},

Check failure on line 207 in PWGEM/PhotonMeson/Tasks/compconvbuilder.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[external-pi]

Use the PI constant (and its multiples and fractions) defined in o2::constants::math.
{200, -1.0f, 1.0f},
{500, 0, 10},
{200, -1.0f, 1.0f}
Expand All @@ -216,7 +216,7 @@
kTHnSparseF,
{{200, -100, 100},
{200, 0, 100},
{90, 0, 2 * M_PI},

Check failure on line 219 in PWGEM/PhotonMeson/Tasks/compconvbuilder.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[external-pi]

Use the PI constant (and its multiples and fractions) defined in o2::constants::math.
{200, -1.0f, 1.0f},
{500, 0, 10},
{100, -0.5f, 0.5f}
Expand All @@ -228,7 +228,7 @@
kTHnSparseF,
{{200, -100, 100},
{200, 0, 100},
{90, 0, 2 * M_PI},

Check failure on line 231 in PWGEM/PhotonMeson/Tasks/compconvbuilder.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[external-pi]

Use the PI constant (and its multiples and fractions) defined in o2::constants::math.
{200, -1.0f, 1.0f},
{500, 0, 10},
{120, -30, 30}
Expand All @@ -240,7 +240,7 @@
kTHnSparseF,
{{200, -100, 100},
{200, 0, 100},
{90, 0, 2 * M_PI},

Check failure on line 243 in PWGEM/PhotonMeson/Tasks/compconvbuilder.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[external-pi]

Use the PI constant (and its multiples and fractions) defined in o2::constants::math.
{200, -1.0f, 1.0f},
{500, 0, 10},
{120, -30, 30}
Expand All @@ -252,7 +252,7 @@
kTHnSparseF,
{{200, -100, 100},
{200, 0, 100},
{90, 0, 2 * M_PI},

Check failure on line 255 in PWGEM/PhotonMeson/Tasks/compconvbuilder.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[external-pi]

Use the PI constant (and its multiples and fractions) defined in o2::constants::math.
{200, -1.0f, 1.0f},
{500, 0, 10},
{100, -0.2f, 0.2f}
Expand All @@ -264,7 +264,7 @@
kTHnSparseF,
{{200, -100, 100},
{200, 0, 100},
{90, 0, 2 * M_PI},

Check failure on line 267 in PWGEM/PhotonMeson/Tasks/compconvbuilder.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[external-pi]

Use the PI constant (and its multiples and fractions) defined in o2::constants::math.
{200, -1.0f, 1.0f},
{500, 0, 10},
{200, -1.0f, 1.0f}
Expand All @@ -276,7 +276,7 @@
kTHnSparseF,
{{200, -100, 100},
{200, 0, 100},
{90, 0, 2 * M_PI},

Check failure on line 279 in PWGEM/PhotonMeson/Tasks/compconvbuilder.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[external-pi]

Use the PI constant (and its multiples and fractions) defined in o2::constants::math.
{200, -1.0f, 1.0f},
{500, 0, 10},
{100, -0.5f, 0.5f}
Expand Down Expand Up @@ -637,7 +637,8 @@

void processLFV0sMC(MyStraCollisions const& stracollisions,
soa::Join<aod::V0MCCores, aod::V0MCCollRefs> const&,
V0DerivedMCDatas const& strangeV0s)
V0DerivedMCDatas const& strangeV0s,
dauTracks const&)
{

for (auto& collision : stracollisions) {
Expand Down Expand Up @@ -728,6 +729,7 @@
PresliceUnsorted<aod::EMMCParticles> perMcCollision = aod::emmcparticle::emmceventId;

void processConvV0s(MyCollisions const& collisions,
MyMCCollisions const&,
aod::EMMCParticles const& mcparticles,
MyTracksIUMC const& tracks)
{
Expand Down Expand Up @@ -785,15 +787,15 @@
}
}

Preslice<MyV0Photons> perEMCollision = aod::v0photonkf::emeventId;

void processMatchCategories(
MyCollisions const& collisions,
aod::EMMCEvents const&,
MyTracksIUMC const& tracksgen,
MyV0Photons const& emV0s,
soa::Join<aod::V0MCCores, aod::V0MCCollRefs> const&,
V0DerivedMCDatas const& lfV0s,
MyMCV0Legs const&,
aod::EMMCParticles const&,
aod::McParticles const& mcparticles,
dauTracks const&)
{
Expand All @@ -811,7 +813,7 @@

fillEventInfo<1, EMBuilder>(collision);

auto emSlice = emV0s.sliceBy(perEMCollision, collision.globalIndex());
auto emSlice = emV0s.sliceBy(perCollision, collision.globalIndex());
auto lfSlice = lfV0s.sliceBy(perCollisionMCDerived, collision.globalIndex());

using EMIt = decltype(emSlice.begin());
Expand Down
Loading