@@ -147,27 +147,29 @@ struct HfTaskElectronWeakBoson {
147147 zorroSummary.setObject (zorro.getZorroSummary ());
148148 }
149149
150+ // add configurable for CCDB path
151+ zorro.setBaseCCDBPath (cfgCCDBPath.value );
152+
150153 // define axes you want to use
151- const AxisSpec axisZvtx{400 , -20 , 20 , " Zvtx" };
154+ const AxisSpec axisZvtx{40 , -20 , 20 , " Zvtx" };
152155 const AxisSpec axisCounter{1 , 0 , 1 , " events" };
153- const AxisSpec axisEta{200 , -1.0 , 1.0 , " #eta" };
156+ const AxisSpec axisEta{20 , -1.0 , 1.0 , " #eta" };
154157 const AxisSpec axisPt{nBinsPt, 0 , binPtmax, " p_{T}" };
155158 const AxisSpec axisNsigma{100 , -5 , 5 , " N#sigma" };
156159 const AxisSpec axisE{nBinsE, 0 , binEmax, " Energy" };
157160 const AxisSpec axisM02{100 , 0 , 1 , " M02" };
158- const AxisSpec axisdPhi{200 , -1 , 1 , " dPhi" };
159- const AxisSpec axisdEta{200 , -1 , 1 , " dEta" };
161+ const AxisSpec axisdPhi{100 , -0.5 , 0.5 , " dPhi" };
162+ const AxisSpec axisdEta{100 , -0.5 , 0.5 , " dEta" };
160163 const AxisSpec axisPhi{350 , 0 , 7 , " Phi" };
161164 const AxisSpec axisEop{200 , 0 , 2 , " Eop" };
162- const AxisSpec axisChi2{500 , 0.0 , 50 .0 , " #chi^{2}" };
165+ const AxisSpec axisChi2{250 , 0.0 , 25 .0 , " #chi^{2}" };
163166 const AxisSpec axisCluster{100 , 0.0 , 200.0 , " counts" };
164- const AxisSpec axisITSNCls{20 , 0.0 , 20 , " counts" };
165- const AxisSpec axisEMCtime{200 , -100.0 , 100 , " EMC time" };
166- const AxisSpec axisIsoEnergy{100 , 0 , 1 , " Isolation energy(GeV/C)" };
167- const AxisSpec axisIsoTrack{20 , -0.5 , 19.5 , " Isolation Track" };
168- const AxisSpec axisInvMassZ{200 , 0 , 200 , " M_{ee} (GeV/c^{2})" };
169- const AxisSpec axisInvMassDy{200 , 0 , 2 , " M_{ee} (GeV/c^{2})" };
170- const AxisSpec axisTrigger{3 , 0 , 2 , " Trigger status of zorro" };
167+ const AxisSpec axisITSNCls{10 , 0.0 , 10 , " counts" };
168+ const AxisSpec axisEMCtime{100 , -50.0 , 50 , " EMC time" };
169+ const AxisSpec axisIsoEnergy{100 , 0 , 1.0 , " Isolation energy(GeV/C)" };
170+ const AxisSpec axisIsoTrack{15 , -0.5 , 14.5 , " Isolation Track" };
171+ const AxisSpec axisInvMassZ{150 , 0 , 150 , " M_{ee} (GeV/c^{2})" };
172+ const AxisSpec axisTrigger{3 , -0.5 , 2.5 , " Trigger status of zorro" };
171173
172174 // create registrygrams
173175 registry.add (" hZvtx" , " Z vertex" , kTH1F , {axisZvtx});
@@ -182,8 +184,6 @@ struct HfTaskElectronWeakBoson {
182184 registry.add (" hPt" , " track pt" , kTH1F , {axisPt});
183185 registry.add (" hTPCNsigma" , " TPC electron Nsigma" , kTH2F , {{axisPt}, {axisNsigma}});
184186 registry.add (" hEnergy" , " EMC cluster energy" , kTH1F , {axisE});
185- registry.add (" hM02" , " EMC M02" , kTH2F , {{axisNsigma}, {axisM02}});
186- registry.add (" hM20" , " EMC M20" , kTH2F , {{axisNsigma}, {axisM02}});
187187 registry.add (" hTrMatch" , " Track EMC Match" , kTH2F , {{axisdPhi}, {axisdEta}});
188188 registry.add (" hTrMatch_mim" , " Track EMC Match minimu minimumm" , kTH2F , {{axisdPhi}, {axisdEta}});
189189 registry.add (" hMatchPhi" , " Match in Phi" , kTH2F , {{axisPhi}, {axisPhi}});
@@ -197,13 +197,13 @@ struct HfTaskElectronWeakBoson {
197197 registry.add (" hIsolationTrack" , " Isolation Track" , kTH2F , {{axisE}, {axisIsoTrack}});
198198 registry.add (" hInvMassZeeLs" , " invariant mass for Z LS pair" , kTH2F , {{axisPt}, {axisInvMassZ}});
199199 registry.add (" hInvMassZeeUls" , " invariant mass for Z ULS pair" , kTH2F , {{axisPt}, {axisInvMassZ}});
200- registry.add (" hTHnElectrons" , " electron info" , HistType::kTHnSparseF , {axisPt, axisNsigma, axisM02, axisM02, axisEop, axisIsoEnergy});
200+ registry.add (" hTHnElectrons" , " electron info" , HistType::kTHnSparseF , {axisPt, axisNsigma, axisM02, axisEop, axisIsoEnergy, axisIsoTrack });
201201
202202 // hisotgram for EMCal trigger
203203 registry.add (" hEMCalTrigger" , " EMCal trigger" , kTH1F , {axisTrigger});
204204 }
205205
206- double calIsolatedCluster (const o2::aod::EMCALCluster& cluster,
206+ double getIsolatedCluster (const o2::aod::EMCALCluster& cluster,
207207 const SelectedClusters& clusters)
208208 {
209209 double energySum = 0.0 ;
@@ -236,17 +236,14 @@ struct HfTaskElectronWeakBoson {
236236
237237 return (isoEnergy);
238238 }
239- int calIsolatedTrack (double etaEle,
239+ int getIsolatedTrack (double etaEle,
240240 double phiEle,
241241 float ptEle,
242242 TrackEle const & tracks)
243243 {
244244 int trackCount = 0 ;
245245
246246 for (const auto & track : tracks) {
247- // skip the reference track
248- if (std::abs (track.pt () - ptEle) < 1e-4 )
249- continue ;
250247
251248 double dEta = track.eta () - etaEle;
252249 double dPhi = track.phi () - phiEle;
@@ -285,9 +282,6 @@ struct HfTaskElectronWeakBoson {
285282 LOGF (info, " Initializing Zorro for run %d" , runNumber);
286283 uint64_t currentTimestamp = bc.timestamp ();
287284
288- // add configurable for CCDB path
289- zorro.setBaseCCDBPath (cfgCCDBPath.value );
290-
291285 // debug for timestamp
292286 LOGF (info, " Using CCDB path: %s, timestamp: %llu" , cfgCCDBPath.value .c_str (), currentTimestamp);
293287
@@ -308,7 +302,6 @@ struct HfTaskElectronWeakBoson {
308302 return ;
309303 }
310304 }
311-
312305 // initialze for inclusive-electron
313306 selectedElectronsIso.clear ();
314307 selectedElectronsAss.clear ();
@@ -381,7 +374,6 @@ struct HfTaskElectronWeakBoson {
381374 if (match.emcalcluster_as <SelectedClusters>().time () < timeEmcMin || match.emcalcluster_as <SelectedClusters>().time () > timeEmcMax)
382375 continue ;
383376
384- float m20Emc = match.emcalcluster_as <SelectedClusters>().m20 ();
385377 float m02Emc = match.emcalcluster_as <SelectedClusters>().m02 ();
386378 float energyEmc = match.emcalcluster_as <SelectedClusters>().energy ();
387379 double phiEmc = match.emcalcluster_as <SelectedClusters>().phi ();
@@ -416,17 +408,15 @@ struct HfTaskElectronWeakBoson {
416408
417409 double eop = energyEmc / match.track_as <TrackEle>().p ();
418410
419- double isoEnergy = calIsolatedCluster (cluster, emcClusters);
411+ double isoEnergy = getIsolatedCluster (cluster, emcClusters);
420412
421- int trackCount = calIsolatedTrack (track.phi (), track.eta (), track.pt (), tracks);
413+ int trackCount = getIsolatedTrack (track.eta (), track.phi (), track.pt (), tracks) - 1 ;
422414
423415 if (match.track_as <TrackEle>().pt () > ptTHnThresh && isTHnElectron) {
424- registry.fill (HIST (" hTHnElectrons" ), match.track_as <TrackEle>().pt (), match.track_as <TrackEle>().tpcNSigmaEl (), m02Emc, m20Emc, eop, isoEnergy);
416+ registry.fill (HIST (" hTHnElectrons" ), match.track_as <TrackEle>().pt (), match.track_as <TrackEle>().tpcNSigmaEl (), m02Emc, eop, isoEnergy, trackCount );
425417 }
426418 // LOG(info) << "E/p" << eop;
427419 registry.fill (HIST (" hEopNsigTPC" ), match.track_as <TrackEle>().tpcNSigmaEl (), eop);
428- registry.fill (HIST (" hM02" ), match.track_as <TrackEle>().tpcNSigmaEl (), m02Emc);
429- registry.fill (HIST (" hM20" ), match.track_as <TrackEle>().tpcNSigmaEl (), m20Emc);
430420 if (match.emcalcluster_as <SelectedClusters>().m02 () < m02Min || match.emcalcluster_as <SelectedClusters>().m02 () > m02Max)
431421 continue ;
432422
0 commit comments