Skip to content

Commit a7fc6f0

Browse files
ddobrigkalibuild
authored andcommitted
Data Model change: bump McCollisions to 001 (#13321)
* Bump McCollisions to 001 * Fill McCollisions cursor, version 001 * Standalone producer cursor fill change * Please consider the following formatting changes --------- Co-authored-by: ALICE Action Bot <alibuild@cern.ch> (cherry picked from commit 9ad8fac)
1 parent 9577d52 commit a7fc6f0

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

Detectors/AOD/src/AODMcProducerHelpers.cxx

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

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() /*, 0.0*/);
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1582,7 +1582,7 @@ DECLARE_SOA_TABLE_VERSIONED(McCollisions_001, "AOD", "MCCOLLISION", 1, //! MC co
15821582
mccollision::GetSubGeneratorId<mccollision::GeneratorsID>,
15831583
mccollision::GetSourceId<mccollision::GeneratorsID>);
15841584

1585-
using McCollisions = McCollisions_000;
1585+
using McCollisions = McCollisions_001;
15861586
using McCollision = McCollisions::iterator;
15871587

15881588
namespace mcparticle

0 commit comments

Comments
 (0)