Skip to content

Renaming index columns for TF merging #5566

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.

Sign up for GitHub

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
ktf merged 19 commits into from
Mar 4, 2021
Merged

Renaming index columns for TF merging #5566

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
3a09b47
Renaming index columns for TF merging
jgrosseo Feb 25, 2021
2ab79e2
rename TF to DF
jgrosseo Feb 25, 2021
5ae597b
clang
jgrosseo Feb 25, 2021
ecdcee0
Fixes for underscore
jgrosseo Feb 26, 2021
9e80b81
Adjusting Analysis to changes in index columns
jgrosseo Feb 26, 2021
5e242c3
Adapt weak decay tables
jgrosseo Feb 26, 2021
f8a1aa1
Split track trees, rename MC columns
jgrosseo Feb 26, 2021
e6be146
more MC columns
jgrosseo Feb 26, 2021
b5b2f3b
fix spawner
jgrosseo Feb 26, 2021
ce27818
changing include
jgrosseo Feb 26, 2021
97d26a4
Use BigTracks
jgrosseo Mar 1, 2021
a62db42
- Adding flags to Collisions
jgrosseo Mar 3, 2021
73eb3ff
Change flags to 16 bit. Adjust AOD producers
jgrosseo Mar 3, 2021
1c9c735
removing filter temporarily
jgrosseo Mar 3, 2021
ae1c406
clang
jgrosseo Mar 3, 2021
51d44ce
Adding int16 and uint16 to Expressions.
jgrosseo Mar 4, 2021
39e330d
clang
jgrosseo Mar 4, 2021
bf67e8b
fix in MC tutorial
jgrosseo Mar 4, 2021
53f6860
Less iterators created
jgrosseo Mar 4, 2021
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
Prev Previous commit
Next Next commit
clang
  • Loading branch information
@jgrosseo
jgrosseo committed Mar 4, 2021
commit ae1c406ec8162e7e935d89d82e49026a80de98aa
2 changes: 1 addition & 1 deletion Analysis/Tutorials/src/mcHistograms.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ struct BTask {
OutputObj<TH1F> phiH{TH1F("phi", "phi", 100, 0., 2. * M_PI)};
OutputObj<TH1F> etaH{TH1F("eta", "eta", 102, -2.01, 2.01)};

void process(aod::McCollision const& mcCollision, aod::McParticles& mcParticles)
void process(aod::McCollision const& mcCollision, aod::McParticles& mcParticles)
{
LOGF(info, "MC. vtx-z = %f", mcCollision.posZ());
LOGF(info, "First: %d | Length: %d", mcParticles.begin().index(), mcParticles.size());
Expand Down
3 changes: 2 additions & 1 deletion Framework/Core/include/Framework/DataTypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@

#include <cstdint>

namespace o2::aod::collision {
namespace o2::aod::collision
{
enum CollisionFlagsRun2 : uint16_t {
Run2VertexerTracks = 0,
Run2VertexerTracksNoConstraint,
Expand Down
8 changes: 4 additions & 4 deletions Framework/Core/test/benchmark_ASoAHelpers.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@ static void BM_ASoAHelpersCombGenCollisionsPairsSameCategories(benchmark::State&
uniform_dist(e1), uniform_dist(e1), uniform_dist(e1),
uniform_dist(e1), uniform_dist(e1), uniform_dist(e1),
uniform_dist(e1), uniform_dist(e1), uniform_dist(e1),
uniform_dist_int(e1), uniform_dist(e1),
uniform_dist_int(e1), uniform_dist(e1),
uniform_dist_int(e1),
uniform_dist(e1), uniform_dist(e1), uniform_dist_int(e1));
}
Expand Down Expand Up @@ -616,7 +616,7 @@ static void BM_ASoAHelpersCombGenCollisionsFivesSameCategories(benchmark::State&
uniform_dist(e1), uniform_dist(e1), uniform_dist(e1),
uniform_dist(e1), uniform_dist(e1), uniform_dist(e1),
uniform_dist(e1), uniform_dist(e1), uniform_dist(e1),
uniform_dist_int(e1), uniform_dist(e1),
uniform_dist_int(e1), uniform_dist(e1),
uniform_dist_int(e1),
uniform_dist(e1), uniform_dist(e1), uniform_dist_int(e1));
}
Expand Down Expand Up @@ -653,7 +653,7 @@ static void BM_ASoAHelpersCombGenCollisionsPairsCategories(benchmark::State& sta
uniform_dist(e1), uniform_dist(e1), uniform_dist(e1),
uniform_dist(e1), uniform_dist(e1), uniform_dist(e1),
uniform_dist(e1), uniform_dist(e1), uniform_dist(e1),
uniform_dist_int(e1), uniform_dist(e1),
uniform_dist_int(e1), uniform_dist(e1),
uniform_dist_int(e1),
uniform_dist(e1), uniform_dist(e1), uniform_dist_int(e1));
}
Expand Down Expand Up @@ -690,7 +690,7 @@ static void BM_ASoAHelpersCombGenCollisionsFivesCategories(benchmark::State& sta
uniform_dist(e1), uniform_dist(e1), uniform_dist(e1),
uniform_dist(e1), uniform_dist(e1), uniform_dist(e1),
uniform_dist(e1), uniform_dist(e1), uniform_dist(e1),
uniform_dist_int(e1), uniform_dist(e1),
uniform_dist_int(e1), uniform_dist(e1),
uniform_dist_int(e1),
uniform_dist(e1), uniform_dist(e1), uniform_dist_int(e1));
}
Expand Down