Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Update AnalysisDataModel.h #10424

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
jgrosseo merged 5 commits into from
Dec 8, 2022
Merged

Update AnalysisDataModel.h #10424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
693f4b8
Update AnalysisDataModel.h
ddobrigk Dec 4, 2022
db214ec
Please consider the following formatting changes
alibuild Dec 4, 2022
9687191
Merge pull request #1 from alibuild/alibot-cleanup-10424
ddobrigk Dec 4, 2022
a74aa01
Collisions_000 as default + declare equiv for idx
ddobrigk Dec 5, 2022
cd9696a
adjust to _000
ddobrigk Dec 7, 2022
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
11 changes: 10 additions & 1 deletion 11 Framework/Core/include/Framework/AnalysisDataModel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,21 @@ DECLARE_SOA_COLUMN(CollisionTime, collisionTime, float); //! Collision tim
DECLARE_SOA_COLUMN(CollisionTimeRes, collisionTimeRes, float); //! Resolution of collision time
} // namespace collision

DECLARE_SOA_TABLE(Collisions, "AOD", "COLLISION", //! Time and vertex information of collision
DECLARE_SOA_TABLE(Collisions_000, "AOD", "COLLISION", //! Time and vertex information of collision
o2::soa::Index<>, collision::BCId,
collision::PosX, collision::PosY, collision::PosZ,
collision::CovXX, collision::CovXY, collision::CovXZ, collision::CovYY, collision::CovYZ, collision::CovZZ,
collision::Flags, collision::Chi2, collision::NumContrib,
collision::CollisionTime, collision::CollisionTimeRes);

DECLARE_SOA_TABLE_VERSIONED(Collisions_001, "AOD", "COLLISION", 1, //! Time and vertex information of collision
o2::soa::Index<>, collision::BCId,
collision::PosX, collision::PosY, collision::PosZ,
collision::CovXX, collision::CovXY, collision::CovYY, collision::CovXZ, collision::CovYZ, collision::CovZZ,
collision::Flags, collision::Chi2, collision::NumContrib,
collision::CollisionTime, collision::CollisionTimeRes);

using Collisions = Collisions_000; // current version
using Collision = Collisions::iterator;

// NOTE Relation between Collisions and BC table
Expand Down Expand Up @@ -1008,6 +1016,7 @@ using McParticle = McParticles::iterator;
} // namespace aod
namespace soa
{
DECLARE_EQUIVALENT_FOR_INDEX(aod::Collisions_000, aod::Collisions_001);
DECLARE_EQUIVALENT_FOR_INDEX(aod::StoredMcParticles_000, aod::StoredMcParticles_001);
DECLARE_EQUIVALENT_FOR_INDEX(aod::StoredTracks, aod::StoredTracksIU);
} // namespace soa
Expand Down
4 changes: 2 additions & 2 deletions 4 Framework/Core/test/test_AnalysisTask.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,11 +168,11 @@ BOOST_AUTO_TEST_CASE(AdaptorCompilation)
BOOST_CHECK_EQUAL(task2.inputs[7].binding, "AmbiguousTracks");
BOOST_CHECK_EQUAL(task2.inputs[8].binding, "Calos");
BOOST_CHECK_EQUAL(task2.inputs[9].binding, "CaloTriggers");
BOOST_CHECK_EQUAL(task2.inputs[0].binding, "Collisions");
BOOST_CHECK_EQUAL(task2.inputs[0].binding, "Collisions_000");

auto task3 = adaptAnalysisTask<CTask>(*cfgc, TaskName{"test3"});
BOOST_CHECK_EQUAL(task3.inputs.size(), 3);
BOOST_CHECK_EQUAL(task3.inputs[0].binding, "Collisions");
BOOST_CHECK_EQUAL(task3.inputs[0].binding, "Collisions_000");
BOOST_CHECK_EQUAL(task3.inputs[2].binding, "Tracks");
BOOST_CHECK_EQUAL(task3.inputs[1].binding, "TracksExtension");

Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.