Skip to content

Commit 236c583

Browse files
nzardoshnzardosh
committed
removing unfilled mc centrality tables
1 parent eeb1d77 commit 236c583

File tree

4 files changed

+9
-14
lines changed

4 files changed

+9
-14
lines changed

‎PWGJE/DataModel/JetReducedData.h‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -196,9 +196,6 @@ DECLARE_SOA_COLUMN(PosZ, posZ, float);
196196
DECLARE_SOA_COLUMN(MultFV0A, multFV0A, float);
197197
DECLARE_SOA_COLUMN(MultFT0A, multFT0A, float);
198198
DECLARE_SOA_COLUMN(MultFT0C, multFT0C, float);
199-
DECLARE_SOA_COLUMN(CentFV0A, centFV0A, float);
200-
DECLARE_SOA_COLUMN(CentFT0A, centFT0A, float);
201-
DECLARE_SOA_COLUMN(CentFT0C, centFT0C, float);
202199
DECLARE_SOA_COLUMN(CentFT0M, centFT0M, float);
203200
DECLARE_SOA_COLUMN(Weight, weight, float);
204201
DECLARE_SOA_COLUMN(SubGeneratorId, subGeneratorId, int);
@@ -217,9 +214,6 @@ DECLARE_SOA_TABLE_STAGED(JMcCollisions, "JMCCOLLISION",
217214
jmccollision::MultFV0A,
218215
jmccollision::MultFT0A,
219216
jmccollision::MultFT0C,
220-
jmccollision::CentFV0A,
221-
jmccollision::CentFT0A,
222-
jmccollision::CentFT0C,
223217
jmccollision::CentFT0M,
224218
jmccollision::Weight,
225219
jmccollision::SubGeneratorId,

‎PWGJE/TableProducer/derivedDataProducer.cxx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -272,30 +272,30 @@ struct JetDerivedDataProducerTask {
272272
}
273273
PROCESS_SWITCH(JetDerivedDataProducerTask, processMcCollisionLabels, "produces derived MC collision labels table", false);
274274

275-
void processMcCollisions(soa::Join<aod::McCollisions, aod::HepMCXSections, aod::MultsExtraMC, aod::McCentFV0As, aod::McCentFT0As, aod::McCentFT0Cs, aod::McCentFT0Ms>::iterator const& mcCollision)
275+
void processMcCollisions(soa::Join<aod::McCollisions, aod::HepMCXSections, aod::MultsExtraMC, aod::McCentFT0Ms>::iterator const& mcCollision)
276276
{
277-
products.jMcCollisionsTable(mcCollision.posX(), mcCollision.posY(), mcCollision.posZ(), mcCollision.multMCFV0A(), mcCollision.multMCFT0A(), mcCollision.multMCFT0C(), mcCollision.centFV0A(), mcCollision.centFT0A(), mcCollision.centFT0C(), mcCollision.centFT0M(), mcCollision.weight(), mcCollision.getSubGeneratorId(), mcCollision.accepted(), mcCollision.attempted(), mcCollision.xsectGen(), mcCollision.xsectErr(), mcCollision.ptHard());
277+
products.jMcCollisionsTable(mcCollision.posX(), mcCollision.posY(), mcCollision.posZ(), mcCollision.multMCFV0A(), mcCollision.multMCFT0A(), mcCollision.multMCFT0C(), mcCollision.centFT0M(), mcCollision.weight(), mcCollision.getSubGeneratorId(), mcCollision.accepted(), mcCollision.attempted(), mcCollision.xsectGen(), mcCollision.xsectErr(), mcCollision.ptHard());
278278
products.jMcCollisionsParentIndexTable(mcCollision.globalIndex());
279279
}
280280
PROCESS_SWITCH(JetDerivedDataProducerTask, processMcCollisions, "produces derived MC collision table", false);
281281

282282
void processMcCollisionsWithoutCentralityAndMultiplicity(soa::Join<aod::McCollisions, aod::HepMCXSections>::iterator const& mcCollision)
283283
{
284-
products.jMcCollisionsTable(mcCollision.posX(), mcCollision.posY(), mcCollision.posZ(), -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, mcCollision.weight(), mcCollision.getSubGeneratorId(), mcCollision.accepted(), mcCollision.attempted(), mcCollision.xsectGen(), mcCollision.xsectErr(), mcCollision.ptHard());
284+
products.jMcCollisionsTable(mcCollision.posX(), mcCollision.posY(), mcCollision.posZ(), -1.0, -1.0, -1.0, -1.0, mcCollision.weight(), mcCollision.getSubGeneratorId(), mcCollision.accepted(), mcCollision.attempted(), mcCollision.xsectGen(), mcCollision.xsectErr(), mcCollision.ptHard());
285285
products.jMcCollisionsParentIndexTable(mcCollision.globalIndex());
286286
}
287287
PROCESS_SWITCH(JetDerivedDataProducerTask, processMcCollisionsWithoutCentralityAndMultiplicity, "produces derived MC collision table without centraility and multiplicity", false);
288288

289-
void processMcCollisionsWithoutXsection(soa::Join<aod::McCollisions, aod::MultsExtraMC, aod::McCentFV0As, aod::McCentFT0As, aod::McCentFT0Cs, aod::McCentFT0Ms>::iterator const& mcCollision)
289+
void processMcCollisionsWithoutXsection(soa::Join<aod::McCollisions, aod::MultsExtraMC, aod::McCentFT0Ms>::iterator const& mcCollision)
290290
{
291-
products.jMcCollisionsTable(mcCollision.posX(), mcCollision.posY(), mcCollision.posZ(), mcCollision.multMCFV0A(), mcCollision.multMCFT0A(), mcCollision.multMCFT0C(), mcCollision.centFV0A(), mcCollision.centFT0A(), mcCollision.centFT0C(), mcCollision.centFT0M(), mcCollision.weight(), mcCollision.getSubGeneratorId(), 1, 1, 1.0, 1.0, 999.0);
291+
products.jMcCollisionsTable(mcCollision.posX(), mcCollision.posY(), mcCollision.posZ(), mcCollision.multMCFV0A(), mcCollision.multMCFT0A(), mcCollision.multMCFT0C(), mcCollision.centFT0M(), mcCollision.weight(), mcCollision.getSubGeneratorId(), 1, 1, 1.0, 1.0, 999.0);
292292
products.jMcCollisionsParentIndexTable(mcCollision.globalIndex());
293293
}
294294
PROCESS_SWITCH(JetDerivedDataProducerTask, processMcCollisionsWithoutXsection, "produces derived MC collision table without cross section information", false);
295295

296296
void processMcCollisionsWithoutCentralityAndMultiplicityAndXsection(aod::McCollision const& mcCollision)
297297
{
298-
products.jMcCollisionsTable(mcCollision.posX(), mcCollision.posY(), mcCollision.posZ(), -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, mcCollision.weight(), mcCollision.getSubGeneratorId(), 1, 1, 1.0, 1.0, 999.0);
298+
products.jMcCollisionsTable(mcCollision.posX(), mcCollision.posY(), mcCollision.posZ(), -1.0, -1.0, -1.0, -1.0, mcCollision.weight(), mcCollision.getSubGeneratorId(), 1, 1, 1.0, 1.0, 999.0);
299299
products.jMcCollisionsParentIndexTable(mcCollision.globalIndex());
300300
}
301301
PROCESS_SWITCH(JetDerivedDataProducerTask, processMcCollisionsWithoutCentralityAndMultiplicityAndXsection, "produces derived MC collision table without centrality, multiplicity and cross section information", false);

‎PWGJE/TableProducer/derivedDataWriter.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ struct JetDerivedDataWriter {
640640
mcCollisionMapping.resize(mcCollisions.size(), -1);
641641
for (auto const& mcCollision : mcCollisions) {
642642
if (mcCollision.isMcCollisionSelected()) {
643-
products.storedJMcCollisionsTable(mcCollision.posX(), mcCollision.posY(), mcCollision.posZ(), mcCollision.multFV0A(), mcCollision.multFT0A(), mcCollision.multFT0C(), mcCollision.centFV0A(), mcCollision.centFT0A(), mcCollision.centFT0C(), mcCollision.centFT0M(), mcCollision.weight(), mcCollision.subGeneratorId(), mcCollision.accepted(), mcCollision.attempted(), mcCollision.xsectGen(), mcCollision.xsectErr(), mcCollision.ptHard());
643+
products.storedJMcCollisionsTable(mcCollision.posX(), mcCollision.posY(), mcCollision.posZ(), mcCollision.multFV0A(), mcCollision.multFT0A(), mcCollision.multFT0C(), mcCollision.centFT0M(), mcCollision.weight(), mcCollision.subGeneratorId(), mcCollision.accepted(), mcCollision.attempted(), mcCollision.xsectGen(), mcCollision.xsectErr(), mcCollision.ptHard());
644644
products.storedJMcCollisionsParentIndexTable(mcCollision.mcCollisionId());
645645
mcCollisionMapping[mcCollision.globalIndex()] = products.storedJMcCollisionsTable.lastIndex();
646646
}

‎PWGJE/Tasks/jetSpectraCharged.cxx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,8 @@ struct JetSpectraCharged {
303303
bool applyMCCollisionCuts(TMCColl const& mccollision, TCollisions const& collisions, bool fillHistograms = false, bool isWeighted = false, float eventWeight = 1.0)
304304
{
305305
float centrality = -1.0;
306-
checkCentFT0M ? centrality = mccollision.centFT0M() : centrality = mccollision.centFT0C();
306+
// checkCentFT0M ? centrality = mccollision.centFT0M() : centrality = mccollision.centFT0C();
307+
centrality = mccollision.centFT0M();
307308

308309
if (fillHistograms) {
309310
registry.fill(HIST("h_mccollisions"), 0.5);

0 commit comments

Comments
 (0)