@@ -171,14 +171,15 @@ struct FullJetSpectra {
171171 if (doprocessBCs) {
172172 auto hBCCounter = registry.get <TH1>(HIST (" hBCCounter" ));
173173 hBCCounter->GetXaxis ()->SetBinLabel (1 , " AllBC" );
174- hBCCounter->GetXaxis ()->SetBinLabel (2 , " BC+kTVXinEMC" );
175- hBCCounter->GetXaxis ()->SetBinLabel (3 , " BC+kTVXinEMC+NoTFB" );
176- hBCCounter->GetXaxis ()->SetBinLabel (4 , " BC+kTVXinEMC+NoTFB+NoITSROFB" );
177- hBCCounter->GetXaxis ()->SetBinLabel (5 , " kTVXinEMC+CollinBC" );
178- hBCCounter->GetXaxis ()->SetBinLabel (6 , " kTVXinEMC+CollinBC+Sel8" );
179- hBCCounter->GetXaxis ()->SetBinLabel (7 , " kTVXinEMC+CollinBC+Sel8Full" );
180- hBCCounter->GetXaxis ()->SetBinLabel (8 , " kTVXinEMC+CollinBC+Sel8Full+GoodZvtx" );
181- hBCCounter->GetXaxis ()->SetBinLabel (9 , " kTVXinEMC+CollinBC+Sel8Full+VtxZ+GoodZvtx" );
174+ hBCCounter->GetXaxis ()->SetBinLabel (2 , " BC+kTVX" );
175+ hBCCounter->GetXaxis ()->SetBinLabel (3 , " BC+kTVX+NoTFB" );
176+ hBCCounter->GetXaxis ()->SetBinLabel (4 , " BC+kTVX+NoTFB+NoITSROFB" );
177+ hBCCounter->GetXaxis ()->SetBinLabel (5 , " CollinBC" );
178+ hBCCounter->GetXaxis ()->SetBinLabel (6 , " CollinBC+kTVX" );
179+ hBCCounter->GetXaxis ()->SetBinLabel (7 , " CollinBC+kTVX+Sel8" );
180+ hBCCounter->GetXaxis ()->SetBinLabel (8 , " CollinBC+kTVX+Sel8Full" );
181+ hBCCounter->GetXaxis ()->SetBinLabel (9 , " CollinBC+kTVX+Sel8Full+GoodZvtx" );
182+ hBCCounter->GetXaxis ()->SetBinLabel (10 , " CollinBC+kTVX+Sel8Full+VtxZ+GoodZvtx" );
182183 }
183184
184185 if (doprocessDataTracks || doprocessMCTracks) {
@@ -389,7 +390,7 @@ struct FullJetSpectra {
389390 }
390391
391392 if (doprocessBCs) {
392- registry.add (" hBCCounter" , " " , {HistType::kTH1F , {{10 , 0.0 , 10 .}}}, doSumw2);
393+ registry.add (" hBCCounter" , " " , {HistType::kTH1F , {{11 , 0.0 , 11 .}}}, doSumw2);
393394 }
394395
395396 // Track QA histograms
@@ -720,6 +721,7 @@ struct FullJetSpectra {
720721 using JetTableMCPMatchedJoined = soa::Join<aod::FullMCParticleLevelJets, aod::FullMCParticleLevelJetConstituents,
721722 aod::FullMCParticleLevelJetsMatchedToFullMCDetectorLevelJets>;
722723
724+ // Commenting these out for now to avoid dependency of the task on JE EventWeights tables
723725 /* using JetTableMCDMatchedWeightedJoined = soa::Join<aod::FullMCDetectorLevelJets, aod::FullMCDetectorLevelJetConstituents,
724726 aod::FullMCDetectorLevelJetsMatchedToFullMCParticleLevelJets,
725727 aod::FullMCDetectorLevelJetEventWeights>;*/
@@ -1145,26 +1147,29 @@ struct FullJetSpectra {
11451147 }
11461148 for (auto bc : bcs) {
11471149 registry.fill (HIST (" hBCCounter" ), 0.5 ); // All BC
1148- if (bc.selection_bit (aod::evsel::kIsTriggerTVX )) {
1150+ if (bc.selection_bit (aod::evsel::EventSelectionFlags:: kIsTriggerTVX )) {
11491151 registry.fill (HIST (" hBCCounter" ), 1.5 ); // BC+TVX
1150- if (bc.selection_bit (aod::evsel::kNoTimeFrameBorder )) {
1152+ if (bc.selection_bit (aod::evsel::EventSelectionFlags:: kNoTimeFrameBorder )) {
11511153 registry.fill (HIST (" hBCCounter" ), 2.5 ); // BC+TVX+NoTFB
1152- if (bc.selection_bit (aod::evsel::kNoITSROFrameBorder )) {
1154+ if (bc.selection_bit (aod::evsel::EventSelectionFlags:: kNoITSROFrameBorder )) {
11531155 registry.fill (HIST (" hBCCounter" ), 3.5 ); // BC+TVX+NoTFB+NoITSROFB ----> this goes to Lumi i.e. hLumiAfterBCcuts in eventSelection task
11541156 }
11551157 }
11561158 }
11571159 auto collisionsInBC = collisions.sliceBy (perFoundBC, bc.globalIndex ());
11581160 for (auto collision : collisionsInBC) {
11591161 registry.fill (HIST (" hBCCounter" ), 4.5 ); // CollinBC
1160- if (collision.sel8 ()) {
1161- registry.fill (HIST (" hBCCounter" ), 5.5 ); // CollinBC+sel8
1162- if (collision.selection_bit (o2::aod::evsel::kNoSameBunchPileup )) {
1163- registry.fill (HIST (" hBCCounter" ), 6.5 ); // CollinBC+sel8Full
1164- if (collision.selection_bit (o2::aod::evsel::kIsGoodZvtxFT0vsPV )) {
1165- registry.fill (HIST (" hBCCounter" ), 7.5 ); // CollinBC+sel8Full+GoodZvtx
1166- if (std::fabs (collision.posZ ()) < vertexZCut) {
1167- registry.fill (HIST (" hBCCounter" ), 8.5 ); // CollinBC+sel8Full+VtxZ+GoodZvtx ----> this goes to my analysis task for jet events selection
1162+ if (collision.selection_bit (o2::aod::evsel::kIsTriggerTVX )) {
1163+ registry.fill (HIST (" hBCCounter" ), 5.5 ); // CollinBC+TVX
1164+ if (collision.sel8 ()) {
1165+ registry.fill (HIST (" hBCCounter" ), 6.5 ); // CollinBC+TVX+sel8
1166+ if (collision.selection_bit (o2::aod::evsel::kNoSameBunchPileup )) {
1167+ registry.fill (HIST (" hBCCounter" ), 7.5 ); // CollinBC+TVX+sel8Full
1168+ if (collision.selection_bit (o2::aod::evsel::kIsGoodZvtxFT0vsPV )) {
1169+ registry.fill (HIST (" hBCCounter" ), 8.5 ); // CollinBC+TVX+sel8Full+GoodZvtx
1170+ if (std::fabs (collision.posZ ()) < vertexZCut) {
1171+ registry.fill (HIST (" hBCCounter" ), 9.5 ); // CollinBC+TVX+sel8Full+VtxZ+GoodZvtx ----> this goes to my analysis task for jet events selection
1172+ }
11681173 }
11691174 }
11701175 }
@@ -1451,7 +1456,7 @@ struct FullJetSpectra {
14511456 }
14521457 PROCESS_SWITCH (FullJetSpectra, processJetsMCD, " Full Jets at Detector Level" , false );
14531458
1454- void processJetsMCDWeighted (soa::Filtered<EMCCollisionsMCD>::iterator const & collision, JetTableMCDWeightedJoined const & jets, aod::JMcCollisions const &,
1459+ void processJetsMCDWeighted (soa::Filtered<EMCCollisionsMCD>::iterator const & collision, JetTableMCDJoined const & jets, aod::JMcCollisions const &,
14551460 aod::JetTracks const &, ClusterWithCorrections const &)
14561461 {
14571462 bool eventAccepted = false ;
@@ -1639,7 +1644,7 @@ struct FullJetSpectra {
16391644 }
16401645 PROCESS_SWITCH (FullJetSpectra, processJetsMCP, " Full Jets at Particle Level" , false );
16411646
1642- void processJetsMCPWeighted (aod::JetMcCollision const & mccollision, JetTableMCPWeightedJoined const & jets, aod::JetParticles const &, soa::SmallGroups<EMCCollisionsMCD> const & collisions)
1647+ void processJetsMCPWeighted (aod::JetMcCollision const & mccollision, JetTableMCPJoined const & jets, aod::JetParticles const &, soa::SmallGroups<EMCCollisionsMCD> const & collisions)
16431648 {
16441649 bool eventAccepted = false ;
16451650 float pTHat = 10 . / (std::pow (mccollision.weight (), 1.0 / pTHatExponent));
@@ -2603,7 +2608,7 @@ struct FullJetSpectra {
26032608 }
26042609 PROCESS_SWITCH (FullJetSpectra, processMBMCDCollisionsWithMultiplicity, " MB MCD Collisions for Full Jets Multiplicity Studies" , false );
26052610
2606- void processMCDCollisionsWeightedWithMultiplicity (soa::Filtered<EMCCollisionsMCD>::iterator const & collision, JetTableMCDWeightedJoined const & mcdjets, aod::JMcCollisions const &, aod::JetTracks const & tracks, ClusterWithCorrections const & clusters)
2611+ void processMCDCollisionsWeightedWithMultiplicity (soa::Filtered<EMCCollisionsMCD>::iterator const & collision, JetTableMCDJoined const & mcdjets, aod::JMcCollisions const &, aod::JetTracks const & tracks, ClusterWithCorrections const & clusters)
26072612 {
26082613 bool eventAccepted = false ;
26092614 float eventWeight = collision.mcCollision ().weight ();
@@ -2927,7 +2932,7 @@ struct FullJetSpectra {
29272932 PROCESS_SWITCH (FullJetSpectra, processMBMCPCollisionsWithMultiplicity, " MB MCP Collisions for Full Jets Multiplicity Studies" , false );
29282933
29292934 void processMBMCPCollisionsWeightedWithMultiplicity (aod::JetMcCollision const & mccollision,
2930- JetTableMCPWeightedJoined const & jets, aod::JetParticles const & /* particles*/ ,
2935+ JetTableMCPJoined const & jets, aod::JetParticles const & /* particles*/ ,
29312936 soa::SmallGroups<EMCCollisionsMCD> const & collisions)
29322937 {
29332938 bool eventAccepted = false ;
0 commit comments