2626#include " PWGJE/DataModel/JetReducedDataHF.h"
2727#include " PWGJE/DataModel/JetReducedDataV0.h"
2828#include " PWGLF/DataModel/LFStrangenessTables.h"
29+ #include " PWGLF/DataModel/mcCentrality.h"
2930
3031#include " Common/CCDB/ctpRateFetcher.h"
3132#include " Common/Core/RecoDecay.h"
@@ -189,7 +190,7 @@ struct JetDerivedDataProducerTask {
189190 }
190191 PROCESS_SWITCH (JetDerivedDataProducerTask, processBunchCrossings, " produces derived bunch crossing table" , false );
191192
192- void processCollisions (soa::Join<aod::Collisions, aod::EvSels, aod::FT0Mults, aod::CentFT0Cs, aod::CentFT0CVariant1s>::iterator const & collision, soa::Join<aod::BCs, aod::Timestamps> const &)
193+ void processCollisions (soa::Join<aod::Collisions, aod::EvSels, aod::FV0Mults, aod:: FT0Mults, aod::CentFV0As, aod::CentFT0As, aod:: CentFT0Cs, aod::CentFT0Ms , aod::CentFT0CVariant1s>::iterator const & collision, soa::Join<aod::BCs, aod::Timestamps> const &)
193194 {
194195 auto bc = collision.bc_as <soa::Join<aod::BCs, aod::Timestamps>>();
195196 if (includeHadronicRate) {
@@ -203,7 +204,7 @@ struct JetDerivedDataProducerTask {
203204 triggerDecider.initCCDB (ccdb.service , bc.runNumber (), bc.timestamp (), jetderiveddatautilities::JTriggerMasks);
204205 triggerBit = jetderiveddatautilities::setTriggerSelectionBit (triggerDecider.getTriggerOfInterestResults (bc.globalBC ()));
205206 }
206- products.jCollisionsTable (collision.posX (), collision.posY (), collision.posZ (), collision.multFT0C (), collision.centFT0C (), collision.centFT0CVariant1 (), hadronicRate, collision.trackOccupancyInTimeRange (), jetderiveddatautilities::setEventSelectionBit (collision), collision.alias_raw (), triggerBit); // note change multFT0C to multFT0M when problems with multFT0A are fixed
207+ products.jCollisionsTable (collision.posX (), collision.posY (), collision.posZ (), collision.multFV0A (), collision. multFV0C (), collision. multFT0A (), collision. multFT0C (), collision.centFV0A (), - 1.0 , collision. centFT0A (), collision. centFT0C (), collision. centFT0M (), collision.centFT0CVariant1 (), hadronicRate, collision.trackOccupancyInTimeRange (), jetderiveddatautilities::setEventSelectionBit (collision), collision.alias_raw (), triggerBit); // note change multFT0C to multFT0M when problems with multFT0A are fixed
207208 products.jCollisionsParentIndexTable (collision.globalIndex ());
208209 products.jCollisionsBunchCrossingIndexTable (collision.bcId ());
209210 }
@@ -217,23 +218,23 @@ struct JetDerivedDataProducerTask {
217218 triggerDecider.initCCDB (ccdb.service , bc.runNumber (), bc.timestamp (), jetderiveddatautilities::JTriggerMasks);
218219 triggerBit = jetderiveddatautilities::setTriggerSelectionBit (triggerDecider.getTriggerOfInterestResults (bc.globalBC ()));
219220 }
220- products.jCollisionsTable (collision.posX (), collision.posY (), collision.posZ (), -1.0 , -1.0 , -1.0 , -1.0 , -1 , jetderiveddatautilities::setEventSelectionBit (collision), collision.alias_raw (), triggerBit);
221+ products.jCollisionsTable (collision.posX (), collision.posY (), collision.posZ (), -1.0 , -1.0 , -1.0 , -1.0 , -1.0 , - 1.0 , - 1.0 , - 1.0 , - 1.0 , - 1.0 , - 1.0 , - 1 , jetderiveddatautilities::setEventSelectionBit (collision), collision.alias_raw (), triggerBit);
221222 products.jCollisionsParentIndexTable (collision.globalIndex ());
222223 products.jCollisionsBunchCrossingIndexTable (collision.bcId ());
223224 }
224225 PROCESS_SWITCH (JetDerivedDataProducerTask, processCollisionsWithoutCentralityAndMultiplicity, " produces derived collision tables without centrality or multiplicity" , false );
225226
226- void processCollisionsRun2 (soa::Join<aod::Collisions, aod::EvSels, aod::FT0Mults, aod::CentRun2V0Ms>::iterator const & collision)
227+ void processCollisionsRun2 (soa::Join<aod::Collisions, aod::EvSels, aod::FT0Mults, aod::CentRun2V0As, aod:: CentRun2V0Ms>::iterator const & collision)
227228 {
228- products.jCollisionsTable (collision.posX (), collision.posY (), collision.posZ (), collision.multFT0C (), collision.centRun2V0M (), -1.0 , -1.0 , -1 , jetderiveddatautilities::setEventSelectionBit (collision), collision.alias_raw (), 0 ); // note change multFT0C to multFT0M when problems with multFT0A are fixed
229+ products.jCollisionsTable (collision.posX (), collision.posY (), collision.posZ (), - 1.0 , - 1.0 , - 1.0 , - 1.0 , collision.centRun2V0A (), collision.centRun2V0M (), -1.0 , -1.0 , - 1.0 , - 1.0 , 1.0 , -1 , jetderiveddatautilities::setEventSelectionBit (collision), collision.alias_raw (), 0 ); // note change multFT0C to multFT0M when problems with multFT0A are fixed
229230 products.jCollisionsParentIndexTable (collision.globalIndex ());
230231 products.jCollisionsBunchCrossingIndexTable (collision.bcId ());
231232 }
232233 PROCESS_SWITCH (JetDerivedDataProducerTask, processCollisionsRun2, " produces derived collision tables for Run 2 data" , false );
233234
234235 void processCollisionsALICE3 (aod::Collision const & collision)
235236 {
236- products.jCollisionsTable (collision.posX (), collision.posY (), collision.posZ (), -1.0 , -1.0 , -1.0 , -1.0 , -1 , -1.0 , 0 , 0 );
237+ products.jCollisionsTable (collision.posX (), collision.posY (), collision.posZ (), -1.0 , -1.0 , -1.0 , -1.0 , -1.0 , - 1.0 , - 1.0 , - 1.0 , - 1.0 , - 1.0 , - 1.0 , - 1 , -1.0 , 0 , 0 );
237238 products.jCollisionsParentIndexTable (collision.globalIndex ());
238239 products.jCollisionsBunchCrossingIndexTable (-1 );
239240 }
@@ -262,19 +263,33 @@ struct JetDerivedDataProducerTask {
262263 }
263264 PROCESS_SWITCH (JetDerivedDataProducerTask, processMcCollisionLabels, " produces derived MC collision labels table" , false );
264265
265- void processMcCollisions (aod::McCollision const & mcCollision)
266+ void processMcCollisions (soa::Join< aod::McCollisions, aod::HepMCXSections, aod::MultsExtraMC, aod::McCentFV0As, aod::McCentFT0As, aod::McCentFT0Cs, aod::McCentFT0Ms>::iterator const & mcCollision)
266267 {
267- products.jMcCollisionsTable (mcCollision.posX (), mcCollision.posY (), mcCollision.posZ (), mcCollision.weight (), mcCollision.getSubGeneratorId (), 1 , 1 , 1.0 , 1.0 , 999.0 );
268+ 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 () );
268269 products.jMcCollisionsParentIndexTable (mcCollision.globalIndex ());
269270 }
270271 PROCESS_SWITCH (JetDerivedDataProducerTask, processMcCollisions, " produces derived MC collision table" , false );
271272
272- void processMcCollisionsWithXsection (soa::Join<aod::McCollisions, aod::HepMCXSections>::iterator const & mcCollision)
273+ void processMcCollisionsWithoutCentralityAndMultiplicity (soa::Join<aod::McCollisions, aod::HepMCXSections>::iterator const & mcCollision)
273274 {
274- products.jMcCollisionsTable (mcCollision.posX (), mcCollision.posY (), mcCollision.posZ (), mcCollision.weight (), mcCollision.getSubGeneratorId (), mcCollision.accepted (), mcCollision.attempted (), mcCollision.xsectGen (), mcCollision.xsectErr (), mcCollision.ptHard ());
275+ 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 ());
275276 products.jMcCollisionsParentIndexTable (mcCollision.globalIndex ());
276277 }
277- PROCESS_SWITCH (JetDerivedDataProducerTask, processMcCollisionsWithXsection, " produces derived MC collision table with cross section information" , false );
278+ PROCESS_SWITCH (JetDerivedDataProducerTask, processMcCollisionsWithoutCentralityAndMultiplicity, " produces derived MC collision table without centraility and multiplicity" , false );
279+
280+ void processMcCollisionsWithoutXsection (soa::Join<aod::McCollisions, aod::MultsExtraMC, aod::McCentFV0As, aod::McCentFT0As, aod::McCentFT0Cs, aod::McCentFT0Ms>::iterator const & mcCollision)
281+ {
282+ 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 );
283+ products.jMcCollisionsParentIndexTable (mcCollision.globalIndex ());
284+ }
285+ PROCESS_SWITCH (JetDerivedDataProducerTask, processMcCollisionsWithoutXsection, " produces derived MC collision table without cross section information" , false );
286+
287+ void processMcCollisionsWithoutCentralityAndMultiplicityAndXsection (aod::McCollision const & mcCollision)
288+ {
289+ 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 );
290+ products.jMcCollisionsParentIndexTable (mcCollision.globalIndex ());
291+ }
292+ PROCESS_SWITCH (JetDerivedDataProducerTask, processMcCollisionsWithoutCentralityAndMultiplicityAndXsection, " produces derived MC collision table without centrality, multiplicity and cross section information" , false );
278293
279294 void processTracks (soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksCov, aod::TracksDCA, aod::TracksDCACov, aod::TrackSelection, aod::TrackSelectionExtension>::iterator const & track, aod::Collisions const &)
280295 {
0 commit comments