Skip to content

Commit 888154f

Browse files
ddobrigkCesarOmarRA
authored andcommitted
[Common] Change index column identifier (AliceO2Group#11622)
1 parent ce8a1a0 commit 888154f

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

Common/DataModel/Multiplicity.h

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
// In applying this license CERN does not waive the privileges and immunities
99
// granted to it by virtue of its status as an Intergovernmental Organization
1010
// or submit itself to any jurisdiction.
11+
12+
/// \file Multiplicity.h
13+
/// \brief multiplicity tables
14+
/// \author ALICE
15+
1116
#ifndef COMMON_DATAMODEL_MULTIPLICITY_H_
1217
#define COMMON_DATAMODEL_MULTIPLICITY_H_
1318

@@ -184,14 +189,9 @@ DECLARE_SOA_TABLE_VERSIONED(MultMCExtras_001, "AOD", "MULTMCEXTRA", 1, //! Table
184189
mult::IsInelGt1<mult::MultMCNParticlesEta10>,
185190
o2::soa::Marker<1>);
186191

187-
DECLARE_SOA_TABLE(MultHepMCHIs, "AOD", "MULTHEPMCHI", //! complementary table for heavy-ion mc info (subset of HepMCHeavyIons)
188-
o2::soa::Index<>, hepmcheavyion::McCollisionId, hepmcheavyion::NcollHard, hepmcheavyion::NpartProj, hepmcheavyion::NpartTarg,
189-
hepmcheavyion::Ncoll, hepmcheavyion::ImpactParameter);
190-
191192
using MultMCExtras = MultMCExtras_001;
192193
using MultMCExtra = MultMCExtras::iterator;
193194
using MultsExtraMC = MultMCExtras; // for backwards compatibility with previous naming scheme
194-
using MultHepMCHI = MultHepMCHIs::iterator;
195195

196196
// crosslinks
197197
namespace mult
@@ -202,6 +202,12 @@ DECLARE_SOA_INDEX_COLUMN(MultMCExtra, multMCExtra);
202202
DECLARE_SOA_TABLE(Mult2MCExtras, "AOD", "Mult2MCEXTRA", //! Relate reco mult entry to MC extras entry
203203
o2::soa::Index<>, mult::MultMCExtraId);
204204

205+
DECLARE_SOA_TABLE(MultHepMCHIs, "AOD", "MULTHEPMCHI", //! complementary table for heavy-ion mc info (subset of HepMCHeavyIons)
206+
o2::soa::Index<>, mult::MultMCExtraId, hepmcheavyion::NcollHard, hepmcheavyion::NpartProj, hepmcheavyion::NpartTarg,
207+
hepmcheavyion::Ncoll, hepmcheavyion::ImpactParameter);
208+
209+
using MultHepMCHI = MultHepMCHIs::iterator;
210+
205211
namespace multZeq
206212
{
207213
DECLARE_SOA_COLUMN(MultZeqFV0A, multZeqFV0A, float); //! Multiplicity equalized for the vertex position with the FV0A detector

0 commit comments

Comments
 (0)