@@ -204,19 +204,19 @@ void o2::aod::pwgem::photon::histogram::DefineHistograms(THashList* list, const
204204 }
205205
206206 if (TString (histClass).Contains (" EE" )) {
207- const int nm = 167 ;
207+ const int nm = 145 ;
208208 double mee[nm] = {0 .f };
209209 for (int i = 0 ; i < 110 ; i++) {
210210 mee[i] = 0.01 * (i - 0 ) + 0.0 ; // every 0.01 GeV/c2 up to 1.1 GeV/c2
211211 }
212- for (int i = 110 ; i < 128 ; i++) {
213- mee[i] = 0.1 * (i - 110 ) + 1.1 ; // every 0.1 GeV/c2 from 1.1 to 2.9 GeV/c2
212+ for (int i = 110 ; i < 126 ; i++) {
213+ mee[i] = 0.1 * (i - 110 ) + 1.1 ; // every 0.1 GeV/c2 from 1.1 to 2.7 GeV/c2
214214 }
215- for (int i = 128 ; i < 158 ; i++) {
216- mee[i] = 0.01 * (i - 128 ) + 2.9 ; // every 0.01 GeV/c2 from 2.9 to 3.2 GeV/c2
215+ for (int i = 126 ; i < 136 ; i++) {
216+ mee[i] = 0.05 * (i - 126 ) + 2.7 ; // every 0.05 GeV/c2 from 2.7 to 3.2 GeV/c2
217217 }
218- for (int i = 158 ; i < nm; i++) {
219- mee[i] = 0.1 * (i - 158 ) + 3.2 ; // every 0.01 GeV/c2 from 3.2 to 3.5 GeV/c2
218+ for (int i = 136 ; i < nm; i++) {
219+ mee[i] = 0.1 * (i - 136 ) + 3.2 ; // every 0.1 GeV/c2 from 3.2 to 4.0 GeV/c2
220220 }
221221
222222 const int npt = 61 ;
@@ -228,39 +228,45 @@ void o2::aod::pwgem::photon::histogram::DefineHistograms(THashList* list, const
228228 pt[i] = 0.5 * (i - 50 ) + 5.0 ;
229229 }
230230
231- const int ndim = 4 ; // m, pt, dca, phiv
232- const int nbins[ndim] = {nm - 1 , npt - 1 , ndca - 1 , 18 };
233- const double xmin[ndim] = {0.0 , 0.0 , 0.0 , 0.0 };
234- const double xmax[ndim] = {4.0 , 10.0 , 5.0 , M_PI };
231+ const int ndim = 3 ; // m, pt, dca
232+ const int nbins[ndim] = {nm - 1 , npt - 1 , ndca - 1 };
233+ const double xmin[ndim] = {0.0 , 0.0 , 0.0 };
234+ const double xmax[ndim] = {4.0 , 10.0 , 5.0 };
235235
236- hs_dilepton_uls_same = new THnSparseF (" hs_dilepton_uls_same" , " hs_dilepton_uls;m_{ee} (GeV/c^{2});p_{T,ee} (GeV/c);DCA_{ee}^{3D} (#sigma);#varphi_{V} (rad.); " , ndim, nbins, xmin, xmax);
236+ hs_dilepton_uls_same = new THnSparseF (" hs_dilepton_uls_same" , " hs_dilepton_uls;m_{ee} (GeV/c^{2});p_{T,ee} (GeV/c);DCA_{ee}^{3D} (#sigma);" , ndim, nbins, xmin, xmax);
237237 hs_dilepton_uls_same->SetBinEdges (0 , mee);
238238 hs_dilepton_uls_same->SetBinEdges (1 , pt);
239239 hs_dilepton_uls_same->SetBinEdges (2 , dca);
240240 hs_dilepton_uls_same->Sumw2 ();
241241 list->Add (hs_dilepton_uls_same);
242242
243- hs_dilepton_lspp_same = new THnSparseF (" hs_dilepton_lspp_same" , " hs_dilepton_lspp;m_{ee} (GeV/c^{2});p_{T,ee} (GeV/c);DCA_{ee}^{3D} (#sigma);#varphi_{V} (rad.); " , ndim, nbins, xmin, xmax);
243+ hs_dilepton_lspp_same = new THnSparseF (" hs_dilepton_lspp_same" , " hs_dilepton_lspp;m_{ee} (GeV/c^{2});p_{T,ee} (GeV/c);DCA_{ee}^{3D} (#sigma);" , ndim, nbins, xmin, xmax);
244244 hs_dilepton_lspp_same->SetBinEdges (0 , mee);
245245 hs_dilepton_lspp_same->SetBinEdges (1 , pt);
246246 hs_dilepton_lspp_same->SetBinEdges (2 , dca);
247247 hs_dilepton_lspp_same->Sumw2 ();
248248 list->Add (hs_dilepton_lspp_same);
249249
250- hs_dilepton_lsmm_same = new THnSparseF (" hs_dilepton_lsmm_same" , " hs_dilepton_lsmm;m_{ee} (GeV/c^{2});p_{T,ee} (GeV/c);DCA_{ee}^{3D} (#sigma);#varphi_{V} (rad.); " , ndim, nbins, xmin, xmax);
250+ hs_dilepton_lsmm_same = new THnSparseF (" hs_dilepton_lsmm_same" , " hs_dilepton_lsmm;m_{ee} (GeV/c^{2});p_{T,ee} (GeV/c);DCA_{ee}^{3D} (#sigma);" , ndim, nbins, xmin, xmax);
251251 hs_dilepton_lsmm_same->SetBinEdges (0 , mee);
252252 hs_dilepton_lsmm_same->SetBinEdges (1 , pt);
253253 hs_dilepton_lsmm_same->SetBinEdges (2 , dca);
254254 hs_dilepton_lsmm_same->Sumw2 ();
255255 list->Add (hs_dilepton_lsmm_same);
256256
257+ TH2F * hMvsPhiV_uls_same = new TH2F (" hMvsPhiV_uls_same" , " m_{ee} vs. #varphi_{V};#varphi_{V} (rad.);m_{ee} (GeV/c^{2})" , 72 , 0 , M_PI , 100 , 0 .0f , 0 .1f );
258+ hMvsPhiV_uls_same->Sumw2 ();
259+ list->Add (hMvsPhiV_uls_same);
260+ list->Add (reinterpret_cast <TH2F *>(hMvsPhiV_uls_same->Clone (" hMvsPhiV_lspp_same" )));
261+ list->Add (reinterpret_cast <TH2F *>(hMvsPhiV_uls_same->Clone (" hMvsPhiV_lsmm_same" )));
262+
257263 if (TString (subGroup).Contains (" mix" )) {
258- THnSparseF* hs_dilepton_uls_mix = reinterpret_cast <THnSparseF*>(hs_dilepton_uls_same->Clone (" hs_dilepton_uls_mix" ));
259- THnSparseF* hs_dilepton_lspp_mix = reinterpret_cast <THnSparseF*>(hs_dilepton_lspp_same->Clone (" hs_dilepton_lspp_mix" ));
260- THnSparseF* hs_dilepton_lsmm_mix = reinterpret_cast <THnSparseF*>(hs_dilepton_lsmm_same->Clone (" hs_dilepton_lsmm_mix" ));
261- list->Add (hs_dilepton_uls_mix );
262- list->Add (hs_dilepton_lspp_mix );
263- list->Add (hs_dilepton_lsmm_mix );
264+ list-> Add ( reinterpret_cast <THnSparseF*>(hs_dilepton_uls_same->Clone (" hs_dilepton_uls_mix" ) ));
265+ list-> Add ( reinterpret_cast <THnSparseF*>(hs_dilepton_lspp_same->Clone (" hs_dilepton_lspp_mix" ) ));
266+ list-> Add ( reinterpret_cast <THnSparseF*>(hs_dilepton_lsmm_same->Clone (" hs_dilepton_lsmm_mix" ) ));
267+ list->Add (reinterpret_cast < TH2F *>(hMvsPhiV_uls_same-> Clone ( " hMvsPhiV_uls_mix " )) );
268+ list->Add (reinterpret_cast < TH2F *>(hMvsPhiV_uls_same-> Clone ( " hMvsPhiV_lspp_mix " )) );
269+ list->Add (reinterpret_cast < TH2F *>(hMvsPhiV_uls_same-> Clone ( " hMvsPhiV_lsmm_mix " )) );
264270 }
265271
266272 if (TString (subGroup).Contains (" dca" )) {
@@ -312,33 +318,30 @@ void o2::aod::pwgem::photon::histogram::DefineHistograms(THashList* list, const
312318 }
313319 } // end of mc
314320 } else if (TString (histClass).Contains (" MuMu" )) {
315- const int ndim = 4 ; // m, pt, dca, phiv
316- const int nbins[ndim] = {90 , 20 , ndca - 1 , 1 };
317- const double xmin[ndim] = {0.2 , 0.0 , 0.0 , 0.0 };
318- const double xmax[ndim] = {1.1 , 2.0 , 5.0 , 3.2 };
321+ const int ndim = 3 ; // m, pt, dca
322+ const int nbins[ndim] = {90 , 20 , ndca - 1 };
323+ const double xmin[ndim] = {0.2 , 0.0 , 0.0 };
324+ const double xmax[ndim] = {1.1 , 2.0 , 5.0 };
319325
320- hs_dilepton_uls_same = new THnSparseF (" hs_dilepton_uls_same" , " hs_dilepton_uls;m_{#mu#mu} (GeV/c^{2});p_{T,#mu#mu} (GeV/c);DCA_{#mu#mu}^{3D} (#sigma);#varphi_{V} (rad.); " , ndim, nbins, xmin, xmax);
326+ hs_dilepton_uls_same = new THnSparseF (" hs_dilepton_uls_same" , " hs_dilepton_uls;m_{#mu#mu} (GeV/c^{2});p_{T,#mu#mu} (GeV/c);DCA_{#mu#mu}^{3D} (#sigma);" , ndim, nbins, xmin, xmax);
321327 hs_dilepton_uls_same->Sumw2 ();
322328 hs_dilepton_uls_same->SetBinEdges (2 , dca);
323329 list->Add (hs_dilepton_uls_same);
324330
325- hs_dilepton_lspp_same = new THnSparseF (" hs_dilepton_lspp_same" , " hs_dilepton_lspp;m_{#mu#mu} (GeV/c^{2});p_{T,#mu#mu} (GeV/c);DCA_{#mu#mu}^{3D} (#sigma);#varphi_{V} (rad.); " , ndim, nbins, xmin, xmax);
331+ hs_dilepton_lspp_same = new THnSparseF (" hs_dilepton_lspp_same" , " hs_dilepton_lspp;m_{#mu#mu} (GeV/c^{2});p_{T,#mu#mu} (GeV/c);DCA_{#mu#mu}^{3D} (#sigma);" , ndim, nbins, xmin, xmax);
326332 hs_dilepton_lspp_same->Sumw2 ();
327333 hs_dilepton_lspp_same->SetBinEdges (2 , dca);
328334 list->Add (hs_dilepton_lspp_same);
329335
330- hs_dilepton_lsmm_same = new THnSparseF (" hs_dilepton_lsmm_same" , " hs_dilepton_lsmm;m_{#mu#mu} (GeV/c^{2});p_{T,#mu#mu} (GeV/c);DCA_{#mu#mu}^{3D} (#sigma);#varphi_{V} (rad.); " , ndim, nbins, xmin, xmax);
336+ hs_dilepton_lsmm_same = new THnSparseF (" hs_dilepton_lsmm_same" , " hs_dilepton_lsmm;m_{#mu#mu} (GeV/c^{2});p_{T,#mu#mu} (GeV/c);DCA_{#mu#mu}^{3D} (#sigma);" , ndim, nbins, xmin, xmax);
331337 hs_dilepton_lsmm_same->Sumw2 ();
332338 hs_dilepton_lsmm_same->SetBinEdges (2 , dca);
333339 list->Add (hs_dilepton_lsmm_same);
334340
335341 if (TString (subGroup).Contains (" mix" )) {
336- THnSparseF* hs_dilepton_uls_mix = reinterpret_cast <THnSparseF*>(hs_dilepton_uls_same->Clone (" hs_dilepton_uls_mix" ));
337- THnSparseF* hs_dilepton_lspp_mix = reinterpret_cast <THnSparseF*>(hs_dilepton_lspp_same->Clone (" hs_dilepton_lspp_mix" ));
338- THnSparseF* hs_dilepton_lsmm_mix = reinterpret_cast <THnSparseF*>(hs_dilepton_lsmm_same->Clone (" hs_dilepton_lsmm_mix" ));
339- list->Add (hs_dilepton_uls_mix);
340- list->Add (hs_dilepton_lspp_mix);
341- list->Add (hs_dilepton_lsmm_mix);
342+ list->Add (reinterpret_cast <THnSparseF*>(hs_dilepton_uls_same->Clone (" hs_dilepton_uls_mix" )));
343+ list->Add (reinterpret_cast <THnSparseF*>(hs_dilepton_lspp_same->Clone (" hs_dilepton_lspp_mix" )));
344+ list->Add (reinterpret_cast <THnSparseF*>(hs_dilepton_lsmm_same->Clone (" hs_dilepton_lsmm_mix" )));
342345 }
343346 } else {
344347 LOGF (info, " EE or MuMu are supported." );
0 commit comments