Skip to content

Commit cd61d50

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 731f62f commit cd61d50

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
@@ -1549,6 +1549,7 @@ DECLARE_SOA_COLUMN(PosZ, posZ, float); //! Z vertex positi
15491549
DECLARE_SOA_COLUMN(T, t, float); //! Collision time relative to given bc in ns
15501550
DECLARE_SOA_COLUMN(Weight, weight, float); //! MC weight
15511551
DECLARE_SOA_COLUMN(ImpactParameter, impactParameter, float); //! Impact parameter for A-A
1552+
DECLARE_SOA_COLUMN(EventPlaneAngle, eventPlaneAngle, float); //! Event plane angle for A-A
15521553
DECLARE_SOA_DYNAMIC_COLUMN(GetGeneratorId, getGeneratorId, //! The global generator ID which might have been assigned by the user
15531554
[](short generatorsID) -> int { return o2::mcgenid::getGeneratorId(generatorsID); });
15541555
DECLARE_SOA_DYNAMIC_COLUMN(GetSubGeneratorId, getSubGeneratorId, //! A specific sub-generator ID in case the generator has some sub-generator logic
@@ -1558,7 +1559,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(GetSourceId, getSourceId, //! The source ID to differ
15581559

15591560
} // namespace mccollision
15601561

1561-
DECLARE_SOA_TABLE(McCollisions, "AOD", "MCCOLLISION", //! MC collision table
1562+
DECLARE_SOA_TABLE(McCollisions_000, "AOD", "MCCOLLISION", //! MC collision table
15621563
o2::soa::Index<>, mccollision::BCId,
15631564
mccollision::GeneratorsID,
15641565
mccollision::PosX, mccollision::PosY, mccollision::PosZ,
@@ -1567,7 +1568,18 @@ DECLARE_SOA_TABLE(McCollisions, "AOD", "MCCOLLISION", //! MC collision table
15671568
mccollision::GetGeneratorId<mccollision::GeneratorsID>,
15681569
mccollision::GetSubGeneratorId<mccollision::GeneratorsID>,
15691570
mccollision::GetSourceId<mccollision::GeneratorsID>);
1570-
1571+
DECLARE_SOA_TABLE_VERSIONED(McCollisions_001, "AOD", "MCCOLLISION", 1, //! MC collision table with event plane
1572+
o2::soa::Index<>, mccollision::BCId,
1573+
mccollision::GeneratorsID,
1574+
mccollision::PosX, mccollision::PosY, mccollision::PosZ,
1575+
mccollision::T, mccollision::Weight,
1576+
mccollision::ImpactParameter,
1577+
mccollision::EventPlaneAngle,
1578+
mccollision::GetGeneratorId<mccollision::GeneratorsID>,
1579+
mccollision::GetSubGeneratorId<mccollision::GeneratorsID>,
1580+
mccollision::GetSourceId<mccollision::GeneratorsID>);
1581+
1582+
using McCollisions = McCollisions_000;
15711583
using McCollision = McCollisions::iterator;
15721584

15731585
namespace mcparticle

Generators/src/GeneratorPythia8.cxx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -705,6 +705,8 @@ void GeneratorPythia8::updateHeader(o2::dataformats::MCEventHeader* eventHeader)
705705
/** set impact parameter **/
706706
eventHeader->SetB(hiinfo->b());
707707
eventHeader->putInfo<double>(Key::impactParameter, hiinfo->b());
708+
/** set event plane angle **/
709+
eventHeader->putInfo<double>(Key::planeAngle, hiinfo->phi());
708710
auto bImp = hiinfo->b();
709711
/** set Ncoll, Npart and Nremn **/
710712
int nColl, nPart;

0 commit comments

Comments
 (0)