Skip to content

Commit da94db9

Browse files
Archita-DashArchita-Dash
committed
removing JE eventweights table dependencies from the task
1 parent e46b217 commit da94db9

File tree

1 file changed

+24
-34
lines changed

1 file changed

+24
-34
lines changed

‎PWGJE/Tasks/fullJetSpectra.cxx‎

Lines changed: 24 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -147,24 +147,6 @@ struct FullJetSpectra {
147147
OutputObj<ZorroSummary> zorroSummary{"zorroSummary"};
148148
bool doSumw2 = false;
149149

150-
// Multiplicity Utilities
151-
// struct CentClass {
152-
// const char* name;
153-
// float min;
154-
// float max;
155-
// };
156-
// // Define multiplicity classes here (example: MB(0-100), HM(0-1), 1-10, 10-20, 20-40, 40-60, 60-100)
157-
// static constexpr int nCentClasses = 4;
158-
// CentClass centClasses[nCentClasses] = {
159-
// {"MB", 0.0, 100.0},
160-
// {"HM", 0.0, 1.0},
161-
// {"1_10", 1.0, 10.0},
162-
// {"10_20", 10.0, 20.0},
163-
// {"20_40", 20.0, 40.0},
164-
// {"40_60", 40.0, 60.0},
165-
// {"60_100", 60.0, 100.0}
166-
// };
167-
168150
// Random splitter instance
169151
/* TRandom3 randGen;
170152
// float eventRandomValue = -1.0; // default invalid
@@ -728,15 +710,23 @@ struct FullJetSpectra {
728710

729711
using FullJetTableDataJoined = soa::Join<aod::FullJets, aod::FullJetConstituents>;
730712
using JetTableMCDJoined = soa::Join<aod::FullMCDetectorLevelJets, aod::FullMCDetectorLevelJetConstituents>;
731-
using JetTableMCDWeightedJoined = soa::Join<aod::FullMCDetectorLevelJets, aod::FullMCDetectorLevelJetConstituents, aod::FullMCDetectorLevelJetEventWeights>;
713+
// using JetTableMCDWeightedJoined = soa::Join<aod::FullMCDetectorLevelJets, aod::FullMCDetectorLevelJetConstituents, aod::FullMCDetectorLevelJetEventWeights>;
732714
using JetTableMCPJoined = soa::Join<aod::FullMCParticleLevelJets, aod::FullMCParticleLevelJetConstituents>;
733-
using JetTableMCPWeightedJoined = soa::Join<aod::FullMCParticleLevelJets, aod::FullMCParticleLevelJetConstituents, aod::FullMCParticleLevelJetEventWeights>;
715+
// using JetTableMCPWeightedJoined = soa::Join<aod::FullMCParticleLevelJets, aod::FullMCParticleLevelJetConstituents, aod::FullMCParticleLevelJetEventWeights>;
716+
717+
using JetTableMCDMatchedJoined = soa::Join<aod::FullMCDetectorLevelJets, aod::FullMCDetectorLevelJetConstituents,
718+
aod::FullMCDetectorLevelJetsMatchedToFullMCParticleLevelJets>;
719+
720+
using JetTableMCPMatchedJoined = soa::Join<aod::FullMCParticleLevelJets, aod::FullMCParticleLevelJetConstituents,
721+
aod::FullMCParticleLevelJetsMatchedToFullMCDetectorLevelJets>;
734722

735-
using JetTableMCDMatchedJoined = soa::Join<aod::FullMCDetectorLevelJets, aod::FullMCDetectorLevelJetConstituents, aod::FullMCDetectorLevelJetsMatchedToFullMCParticleLevelJets>;
736-
using jetMcpPerMcCollision = soa::Join<aod::FullMCParticleLevelJets, aod::FullMCParticleLevelJetConstituents, aod::FullMCParticleLevelJetsMatchedToFullMCDetectorLevelJets>;
723+
/*using JetTableMCDMatchedWeightedJoined = soa::Join<aod::FullMCDetectorLevelJets, aod::FullMCDetectorLevelJetConstituents,
724+
aod::FullMCDetectorLevelJetsMatchedToFullMCParticleLevelJets,
725+
aod::FullMCDetectorLevelJetEventWeights>;*/
737726

738-
using JetTableMCDMatchedWeightedJoined = soa::Join<aod::FullMCDetectorLevelJets, aod::FullMCDetectorLevelJetConstituents, aod::FullMCDetectorLevelJetsMatchedToFullMCParticleLevelJets, aod::FullMCDetectorLevelJetsMatchedToFullMCParticleLevelJets, aod::FullMCDetectorLevelJetEventWeights>;
739-
using JetTableMCPMatchedWeightedJoined = soa::Join<aod::FullMCParticleLevelJets, aod::FullMCParticleLevelJetConstituents, aod::FullMCParticleLevelJetsMatchedToFullMCDetectorLevelJets, aod::FullMCParticleLevelJetsMatchedToFullMCDetectorLevelJets, aod::FullMCParticleLevelJetEventWeights>;
727+
/*using JetTableMCPMatchedWeightedJoined = soa::Join<aod::FullMCParticleLevelJets, aod::FullMCParticleLevelJetConstituents,
728+
aod::FullMCParticleLevelJetsMatchedToFullMCDetectorLevelJets,
729+
aod::FullMCParticleLevelJetEventWeights>;*/
740730

741731
// Applying some cuts(filters) on collisions, tracks, clusters
742732

@@ -745,7 +735,7 @@ struct FullJetSpectra {
745735
Filter trackCuts = (aod::jtrack::pt >= trackpTMin && aod::jtrack::pt < trackpTMax && aod::jtrack::eta > trackEtaMin && aod::jtrack::eta < trackEtaMax && aod::jtrack::phi >= trackPhiMin && aod::jtrack::phi <= trackPhiMax);
746736
aod::EMCALClusterDefinition clusterDefinition = aod::emcalcluster::getClusterDefinitionFromString(clusterDefinitionS.value);
747737
Filter clusterFilter = (aod::jcluster::definition == static_cast<int>(clusterDefinition) && aod::jcluster::eta > clusterEtaMin && aod::jcluster::eta < clusterEtaMax && aod::jcluster::phi >= clusterPhiMin && aod::jcluster::phi <= clusterPhiMax && aod::jcluster::energy >= clusterEnergyMin && aod::jcluster::time > clusterTimeMin && aod::jcluster::time < clusterTimeMax && (clusterRejectExotics && aod::jcluster::isExotic != true));
748-
Preslice<jetMcpPerMcCollision> JetMCPPerMcCollision = aod::jet::mcCollisionId;
738+
Preslice<JetTableMCPMatchedJoined> JetMCPPerMcCollision = aod::jet::mcCollisionId;
749739
PresliceUnsorted<soa::Filtered<aod::JetCollisionsMCD>> CollisionsPerMCPCollision = aod::jmccollisionlb::mcCollisionId;
750740
PresliceUnsorted<o2::soa::Join<o2::aod::Collisions, o2::aod::EvSels>> perFoundBC = aod::evsel::foundBCId;
751741

@@ -1747,7 +1737,7 @@ struct FullJetSpectra {
17471737
}
17481738
PROCESS_SWITCH(FullJetSpectra, processJetsMCPWeighted, "Full Jets at Particle Level on weighted events", false);
17491739

1750-
void processJetsMCPMCDMatched(soa::Filtered<EMCCollisionsMCD>::iterator const& collision, JetTableMCDMatchedJoined const& mcdjets, jetMcpPerMcCollision const& mcpjets, aod::JMcCollisions const&,
1740+
void processJetsMCPMCDMatched(soa::Filtered<EMCCollisionsMCD>::iterator const& collision, JetTableMCDMatchedJoined const& mcdjets, JetTableMCPMatchedJoined const& mcpjets, aod::JMcCollisions const&,
17511741
aod::JetTracks const&, ClusterWithCorrections const&, aod::JetParticles const&)
17521742
{
17531743
bool eventAccepted = false;
@@ -1847,21 +1837,21 @@ struct FullJetSpectra {
18471837
// continue;
18481838
// }
18491839

1850-
for (const auto& mcpjet : mcdjet.template matchedJetGeo_as<jetMcpPerMcCollision>()) {
1840+
for (const auto& mcpjet : mcdjet.template matchedJetGeo_as<JetTableMCPMatchedJoined>()) {
18511841
if (!jetfindingutilities::isInEtaAcceptance(mcpjet, jetPartEtaMin, jetPartEtaMax, trackEtaMin, trackEtaMax) ||
18521842
!isInPhiAcceptance(mcpjet)) {
18531843
fakeMcpJet++;
18541844
registry.fill(HIST("h2_full_fakemcpjets"), mcpjet.pt(), fakeMcpJet, 1.0);
18551845
continue;
18561846
} else {
1857-
fillMatchedHistograms<JetTableMCDMatchedJoined::iterator, jetMcpPerMcCollision>(mcdjet);
1847+
fillMatchedHistograms<JetTableMCDMatchedJoined::iterator, JetTableMCPMatchedJoined>(mcdjet);
18581848
}
18591849
} // mcpjet loop
18601850
} // mcdjet loop
18611851
}
18621852
PROCESS_SWITCH(FullJetSpectra, processJetsMCPMCDMatched, "Full Jet finder MCP matched to MCD", false);
18631853

1864-
void processJetsNoFidMCPMCDMatchedWeighted(soa::Filtered<EMCCollisionsMCD>::iterator const& collision, JetTableMCDMatchedWeightedJoined const& mcdjets, JetTableMCPMatchedWeightedJoined const& mcpjets, aod::JMcCollisions const&,
1854+
void processJetsNoFidMCPMCDMatchedWeighted(soa::Filtered<EMCCollisionsMCD>::iterator const& collision, JetTableMCDMatchedJoined const& mcdjets, JetTableMCPMatchedJoined const& mcpjets, aod::JMcCollisions const&,
18651855
aod::JetTracks const&, ClusterWithCorrections const&, aod::JetParticles const&)
18661856
{
18671857
bool eventAccepted = false;
@@ -1930,7 +1920,7 @@ struct FullJetSpectra {
19301920
continue;
19311921
}
19321922

1933-
for (const auto& mcpjet : mcdjet.template matchedJetGeo_as<JetTableMCPMatchedWeightedJoined>()) {
1923+
for (const auto& mcpjet : mcdjet.template matchedJetGeo_as<JetTableMCPMatchedJoined>()) {
19341924
allMatchedPartJets++;
19351925
registry.fill(HIST("h_allMatchedNoFidPartJetsPt"), mcpjet.pt(), eventWeight);
19361926

@@ -1943,7 +1933,7 @@ struct FullJetSpectra {
19431933
} else {
19441934
NPartJetFid++;
19451935
// Fill matched histograms (including Response Matrix) for valid MCD-MCP pairs
1946-
fillMatchedNoFidHistograms<JetTableMCDMatchedWeightedJoined::iterator, JetTableMCPMatchedWeightedJoined>(mcdjet, eventWeight);
1936+
fillMatchedNoFidHistograms<JetTableMCDMatchedJoined::iterator, JetTableMCPMatchedJoined>(mcdjet, eventWeight);
19471937
registry.fill(HIST("h2_full_NoFidmatchedmcpjet_pt"), mcpjet.pt(), NPartJetFid, eventWeight);
19481938
registry.fill(HIST("h_full_NoFidmatchedmcpjet_eta"), mcpjet.eta(), eventWeight);
19491939
registry.fill(HIST("h_full_NoFidmatchedmcpjet_phi"), mcpjet.phi(), eventWeight);
@@ -1956,7 +1946,7 @@ struct FullJetSpectra {
19561946
PROCESS_SWITCH(FullJetSpectra, processJetsNoFidMCPMCDMatchedWeighted, "Full Jet finder No Fid MCP matched to MCD on weighted events", false);
19571947

19581948

1959-
void processJetsMCPMCDMatchedWeighted(soa::Filtered<EMCCollisionsMCD>::iterator const& collision, JetTableMCDMatchedWeightedJoined const& mcdjets, JetTableMCPMatchedWeightedJoined const& mcpjets, aod::JMcCollisions const&,
1949+
void processJetsMCPMCDMatchedWeighted(soa::Filtered<EMCCollisionsMCD>::iterator const& collision, JetTableMCDMatchedJoined const& mcdjets, JetTableMCPMatchedJoined const& mcpjets, aod::JMcCollisions const&,
19601950
aod::JetTracks const&, ClusterWithCorrections const&, aod::JetParticles const&)
19611951
{
19621952
bool eventAccepted = false;
@@ -2057,7 +2047,7 @@ struct FullJetSpectra {
20572047
continue;
20582048
}
20592049

2060-
for (const auto& mcpjet : mcdjet.template matchedJetGeo_as<JetTableMCPMatchedWeightedJoined>()) {
2050+
for (const auto& mcpjet : mcdjet.template matchedJetGeo_as<JetTableMCPMatchedJoined>()) {
20612051
allMatchedPartJets++;
20622052
registry.fill(HIST("h_allMatchedPartJetsPt"), mcpjet.pt(), eventWeight);
20632053

@@ -2069,7 +2059,7 @@ struct FullJetSpectra {
20692059
} else {
20702060
NPartJetFid++;
20712061
// Fill matched histograms (including Response Matrix) for valid MCD-MCP pairs
2072-
fillMatchedHistograms<JetTableMCDMatchedWeightedJoined::iterator, JetTableMCPMatchedWeightedJoined>(mcdjet, eventWeight);
2062+
fillMatchedHistograms<JetTableMCDMatchedJoined::iterator, JetTableMCPMatchedJoined>(mcdjet, eventWeight);
20732063
// If both MCD-MCP matched jet pairs are within the EMCAL fiducial region, fill these kinematic histos
20742064
registry.fill(HIST("h2_full_matchedmcpjet_pt"), mcpjet.pt(), NPartJetFid, eventWeight);
20752065
registry.fill(HIST("h_full_matchedmcpjet_eta"), mcpjet.eta(), eventWeight);

0 commit comments

Comments
 (0)