@@ -60,8 +60,6 @@ struct JetSpectraEseTask {
6060 Configurable<std::string> eventSelections{" eventSelections" , " sel8FullPbPb" , " choose event selection" };
6161 Configurable<std::string> trackSelections{" trackSelections" , " globalTracks" , " set track selections" };
6262
63- Configurable<int > fColSwitch {" fColSwitch" , 0 , " collision switch" };
64-
6563 Configurable<bool > cfgEvSelOccupancy{" cfgEvSelOccupancy" , false , " Flag for occupancy cut" };
6664 Configurable<std::vector<int >> cfgCutOccupancy{" cfgCutOccupancy" , {0 , 1000 }, " Occupancy cut" };
6765 Configurable<std::vector<float >> cfgOccupancyPtCut{" cfgOccupancyPtCut" , {0 , 100 }, " pT cut" };
@@ -103,75 +101,79 @@ struct JetSpectraEseTask {
103101
104102 LOGF (info, " jetSpectraEse::init()" );
105103
106- switch (fColSwitch ) {
107- case 0 :
108- LOGF (info, " JetSpectraEseTask::init() - using data" );
109- registry.add (" hEventCounter" , " event status;event status;entries" , {HistType::kTH1F , {{10 , 0.0 , 10.0 }}});
110- registry.add (" hCentralityMult" , " ;Centrality;entries" , {HistType::kTH1F , {{100 , 0 , 100 }}});
111- registry.add (" hJetPt" , " jet pT;#it{p}_{T,jet} (GeV/#it{c});entries" , {HistType::kTH1F , {{jetPtAxis}}});
112- registry.add (" hJetPt_bkgsub" , " jet pT background sub;#it{p}_{T,jet} (GeV/#it{c});entries" , {HistType::kTH1F , {{jetPtAxis}}});
113- registry.add (" hJetEta" , " jet #eta;#eta_{jet};entries" , {HistType::kTH1F , {{100 , -1.0 , 1.0 }}});
114- registry.add (" hJetPhi" , " jet #phi;#phi_{jet};entries" , {HistType::kTH1F , {{80 , -1.0 , 7 .}}});
115- registry.add (" hRho" , " ;#rho;entries" , {HistType::kTH1F , {{100 , 0 , 200 .}}});
116- registry.add (" hJetArea" , " ;area_{jet};entries" , {HistType::kTH1F , {{100 , 0 , 10 .}}});
117- registry.add (" hdPhi" , " #Delta#phi;entries;" , {HistType::kTH1F , {{dPhiAxis}}});
118- registry.add (" hCentJetPtdPhiq2" , " " , {HistType::kTHnSparseF , {{100 , 0 , 100 }, {jetPtAxis}, {dPhiAxis}, {eseAxis}}});
119- registry.add (" hPsi2FT0C" , " ;Centrality; #Psi_{2}" , {HistType::kTH2F , {{100 , 0 , 100 }, {150 , -2.5 , 2.5 }}});
120- registry.addClone (" hPsi2FT0C" , " hPsi2FT0A" );
121- registry.addClone (" hPsi2FT0C" , " hPsi2FV0A" );
122- registry.addClone (" hPsi2FT0C" , " hPsi2TPCpos" );
123- registry.addClone (" hPsi2FT0C" , " hPsi2TPCneg" );
124-
125- registry.add (" hCosPsi2AmC" , " ;Centrality;cos(2(#Psi_{2}^{A}-#Psi_{2}^{B}));#it{q}_{2}" , {HistType::kTH3F , {{100 , 0 , 100 }, {cosAxis}, {eseAxis}}});
126- registry.addClone (" hCosPsi2AmC" , " hCosPsi2AmB" );
127- registry.addClone (" hCosPsi2AmC" , " hCosPsi2BmC" );
128-
129- registry.add (" hQvecUncorV2" , " ;Centrality;Q_x;Q_y" , {HistType::kTH3F , {{100 , 0 , 100 }, {qvecAxis}, {qvecAxis}}});
130- registry.addClone (" hQvecUncorV2" , " hQvecRectrV2" );
131- registry.addClone (" hQvecUncorV2" , " hQvecTwistV2" );
132- registry.addClone (" hQvecUncorV2" , " hQvecFinalV2" );
133-
134- registry.addClone (" hPsi2FT0C" , " hEPUncorV2" );
135- registry.addClone (" hPsi2FT0C" , " hEPRectrV2" );
136- registry.addClone (" hPsi2FT0C" , " hEPTwistV2" );
137-
138- break ;
139- case 1 :
140- LOGF (info, " JetSpectraEseTask::init() - using MC" );
141- registry.add (" hMCEventCounter" , " event status;event status;entries" , {HistType::kTH1F , {{10 , 0.0 , 10.0 }}});
142- registry.add (" hMCPureEventCounter" , " event status;event status;entries" , {HistType::kTH1F , {{10 , 0.0 , 10.0 }}});
143- registry.add (" hMCDMatchedEventCounter" , " event status;event status;entries" , {HistType::kTH1F , {{10 , 0.0 , 10.0 }}});
144- registry.add (" hCentralityMult" , " ;Centrality;entries" , {HistType::kTH1F , {{100 , 0 , 100 }}});
145- registry.add (" hPartJetPt" , " particle level jet pT;#it{p}_{T,jet part} (GeV/#it{c});entries" , {HistType::kTH1F , {{jetPtAxis}}});
146- registry.add (" hPartJetPtSubBkg" , " particle level jet pT;#it{p}_{T,jet part} (GeV/#it{c});entries" , {HistType::kTH1F , {{jetPtAxis}}});
147- registry.add (" hPartJetEta" , " particle level jet #eta;#eta_{jet part};entries" , {HistType::kTH1F , {{100 , -1.0 , 1.0 }}});
148- registry.add (" hPartJetPhi" , " particle level jet #phi;#phi_{jet part};entries" , {HistType::kTH1F , {{80 , -1.0 , 7 .}}});
149- registry.add (" hPartJetPtMatch" , " particle level jet pT;#it{p}_{T,jet part} (GeV/#it{c});entries" , {HistType::kTH1F , {{jetPtAxis}}});
150- registry.add (" hPartJetPtMatchSubBkg" , " particle level jet pT;#it{p}_{T,jet part} (GeV/#it{c});entries" , {HistType::kTH1F , {{jetPtAxis}}});
151- registry.add (" hPartJetEtaMatch" , " particle level jet #eta;#eta_{jet part};entries" , {HistType::kTH1F , {{100 , -1.0 , 1.0 }}});
152- registry.add (" hPartJetPhiMatch" , " particle level jet #phi;#phi_{jet part};entries" , {HistType::kTH1F , {{80 , -1.0 , 7 .}}});
153- registry.add (" hDetectorJetPt" , " detector level jet pT;#it{p}_{T,jet det} (GeV/#it{c});entries" , {HistType::kTH1F , {{jetPtAxis}}});
154- registry.add (" hDetectorJetPtSubBkg" , " detector level jet pT;#it{p}_{T,jet det} (GeV/#it{c});entries" , {HistType::kTH1F , {{jetPtAxis}}});
155- registry.add (" hDetectorJetEta" , " detector level jet #eta;#eta_{jet det};entries" , {HistType::kTH1F , {{100 , -1.0 , 1.0 }}});
156- registry.add (" hDetectorJetPhi" , " detector level jet #phi;#phi_{jet det};entries" , {HistType::kTH1F , {{80 , -1.0 , 7 .}}});
157- registry.add (" hMatchedJetsPtDelta" , " #it{p}_{T,jet part}; det - part" , {HistType::kTH2F , {{jetPtAxis}, {200 , -20 ., 20.0 }}});
158- registry.add (" hMatchedJetsPtDeltaSubBkg" , " #it{p}_{T,jet part}; det - part" , {HistType::kTH2F , {{jetPtAxis}, {200 , -20 ., 20.0 }}});
159- registry.add (" hGenMatchedJetsPtDeltadPt" , " #it{p}_{T,jet part}; det - part / part" , {HistType::kTHnSparseF , {{100 , 0 , 100 }, {jetPtAxis}, {200 , -20 ., 20.0 }}});
160- registry.add (" hRecoMatchedJetsPtDeltadPt" , " #it{p}_{T,jet det}; det - part / det" , {HistType::kTHnSparseF , {{100 , 0 , 100 }, {jetPtAxis}, {200 , -20 ., 20.0 }}});
161- registry.add (" hMatchedJetsEtaDelta" , " #eta_{jet part}; det - part" , {HistType::kTH2F , {{100 , -1.0 , 1.0 }, {200 , -0.8 , 0.8 }}});
162- registry.add (" hMatchedJetsPhiDelta" , " #phi_{jet part}; det - part" , {HistType::kTH2F , {{80 , -1.0 , 7 .}, {200 , -10.0 , 10 .}}});
163- registry.add (" hRespMcDMcPMatch" , " ;Centrality,#it{p}_{T, jet det}; #it{p}_{T, jet part}" , HistType::kTHnSparseF , {{100 , 0 , 100 }, jetPtAxis, jetPtAxis});
164- registry.add (" hRespMcDMcPMatchSubBkg" , " ;Centrality,#it{p}_{T, jet det}; #it{p}_{T, jet part}" , HistType::kTHnSparseF , {{100 , 0 , 100 }, jetPtAxis, jetPtAxis});
165- break ;
166- case 2 :
167- LOGF (info, " JetSpectraEseTask::init() - using Occupancy processing" );
168- registry.add (" hEventCounterOcc" , " event status;event status;entries" , {HistType::kTH1F , {{10 , 0.0 , 10.0 }}});
169- registry.add (" hTrackPt" , " track pT;#it{p}_{T,track} (GeV/#it{c});entries" , {HistType::kTHnSparseF , {{100 , 0 , 100 }, {100 , 0 , 100 }, {eseAxis}, {occAxis}}});
170- registry.add (" hTrackEta" , " track #eta;#eta_{track};entries" , {HistType::kTH3F , {{100 , 0 , 100 }, {100 , -1.0 , 1.0 }, {occAxis}}});
171- registry.add (" hTrackPhi" , " track #phi;#phi_{track};entries" , {HistType::kTH3F , {{100 , 0 , 100 }, {80 , -1.0 , 7 .}, {occAxis}}});
172- registry.add (" hOccupancy" , " Occupancy;Occupancy;entries" , {HistType::kTH1F , {{occAxis}}});
173- registry.add (" hPsiOccupancy" , " Occupancy;#Psi_{2};entries" , {HistType::kTH3F , {{100 , 0 , 100 }, {150 , -2.5 , 2.5 }, {occAxis}}});
174- break ;
104+ if (doprocessESEDataCharged) {
105+ LOGF (info, " JetSpectraEseTask::init() - processESEDataCharged" );
106+ registry.add (" hEventCounter" , " event status;event status;entries" , {HistType::kTH1F , {{10 , 0.0 , 10.0 }}});
107+ registry.add (" hCentralityMult" , " ;Centrality;entries" , {HistType::kTH1F , {{100 , 0 , 100 }}});
108+ registry.add (" hJetPt" , " jet pT;#it{p}_{T,jet} (GeV/#it{c});entries" , {HistType::kTH1F , {{jetPtAxis}}});
109+ registry.add (" hJetPt_bkgsub" , " jet pT background sub;#it{p}_{T,jet} (GeV/#it{c});entries" , {HistType::kTH1F , {{jetPtAxis}}});
110+ registry.add (" hJetEta" , " jet #eta;#eta_{jet};entries" , {HistType::kTH1F , {{100 , -1.0 , 1.0 }}});
111+ registry.add (" hJetPhi" , " jet #phi;#phi_{jet};entries" , {HistType::kTH1F , {{80 , -1.0 , 7 .}}});
112+ registry.add (" hRho" , " ;#rho;entries" , {HistType::kTH1F , {{100 , 0 , 200 .}}});
113+ registry.add (" hJetArea" , " ;area_{jet};entries" , {HistType::kTH1F , {{100 , 0 , 10 .}}});
114+ registry.add (" hdPhi" , " #Delta#phi;entries;" , {HistType::kTH1F , {{dPhiAxis}}});
115+ registry.add (" hCentJetPtdPhiq2" , " " , {HistType::kTHnSparseF , {{100 , 0 , 100 }, {jetPtAxis}, {dPhiAxis}, {eseAxis}}});
116+ registry.add (" hPsi2FT0C" , " ;Centrality; #Psi_{2}" , {HistType::kTH2F , {{100 , 0 , 100 }, {150 , -2.5 , 2.5 }}});
117+ registry.addClone (" hPsi2FT0C" , " hPsi2FT0A" );
118+ registry.addClone (" hPsi2FT0C" , " hPsi2FV0A" );
119+ registry.addClone (" hPsi2FT0C" , " hPsi2TPCpos" );
120+ registry.addClone (" hPsi2FT0C" , " hPsi2TPCneg" );
121+ registry.add (" hCosPsi2AmC" , " ;Centrality;cos(2(#Psi_{2}^{A}-#Psi_{2}^{B}));#it{q}_{2}" , {HistType::kTH3F , {{100 , 0 , 100 }, {cosAxis}, {eseAxis}}});
122+ registry.addClone (" hCosPsi2AmC" , " hCosPsi2AmB" );
123+ registry.addClone (" hCosPsi2AmC" , " hCosPsi2BmC" );
124+ registry.add (" hQvecUncorV2" , " ;Centrality;Q_x;Q_y" , {HistType::kTH3F , {{100 , 0 , 100 }, {qvecAxis}, {qvecAxis}}});
125+ registry.addClone (" hQvecUncorV2" , " hQvecRectrV2" );
126+ registry.addClone (" hQvecUncorV2" , " hQvecTwistV2" );
127+ registry.addClone (" hQvecUncorV2" , " hQvecFinalV2" );
128+ registry.addClone (" hPsi2FT0C" , " hEPUncorV2" );
129+ registry.addClone (" hPsi2FT0C" , " hEPRectrV2" );
130+ registry.addClone (" hPsi2FT0C" , " hEPTwistV2" );
131+ }
132+ if (doprocessMCParticleLevel) {
133+ LOGF (info, " JetSpectraEseTask::init() - processMCParticleLevel" );
134+ registry.add (" hMCPartEventCounter" , " event status;event status;entries" , {HistType::kTH1F , {{10 , 0.0 , 10.0 }}});
135+ registry.add (" hPartJetPt" , " particle level jet pT;#it{p}_{T,jet part} (GeV/#it{c});entries" , {HistType::kTH1F , {{jetPtAxis}}});
136+ registry.add (" hPartJetPtSubBkg" , " particle level jet pT;#it{p}_{T,jet part} (GeV/#it{c});entries" , {HistType::kTH1F , {{jetPtAxis}}});
137+ registry.add (" hPartJetEta" , " particle level jet #eta;#eta_{jet part};entries" , {HistType::kTH1F , {{100 , -1.0 , 1.0 }}});
138+ registry.add (" hPartJetPhi" , " particle level jet #phi;#phi_{jet part};entries" , {HistType::kTH1F , {{80 , -1.0 , 7 .}}});
139+ }
140+ if (doprocessMCDetectorLevel) {
141+ LOGF (info, " JetSpectraEseTask::init() - processMCDetectorLevel" );
142+ registry.add (" hMCDetEventCounter" , " event status;event status;entries" , {HistType::kTH1F , {{10 , 0.0 , 10.0 }}});
143+ registry.add (" hDetJetPt" , " particle level jet pT;#it{p}_{T,jet part} (GeV/#it{c});entries" , {HistType::kTH1F , {{jetPtAxis}}});
144+ registry.add (" hDetJetPtSubBkg" , " particle level jet pT;#it{p}_{T,jet part} (GeV/#it{c});entries" , {HistType::kTH1F , {{jetPtAxis}}});
145+ registry.add (" hDetJetEta" , " particle level jet #eta;#eta_{jet part};entries" , {HistType::kTH1F , {{100 , -1.0 , 1.0 }}});
146+ registry.add (" hDetJetPhi" , " particle level jet #phi;#phi_{jet part};entries" , {HistType::kTH1F , {{80 , -1.0 , 7 .}}});
147+ }
148+ if (doprocessMCChargedMatched) {
149+ LOGF (info, " JetSpectraEseTask::init() - processMCChargedMatched" );
150+ registry.add (" hMCEventCounter" , " event status;event status;entries" , {HistType::kTH1F , {{10 , 0.0 , 10.0 }}});
151+ registry.add (" hMCDMatchedEventCounter" , " event status;event status;entries" , {HistType::kTH1F , {{10 , 0.0 , 10.0 }}});
152+ registry.add (" hCentralityMult" , " ;Centrality;entries" , {HistType::kTH1F , {{100 , 0 , 100 }}});
153+ registry.add (" hPartJetPtMatch" , " ;Centrality;#it{p}_{T,jet part} (GeV/#it{c})" , {HistType::kTH2F , {{100 , 0 , 100 }, {jetPtAxis}}});
154+ registry.add (" hPartJetPtMatchSubBkg" , " ;Centrality;#it{p}_{T,jet part} (GeV/#it{c})" , {HistType::kTH2F , {{100 , 0 , 100 }, {jetPtAxis}}});
155+ registry.add (" hPartJetEtaMatch" , " particle level jet #eta;#eta_{jet part};entries" , {HistType::kTH1F , {{100 , -1.0 , 1.0 }}});
156+ registry.add (" hPartJetPhiMatch" , " particle level jet #phi;#phi_{jet part};entries" , {HistType::kTH1F , {{80 , -1.0 , 7 .}}});
157+ registry.add (" hDetectorJetPt" , " ;Centrality;#it{p}_{T,jet det} (GeV/#it{c})" , {HistType::kTH2F , {{100 , 0 , 100 }, {jetPtAxis}}});
158+ registry.add (" hDetectorJetPtSubBkg" , " ;Centrality;#it{p}_{T,jet det} (GeV/#it{c})" , {HistType::kTH2F , {{100 , 0 , 100 }, {jetPtAxis}}});
159+ registry.add (" hDetectorJetEta" , " detector level jet #eta;#eta_{jet det};entries" , {HistType::kTH1F , {{100 , -1.0 , 1.0 }}});
160+ registry.add (" hDetectorJetPhi" , " detector level jet #phi;#phi_{jet det};entries" , {HistType::kTH1F , {{80 , -1.0 , 7 .}}});
161+ registry.add (" hMatchedJetsPtDelta" , " #it{p}_{T,jet part}; det - part" , {HistType::kTH2F , {{jetPtAxis}, {200 , -20 ., 20.0 }}});
162+ registry.add (" hGenMatchedJetsPtDeltadPt" , " #it{p}_{T,jet part}; det - part / part" , {HistType::kTHnSparseF , {{100 , 0 , 100 }, {jetPtAxis}, {200 , -20 ., 20.0 }}});
163+ registry.add (" hRecoMatchedJetsPtDeltadPt" , " #it{p}_{T,jet det}; det - part / det" , {HistType::kTHnSparseF , {{100 , 0 , 100 }, {jetPtAxis}, {200 , -20 ., 20.0 }}});
164+ registry.add (" hMatchedJetsEtaDelta" , " #eta_{jet part}; det - part" , {HistType::kTH2F , {{100 , -1.0 , 1.0 }, {200 , -0.8 , 0.8 }}});
165+ registry.add (" hMatchedJetsPhiDelta" , " #phi_{jet part}; det - part" , {HistType::kTH2F , {{80 , -1.0 , 7 .}, {200 , -10.0 , 10 .}}});
166+ registry.add (" hRespMcDMcPMatch" , " ;Centrality,#it{p}_{T, jet det}; #it{p}_{T, jet part}" , HistType::kTHnSparseF , {{100 , 0 , 100 }, jetPtAxis, jetPtAxis});
167+ registry.add (" hRespMcDMcPMatchSubBkg" , " ;Centrality,#it{p}_{T, jet det}; #it{p}_{T, jet part}" , HistType::kTHnSparseF , {{100 , 0 , 100 }, jetPtAxis, jetPtAxis});
168+ }
169+ if (doprocessESEOccupancy) {
170+ LOGF (info, " JetSpectraEseTask::init() - processESEOccupancy" );
171+ registry.add (" hEventCounterOcc" , " event status;event status;entries" , {HistType::kTH1F , {{10 , 0.0 , 10.0 }}});
172+ registry.add (" hTrackPt" , " track pT;#it{p}_{T,track} (GeV/#it{c});entries" , {HistType::kTHnSparseF , {{100 , 0 , 100 }, {100 , 0 , 100 }, {eseAxis}, {occAxis}}});
173+ registry.add (" hTrackEta" , " track #eta;#eta_{track};entries" , {HistType::kTH3F , {{100 , 0 , 100 }, {100 , -1.0 , 1.0 }, {occAxis}}});
174+ registry.add (" hTrackPhi" , " track #phi;#phi_{track};entries" , {HistType::kTH3F , {{100 , 0 , 100 }, {80 , -1.0 , 7 .}, {occAxis}}});
175+ registry.add (" hOccupancy" , " Occupancy;Occupancy;entries" , {HistType::kTH1F , {{occAxis}}});
176+ registry.add (" hPsiOccupancy" , " Occupancy;#Psi_{2};entries" , {HistType::kTH3F , {{100 , 0 , 100 }, {150 , -2.5 , 2.5 }, {occAxis}}});
175177 }
176178 }
177179
@@ -254,29 +256,53 @@ struct JetSpectraEseTask {
254256 }
255257 PROCESS_SWITCH (JetSpectraEseTask, processESEOccupancy, " process occupancy" , false );
256258
257- void processMCParticleLevel (soa::Join<aod::JetMcCollisions, aod::BkgChargedMcRhos>::iterator const & col ,
259+ void processMCParticleLevel (soa::Join<aod::JetMcCollisions, aod::BkgChargedMcRhos>::iterator const & collision ,
258260 soa::Filtered<aod::ChargedMCParticleLevelJets> const & jets)
259261 {
260262 float counter{0 .5f };
261- registry.fill (HIST (" hMCPureEventCounter " ), counter++);
262- if (col .size () < 1 ) {
263+ registry.fill (HIST (" hMCPartEventCounter " ), counter++);
264+ if (collision .size () < 1 ) {
263265 return ;
264266 }
265- registry.fill (HIST (" hMCPureEventCounter " ), counter++);
266- if (!(std::abs (col .posZ ()) < vertexZCut)) {
267+ registry.fill (HIST (" hMCPartEventCounter " ), counter++);
268+ if (!(std::abs (collision .posZ ()) < vertexZCut)) {
267269 return ;
268270 }
269- registry.fill (HIST (" hMCPureEventCounter " ), counter++);
271+ registry.fill (HIST (" hMCPartEventCounter " ), counter++);
270272
271273 for (const auto & jet : jets) {
272274 registry.fill (HIST (" hPartJetPt" ), jet.pt ());
273- registry.fill (HIST (" hPartJetPtSubBkg" ), jet.pt () - (col .rho () * jet.area ()));
275+ registry.fill (HIST (" hPartJetPtSubBkg" ), jet.pt () - (collision .rho () * jet.area ()));
274276 registry.fill (HIST (" hPartJetEta" ), jet.eta ());
275277 registry.fill (HIST (" hPartJetPhi" ), jet.phi ());
276278 }
277279 }
278280 PROCESS_SWITCH (JetSpectraEseTask, processMCParticleLevel, " jets on particle level MC" , false );
279281
282+ void processMCDetectorLevel (soa::Join<aod::JetCollisionsMCD, aod::BkgChargedRhos>::iterator const & collision,
283+ ChargedMCDJets const & mcdjets,
284+ aod::JetTracks const &,
285+ aod::JetParticles const &)
286+ {
287+ float counter{0 .5f };
288+ if (!jetderiveddatautilities::selectCollision (collision, eventSelection))
289+ return ;
290+ registry.fill (HIST (" hMCDetEventCounter" ), counter++);
291+
292+ if (cfgEvSelOccupancy && !isOccupancyWithin (collision))
293+ return ;
294+ registry.fill (HIST (" hMCDetEventCounter" ), counter++);
295+
296+ for (const auto & mcdjet : mcdjets) {
297+ auto mcdetPt{mcdjet.pt () - (collision.rho () * mcdjet.area ())};
298+ registry.fill (HIST (" hDetJetPt" ), mcdjet.pt ());
299+ registry.fill (HIST (" hDetJetPtSubBkg" ), mcdetPt);
300+ registry.fill (HIST (" hDetJetEta" ), mcdjet.eta ());
301+ registry.fill (HIST (" hDetJetPhi" ), mcdjet.phi ());
302+ }
303+ }
304+ PROCESS_SWITCH (JetSpectraEseTask, processMCDetectorLevel, " jets on detector level" , false );
305+
280306 using JetMCPTable = soa::Filtered<soa::Join<aod::ChargedMCParticleLevelJets, aod::ChargedMCParticleLevelJetConstituents, aod::ChargedMCParticleLevelJetsMatchedToChargedMCDetectorLevelJets>>;
281307 void processMCChargedMatched (/* soa::Filtered<aod::JetCollisionsMCD>::iterator const& collision*/
282308 soa::Join<aod::JetMcCollisions, aod::BkgChargedMcRhos>::iterator const & mcCol,
@@ -304,10 +330,6 @@ struct JetSpectraEseTask {
304330 return ;
305331 }
306332
307- if (collision.centrality () < centRange->at (0 ) || collision.centrality () > centRange->at (1 ))
308- return ;
309- registry.fill (HIST (" hMCDMatchedEventCounter" ), secCount++);
310-
311333 if (!jetderiveddatautilities::selectCollision (collision, eventSelection))
312334 return ;
313335 registry.fill (HIST (" hMCDMatchedEventCounter" ), secCount++);
@@ -316,21 +338,24 @@ struct JetSpectraEseTask {
316338 return ;
317339 registry.fill (HIST (" hMCDMatchedEventCounter" ), secCount++);
318340
341+ if (collision.centrality () < centRange->at (0 ) || collision.centrality () > centRange->at (1 ))
342+ registry.fill (HIST (" hMCDMatchedEventCounter" ), secCount++);
343+
319344 registry.fill (HIST (" hCentralityMult" ), collision.centrality ());
320345 auto collmcdJets{mcdjets.sliceBy (mcdjetsPerJCollision, collision.globalIndex ())};
321346 for (const auto & mcdjet : collmcdJets) {
322347 auto mcdPt{mcdjet.pt () - (collision.rho () * mcdjet.area ())};
323- registry.fill (HIST (" hDetectorJetPt" ), mcdjet.pt ());
324- registry.fill (HIST (" hDetectorJetPtSubBkg" ), mcdPt);
348+ registry.fill (HIST (" hDetectorJetPt" ), collision. centrality (), mcdjet.pt ());
349+ registry.fill (HIST (" hDetectorJetPtSubBkg" ), collision. centrality (), mcdPt);
325350 registry.fill (HIST (" hDetectorJetEta" ), mcdjet.eta ());
326351 registry.fill (HIST (" hDetectorJetPhi" ), mcdjet.phi ());
327352 for (const auto & mcpjet : mcdjet.template matchedJetGeo_as <JetMCPTable>()) {
328353 auto mcpPt{mcpjet.pt () - (mcCol.rho () * mcpjet.area ())};
329- registry.fill (HIST (" hPartJetPtMatch" ), mcpjet.pt ());
330- registry.fill (HIST (" hPartJetPtMatchSubBkg" ), mcpPt);
354+ registry.fill (HIST (" hPartJetPtMatch" ), collision. centrality (), mcpjet.pt ());
355+ registry.fill (HIST (" hPartJetPtMatchSubBkg" ), collision. centrality (), mcpPt);
331356 registry.fill (HIST (" hPartJetEtaMatch" ), mcpjet.eta ());
332357 registry.fill (HIST (" hPartJetPhiMatch" ), mcpjet.phi ());
333- registry.fill (HIST (" hMatchedJetsPtDelta" ), mcpPt, mcdPt - mcpPt );
358+ registry.fill (HIST (" hMatchedJetsPtDelta" ), mcpjet. pt (), mcdjet. pt () - mcpjet. pt () );
334359 registry.fill (HIST (" hGenMatchedJetsPtDeltadPt" ), collision.centrality (), mcpPt, (mcdPt - mcpPt) / mcpPt);
335360 registry.fill (HIST (" hRecoMatchedJetsPtDeltadPt" ), collision.centrality (), mcdPt, (mcdPt - mcpPt) / mcdPt);
336361 registry.fill (HIST (" hMatchedJetsPhiDelta" ), mcpjet.phi (), mcdjet.phi () - mcpjet.phi ());
@@ -344,7 +369,7 @@ struct JetSpectraEseTask {
344369 }
345370 registry.fill (HIST (" hMCEventCounter" ), counter++);
346371 }
347- PROCESS_SWITCH (JetSpectraEseTask, processMCChargedMatched, " jet geto matched mcp and mcd " , false );
372+ PROCESS_SWITCH (JetSpectraEseTask, processMCChargedMatched, " jet MC process: geometrically matched MCP and MCD for response matrix and efficiency " , false );
348373
349374 template <typename T>
350375 bool isAcceptedLeadTrack (T const & tracks)
0 commit comments