diff --git a/PWGJE/TableProducer/derivedDataProducer.cxx b/PWGJE/TableProducer/derivedDataProducer.cxx index f4cac2e7ac4..dfa01d2f030 100644 --- a/PWGJE/TableProducer/derivedDataProducer.cxx +++ b/PWGJE/TableProducer/derivedDataProducer.cxx @@ -164,6 +164,7 @@ struct JetDerivedDataProducerTask { Configurable includeTriggers{"includeTriggers", false, "fill the collision information with software trigger decisions"}; Configurable includeHadronicRate{"includeHadronicRate", true, "fill the collision information with the hadronic rate"}; + Configurable irSource{"irSource", "ZNC hadronic", "Estimator of the interaction rate (recommendation: T0VTX for pp, ZNC hadronic for Pb-Pb)"}; Configurable v0ChargedDecaysOnly{"v0ChargedDecaysOnly", true, "store V0s (at particle-level) only if they decay to charged particles"}; Configurable isMCGenOnly{"isMCGenOnly", false, "analysis is run over mcGen only"}; @@ -304,7 +305,7 @@ struct JetDerivedDataProducerTask { if (config.includeHadronicRate) { if (runNumber != bc.runNumber()) { runNumber = bc.runNumber(); - hadronicRate = rateFetcher.fetch(ccdb.service, bc.timestamp(), runNumber, "ZNC hadronic") * 0.001; + hadronicRate = rateFetcher.fetch(ccdb.service, bc.timestamp(), runNumber, config.irSource) * 0.001; } } uint64_t triggerBit = 0; diff --git a/PWGJE/Tasks/trackEfficiency.cxx b/PWGJE/Tasks/trackEfficiency.cxx index 05de663ba17..e8df076afa0 100644 --- a/PWGJE/Tasks/trackEfficiency.cxx +++ b/PWGJE/Tasks/trackEfficiency.cxx @@ -83,7 +83,7 @@ struct TrackEfficiency { Configurable trackOccupancyInTimeRangeMin{"trackOccupancyInTimeRangeMin", -999999, "minimum occupancy of tracks in neighbouring collisions in a given time range; only applied for reconstructed tracks, not mc particles"}; ConfigurableAxis centralityBinning{"centralityBinning", {VARIABLE_WIDTH, 0., 10., 50., 70., 100}, "binning of centrality histograms"}; - ConfigurableAxis intRateBinning{"intRateBinning", {50, 0., 50000.0}, "binning for interaction rate axis"}; + ConfigurableAxis intRateBinning{"intRateBinning", {100, 0., 10000.0}, "binning for interaction rate axis"}; ConfigurableAxis phiEffBinning{"phiEffBinning", {200, -1., 7.}, "binning for phi axis in efficiency histograms"}; ConfigurableAxis etaEffBinning{"etaEffBinning", {200, -1., 1.}, "binning for eta axis in efficiency histograms"}; @@ -417,8 +417,9 @@ struct TrackEfficiency { } if (doprocessCollisionsFromData || doprocessCollisionsFromMc || doprocessCollisionsFromMcWeighted) { - registry.add("h_collisions", "event status;event status;entries", {HistType::kTH1F, {{4, 0.0, 4.0}}}); - registry.add("h2_centrality_collisions", "centrality vs collisions; centrality; collisions", {HistType::kTH2F, {centAxis, {4, 0.0, 4.0}}}); + registry.add("h_collisions", "event status;event status;entries", {HistType::kTH1F, {{5, 0.0, 5.0}}}); + registry.add("h2_centrality_collisions", "centrality vs collisions; centrality; collisions", {HistType::kTH2F, {centAxis, {5, 0.0, 5.0}}}); + registry.add("h2_intrate_collisions", "Interaction rate;interaction rate (kHz);collisions", {HistType::kTH2F, {intRateAxis, {5, 0.0, 5.0}}}); } if (doprocessMcCollisions || doprocessMcCollisionsWeighted) { registry.add("h_mccollisions", "event status;event status;entries", {HistType::kTH1F, {{4, 0.0, 4.0}}}); @@ -430,8 +431,9 @@ struct TrackEfficiency { registry.add("h_fakecollisions", "event status;event status;entries", {HistType::kTH1F, {{4, 0.0, 4.0}}}); } if (doprocessCollisionsFromMcWeighted) { - registry.add("h_collisions_weighted", "event status;event status;entries", {HistType::kTH1F, {{4, 0.0, 4.0}}}); - registry.add("h2_centrality_collisions_weighted", "centrality vs mccollisions; centrality; collisions", {HistType::kTH2F, {centAxis, {4, 0.0, 4.0}}}); + registry.add("h_collisions_weighted", "event status;event status;entries", {HistType::kTH1F, {{5, 0.0, 5.0}}}); + registry.add("h2_centrality_collisions_weighted", "centrality vs mccollisions; centrality; collisions", {HistType::kTH2F, {centAxis, {5, 0.0, 5.0}}}); + registry.add("h2_intrate_collisions_weighted", "Interaction rate;interaction rate (kHz);collisions", {HistType::kTH2F, {intRateAxis, {5, 0.0, 5.0}}}); } if (doprocessMcCollisionsWeighted) { registry.add("h_mccollisions_weighted", "event status;event status;entries", {HistType::kTH1F, {{4, 0.0, 4.0}}}); @@ -1104,21 +1106,25 @@ struct TrackEfficiency { registry.fill(HIST("h_collisions"), 0.5); registry.fill(HIST("h2_centrality_collisions"), centrality, 0.5); + registry.fill(HIST("h2_intrate_collisions"), collision.hadronicRate(), 0.5); if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits, skipMBGapEvents, applyRCTSelections, rctSelection)) { return; } registry.fill(HIST("h_collisions"), 1.5); registry.fill(HIST("h2_centrality_collisions"), centrality, 1.5); + registry.fill(HIST("h2_intrate_collisions"), collision.hadronicRate(), 1.5); if (cutCentrality && (centrality < centralityMin || centralityMax < centrality)) { return; } registry.fill(HIST("h_collisions"), 2.5); registry.fill(HIST("h2_centrality_collisions"), centrality, 2.5); + registry.fill(HIST("h2_intrate_collisions"), collision.hadronicRate(), 2.5); if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) { return; } registry.fill(HIST("h_collisions"), 3.5); registry.fill(HIST("h2_centrality_collisions"), centrality, 3.5); + registry.fill(HIST("h2_intrate_collisions"), collision.hadronicRate(), 3.5); } PROCESS_SWITCH(TrackEfficiency, processCollisionsFromData, "QA for reconstructed collisions in data", false); @@ -1133,21 +1139,25 @@ struct TrackEfficiency { } registry.fill(HIST("h_collisions"), 0.5); registry.fill(HIST("h2_centrality_collisions"), centrality, 0.5); + registry.fill(HIST("h2_intrate_collisions"), collision.hadronicRate(), 0.5); if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits, skipMBGapEvents, applyRCTSelections, rctSelection)) { return; } registry.fill(HIST("h_collisions"), 1.5); registry.fill(HIST("h2_centrality_collisions"), centrality, 1.5); + registry.fill(HIST("h2_intrate_collisions"), collision.hadronicRate(), 1.5); if (cutCentrality && (centrality < centralityMin || centralityMax < centrality)) { return; } registry.fill(HIST("h_collisions"), 2.5); registry.fill(HIST("h2_centrality_collisions"), centrality, 2.5); + registry.fill(HIST("h2_intrate_collisions"), collision.hadronicRate(), 2.5); if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) { return; } registry.fill(HIST("h_collisions"), 3.5); registry.fill(HIST("h2_centrality_collisions"), centrality, 3.5); + registry.fill(HIST("h2_intrate_collisions"), collision.hadronicRate(), 3.5); float pTHat = collision.mcCollision().ptHard() < pTHatSettingSentinelValue ? collision.mcCollision().ptHard() : simPtRef / (std::pow(collision.mcCollision().weight(), 1.0 / pTHatExponent)); if (pTHat < ptHatMin || pTHat > ptHatMax) { // only allows mcCollisions with weight in between min and max @@ -1155,6 +1165,7 @@ struct TrackEfficiency { } registry.fill(HIST("h_collisions"), 4.5); registry.fill(HIST("h2_centrality_collisions"), centrality, 4.5); + registry.fill(HIST("h2_intrate_collisions"), collision.hadronicRate(), 4.5); } PROCESS_SWITCH(TrackEfficiency, processCollisionsFromMc, "QA for reconstructed collisions in MC without weights", false); @@ -1170,21 +1181,29 @@ struct TrackEfficiency { float eventWeight = collision.mcCollision().weight(); registry.fill(HIST("h_collisions"), 0.5); registry.fill(HIST("h_collisions_weighted"), 0.5, eventWeight); + registry.fill(HIST("h2_intrate_collisions"), collision.hadronicRate(), 0.5); + registry.fill(HIST("h2_intrate_collisions_weighted"), collision.hadronicRate(), 0.5, eventWeight); if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits, skipMBGapEvents, applyRCTSelections, rctSelection)) { return; } registry.fill(HIST("h_collisions"), 1.5); registry.fill(HIST("h_collisions_weighted"), 1.5, eventWeight); + registry.fill(HIST("h2_intrate_collisions"), collision.hadronicRate(), 1.5); + registry.fill(HIST("h2_intrate_collisions_weighted"), collision.hadronicRate(), 1.5, eventWeight); if (cutCentrality && (centrality < centralityMin || centralityMax < centrality)) { return; } registry.fill(HIST("h_collisions"), 2.5); registry.fill(HIST("h_collisions_weighted"), 2.5, eventWeight); + registry.fill(HIST("h2_intrate_collisions"), collision.hadronicRate(), 2.5); + registry.fill(HIST("h2_intrate_collisions_weighted"), collision.hadronicRate(), 2.5, eventWeight); if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) { return; } registry.fill(HIST("h_collisions"), 3.5); registry.fill(HIST("h_collisions_weighted"), 3.5, eventWeight); + registry.fill(HIST("h2_intrate_collisions"), collision.hadronicRate(), 3.5); + registry.fill(HIST("h2_intrate_collisions_weighted"), collision.hadronicRate(), 3.5, eventWeight); float pTHat = collision.mcCollision().ptHard() < pTHatSettingSentinelValue ? collision.mcCollision().ptHard() : simPtRef / (std::pow(eventWeight, 1.0 / pTHatExponent)); if (pTHat < ptHatMin || pTHat > ptHatMax) { // only allows mcCollisions with weight in between min and max @@ -1192,6 +1211,8 @@ struct TrackEfficiency { } registry.fill(HIST("h_collisions"), 4.5); registry.fill(HIST("h_collisions_weighted"), 4.5, eventWeight); + registry.fill(HIST("h2_intrate_collisions"), collision.hadronicRate(), 4.5); + registry.fill(HIST("h2_intrate_collisions_weighted"), collision.hadronicRate(), 4.5, eventWeight); } PROCESS_SWITCH(TrackEfficiency, processCollisionsFromMcWeighted, "QA for reconstructed collisions in weighted MC", false);