Skip to content

Commit 9577d52

Browse files
ddobrigkalcaliva
authored andcommitted
Add EP angle to McCollisions for debugging (#13287)
* Add event-plane angle to McCollisions for debugging (cherry picked from commit 07818bf)
1 parent 64a5d0f commit 9577d52

File tree

4 files changed

+20
-4
lines changed

4 files changed

+20
-4
lines changed

Detectors/AOD/src/AODMcProducerHelpers.cxx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@ short updateMCCollisions(const CollisionCursor& cursor,
6565
truncateFloatFraction(header.GetZ(), mask),
6666
truncateFloatFraction(time, mask),
6767
truncateFloatFraction(weight, mask),
68-
header.GetB());
68+
header.GetB() /*,
69+
getEventInfo(header, Key::planeAngle, header.GetRotZ())*/
70+
);
6971
return encodedGeneratorId;
7072
}
7173
//--------------------------------------------------------------------

Detectors/AOD/src/StandaloneAODProducer.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ void fillMCollisionTable(o2::steer::MCKinematicsReader const& mcreader)
8686
// mccollision::PosX, mccollision::PosY, mccollision::PosZ, mccollision::T, mccollision::Weight,
8787
// mccollision::ImpactParameter);
8888

89-
mcCollCursor(0, 0 /*bcID*/, 0 /*genID*/, header.GetX(), header.GetY(), header.GetZ(), time, 1. /*weight*/, header.GetB());
89+
mcCollCursor(0, 0 /*bcID*/, 0 /*genID*/, header.GetX(), header.GetY(), header.GetZ(), time, 1. /*weight*/, header.GetB() /*, 0.0*/);
9090

9191
index++;
9292
}

Framework/Core/include/Framework/AnalysisDataModel.h

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1552,6 +1552,7 @@ DECLARE_SOA_COLUMN(PosZ, posZ, float); //! Z vertex positi
15521552
DECLARE_SOA_COLUMN(T, t, float); //! Collision time relative to given bc in ns
15531553
DECLARE_SOA_COLUMN(Weight, weight, float); //! MC weight
15541554
DECLARE_SOA_COLUMN(ImpactParameter, impactParameter, float); //! Impact parameter for A-A
1555+
DECLARE_SOA_COLUMN(EventPlaneAngle, eventPlaneAngle, float); //! Event plane angle for A-A
15551556
DECLARE_SOA_DYNAMIC_COLUMN(GetGeneratorId, getGeneratorId, //! The global generator ID which might have been assigned by the user
15561557
[](short generatorsID) -> int { return o2::mcgenid::getGeneratorId(generatorsID); });
15571558
DECLARE_SOA_DYNAMIC_COLUMN(GetSubGeneratorId, getSubGeneratorId, //! A specific sub-generator ID in case the generator has some sub-generator logic
@@ -1561,7 +1562,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(GetSourceId, getSourceId, //! The source ID to differ
15611562

15621563
} // namespace mccollision
15631564

1564-
DECLARE_SOA_TABLE(McCollisions, "AOD", "MCCOLLISION", //! MC collision table
1565+
DECLARE_SOA_TABLE(McCollisions_000, "AOD", "MCCOLLISION", //! MC collision table
15651566
o2::soa::Index<>, mccollision::BCId,
15661567
mccollision::GeneratorsID,
15671568
mccollision::PosX, mccollision::PosY, mccollision::PosZ,
@@ -1570,7 +1571,18 @@ DECLARE_SOA_TABLE(McCollisions, "AOD", "MCCOLLISION", //! MC collision table
15701571
mccollision::GetGeneratorId<mccollision::GeneratorsID>,
15711572
mccollision::GetSubGeneratorId<mccollision::GeneratorsID>,
15721573
mccollision::GetSourceId<mccollision::GeneratorsID>);
1573-
1574+
DECLARE_SOA_TABLE_VERSIONED(McCollisions_001, "AOD", "MCCOLLISION", 1, //! MC collision table with event plane
1575+
o2::soa::Index<>, mccollision::BCId,
1576+
mccollision::GeneratorsID,
1577+
mccollision::PosX, mccollision::PosY, mccollision::PosZ,
1578+
mccollision::T, mccollision::Weight,
1579+
mccollision::ImpactParameter,
1580+
mccollision::EventPlaneAngle,
1581+
mccollision::GetGeneratorId<mccollision::GeneratorsID>,
1582+
mccollision::GetSubGeneratorId<mccollision::GeneratorsID>,
1583+
mccollision::GetSourceId<mccollision::GeneratorsID>);
1584+
1585+
using McCollisions = McCollisions_000;
15741586
using McCollision = McCollisions::iterator;
15751587

15761588
namespace mcparticle

Generators/src/GeneratorPythia8.cxx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -657,6 +657,8 @@ void GeneratorPythia8::updateHeader(o2::dataformats::MCEventHeader* eventHeader)
657657
/** set impact parameter **/
658658
eventHeader->SetB(hiinfo->b());
659659
eventHeader->putInfo<double>(Key::impactParameter, hiinfo->b());
660+
/** set event plane angle **/
661+
eventHeader->putInfo<double>(Key::planeAngle, hiinfo->phi());
660662
auto bImp = hiinfo->b();
661663
/** set Ncoll, Npart and Nremn **/
662664
int nColl, nPart;

0 commit comments

Comments
 (0)