@@ -906,42 +906,42 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h
906906 }
907907
908908 if (!groupStr.CompareTo (" mctruth_triple" )) {
909- hm->AddHistogram (histClass, " Eta_Pt" , " " , false , 100 , -2.0 , 2.0 , VarManager::kPairEta , 200 , 0.0 , 20 .0 , VarManager::kPairPt );
910- hm->AddHistogram (histClass, " Eta_Pt_lepton1" , " " , false , 100 , -2.0 , 2.0 , VarManager::kEta1 , 200 , 0.0 , 20 .0 , VarManager::kPt1 );
911- hm->AddHistogram (histClass, " Eta_Pt_lepton2" , " " , false , 100 , -2.0 , 2.0 , VarManager::kEta2 , 200 , 0.0 , 20 .0 , VarManager::kPt2 );
912- hm->AddHistogram (histClass, " Eta_Pt_Photon " , " " , false , 100 , -2.0 , 2.0 , VarManager::kEta , 200 , 0.0 , 20 .0 , VarManager::kPt );
909+ hm->AddHistogram (histClass, " Eta_Pt" , " " , false , 100 , -2.0 , 2.0 , VarManager::kPairEta , 200 , 0.0 , 30 .0 , VarManager::kPairPt );
910+ hm->AddHistogram (histClass, " Eta_Pt_lepton1" , " " , false , 100 , -2.0 , 2.0 , VarManager::kEta1 , 200 , 0.0 , 30 .0 , VarManager::kPt1 );
911+ hm->AddHistogram (histClass, " Eta_Pt_lepton2" , " " , false , 100 , -2.0 , 2.0 , VarManager::kEta2 , 200 , 0.0 , 30 .0 , VarManager::kPt2 );
912+ hm->AddHistogram (histClass, " Eta_Pt_Assoc " , " " , false , 100 , -2.0 , 2.0 , VarManager::kEta , 200 , 0.0 , 30 .0 , VarManager::kPt );
913913 hm->AddHistogram (histClass, " Phi_Eta" , " #phi vs #eta distribution" , false , 200 , -5.0 , 5.0 , VarManager::kPairEta , 200 , -2 . * o2::constants::math::PI, 2 . * o2::constants::math::PI, VarManager::kPairPhi );
914914 hm->AddHistogram (histClass, " Mass_Dilepton" , " " , false , 4500 , 0.0 , 4.5 , VarManager::kPairMassDau );
915- hm->AddHistogram (histClass, " Mass_Photon" , " " , false , 500 , 0.0 , 0.1 , VarManager::kMassDau );
916- hm->AddHistogram (histClass, " Mass_Dilepton_Mass_Photon" , " " , false , 500 , 0.0 , 5.0 , VarManager::kPairMassDau , 500 , 0.0 , 5.0 , VarManager::kMassDau );
917- hm->AddHistogram (histClass, " Pt_Dilepton" , " " , false , 2000 , 0.0 , 20.0 , VarManager::kPairPtDau );
918- hm->AddHistogram (histClass, " Pt_Photon" , " " , false , 500 , 0.0 , 5.0 , VarManager::kPt );
919- hm->AddHistogram (histClass, " Mass_DileptonPhoton" , " " , false , 4500 , 0.0 , 4.5 , VarManager::kPairMass );
920- hm->AddHistogram (histClass, " Pt_DileptonPhoton" , " " , false , 2000 , 0.0 , 20.0 , VarManager::kPairPt );
921- hm->AddHistogram (histClass, " Mass_Pt_DileptonPhoton" , " " , false , 500 , 0.0 , 5.0 , VarManager::kPairMass , 200 , 0.0 , 20.0 , VarManager::kPairPt );
922- hm->AddHistogram (histClass, " DeltaMass" , " " , false , 1500 , 0.0 , 1.5 , VarManager::kDeltaMass );
923- hm->AddHistogram (histClass, " DeltaMass_ptdileptonphoton" , " " , false , 1000 , 0.0 , 1.0 , VarManager::kDeltaMass , 3000 , 0.0 , 30.0 , VarManager::kPairPt );
915+ hm->AddHistogram (histClass, " Mass_Assoc" , " " , false , 500 , 0.0 , 1.0 , VarManager::kMassDau );
916+ hm->AddHistogram (histClass, " Mass_Dilepton_Mass_Assoc" , " " , false , 500 , 0.0 , 5.0 , VarManager::kPairMassDau , 500 , 0.0 , 5.0 , VarManager::kMassDau );
917+ hm->AddHistogram (histClass, " Pt_Dilepton" , " " , false , 2000 , 0.0 , 30.0 , VarManager::kPairPtDau );
918+ hm->AddHistogram (histClass, " Pt_Assoc" , " " , false , 500 , 0.0 , 10.0 , VarManager::kPt );
919+ hm->AddHistogram (histClass, " Mass_DileptonAssoc" , " " , false , 4500 , 0.0 , 30.0 , VarManager::kPairMass );
920+ hm->AddHistogram (histClass, " Pt_DileptonAssoc" , " " , false , 2000 , 0.0 , 30.0 , VarManager::kPairPt );
921+ hm->AddHistogram (histClass, " Mass_Pt_DileptonAssoc" , " " , false , 500 , 0.0 , 30.0 , VarManager::kPairMass , 200 , 0.0 , 30.0 , VarManager::kPairPt );
922+ hm->AddHistogram (histClass, " Pt_Rap_DileptonAssoc" , " " , false , 5120 , 0.0 , 30.0 , VarManager::kPairPt , 1000 , -5.0 , 5.0 , VarManager::kRap );
923+ hm->AddHistogram (histClass, " DeltaMass" , " " , false , 1500 , 0.0 , 5.5 , VarManager::kDeltaMass );
924+ hm->AddHistogram (histClass, " DeltaMass_ptdileptonassoc" , " " , false , 1000 , 0.0 , 1.0 , VarManager::kDeltaMass , 3000 , 0.0 , 30.0 , VarManager::kPairPt );
924925 hm->AddHistogram (histClass, " DeltaMass_Jpsi" , " " , false , 1500 , 3 , 4.5 , (VarManager::kDeltaMass_jpsi ));
925- hm->AddHistogram (histClass, " Rapidity" , " " , false , 400 , -4 .0 , 4 .0 , VarManager::kRap );
926+ hm->AddHistogram (histClass, " Rapidity" , " " , false , 400 , -5 .0 , 5 .0 , VarManager::kRap );
926927 }
927928 if (!groupStr.CompareTo (" mctruth_pair" )) {
928- hm->AddHistogram (histClass, " Mass_Pt" , " " , false , 500 , 0.0 , 15.0 , VarManager::kMass , 40 , 0.0 , 20.0 , VarManager::kPt );
929- hm->AddHistogram (histClass, " Pt" , " " , false , 200 , 0.0 , 20.0 , VarManager::kPt );
929+ hm->AddHistogram (histClass, " Mass_Pt" , " " , false , 500 , 0.0 , 15.0 , VarManager::kMCMass , 40 , 0.0 , 20.0 , VarManager::kMCPt );
930+ hm->AddHistogram (histClass, " Pt" , " " , false , 200 , 0.0 , 20.0 , VarManager::kMCPt );
930931 hm->AddHistogram (histClass, " Pt_Dilepton" , " " , false , 200 , 0.0 , 20.0 , VarManager::kPairPtDau );
931- hm->AddHistogram (histClass, " Eta_Pt_lepton1" , " " , false , 100 , -2.0 , 2.0 , VarManager::kEta1 , 200 , 0.0 , 20.0 , VarManager::kPt1 );
932- hm->AddHistogram (histClass, " Eta_Pt_lepton2" , " " , false , 100 , -2.0 , 2.0 , VarManager::kEta2 , 200 , 0.0 , 20.0 , VarManager::kPt2 );
933- hm->AddHistogram (histClass, " Mass" , " " , false , 500 , 0.0 , 15.0 , VarManager::kMass );
934- hm->AddHistogram (histClass, " Eta_Pt" , " " , false , 40 , -2.0 , 2.0 , VarManager::kEta , 200 , 0.0 , 20.0 , VarManager::kPt );
935- hm->AddHistogram (histClass, " Phi_Eta" , " #phi vs #eta distribution" , false , 200 , -5.0 , 5.0 , VarManager::kEta , 200 , -2 . * o2::constants::math::PI, 2 . * o2::constants::math::PI, VarManager::kPhi );
936- int varspTHE[3 ] = {VarManager::kMCPt , VarManager::kMCCosThetaHE , VarManager::kMCPhiHE };
937- int varspTCS[3 ] = {VarManager::kMCPt , VarManager::kMCCosThetaCS , VarManager::kMCPhiCS };
938- int varspTPP[3 ] = {VarManager::kMCPt , VarManager::kMCCosThetaPP , VarManager::kMCPhiPP };
939- int binspT[3 ] = {40 , 20 , 20 };
940- double xminpT[3 ] = {0 ., -1 ., -3.14 };
941- double xmaxpT[3 ] = {20 ., 1 ., +3.14 };
942- hm->AddHistogram (histClass, " Pt_cosThetaHE_phiHE" , " " , 3 , varspTHE, binspT, xminpT, xmaxpT, 0 , -1 , kFALSE );
943- hm->AddHistogram (histClass, " Pt_cosThetaCS_phiCS" , " " , 3 , varspTCS, binspT, xminpT, xmaxpT, 0 , -1 , kFALSE );
944- hm->AddHistogram (histClass, " Pt_cosThetaPP_phiPP" , " " , 3 , varspTPP, binspT, xminpT, xmaxpT, 0 , -1 , kFALSE );
932+ hm->AddHistogram (histClass, " Mass" , " " , false , 500 , 0.0 , 15.0 , VarManager::kMCMass );
933+ hm->AddHistogram (histClass, " Rapidity" , " " , false , 100 , -5.0 , 5.0 , VarManager::kMCY );
934+ hm->AddHistogram (histClass, " Eta_Pt" , " " , false , 40 , -2.0 , 2.0 , VarManager::kMCEta , 200 , 0.0 , 20.0 , VarManager::kMCPt );
935+ hm->AddHistogram (histClass, " Phi_Eta" , " #phi vs #eta distribution" , false , 200 , -5.0 , 5.0 , VarManager::kMCEta , 200 , -2 . * o2::constants::math::PI, 2 . * o2::constants::math::PI, VarManager::kMCPhi );
936+ if (subGroupStr.Contains (" polarization" )) {
937+ int varspTHE[4 ] = {VarManager::kMCPt , VarManager::kMCCosThetaHE , VarManager::kMCPhiHE , VarManager::kMCPhiTildeHE };
938+ int varspTCS[4 ] = {VarManager::kMCPt , VarManager::kMCCosThetaCS , VarManager::kMCPhiCS , VarManager::kMCPhiTildeCS };
939+ int bins[4 ] = {20 , 20 , 20 , 20 };
940+ double xmin[4 ] = {0 ., -1 ., 0 ., 0 .};
941+ double xmax[4 ] = {20 ., 1 ., 2 . * o2::constants::math::PI, 2 . * o2::constants::math::PI};
942+ hm->AddHistogram (histClass, " Pt_cosThetaHE_phiHE_phiTildeHE" , " " , 4 , varspTHE, bins, xmin, xmax, 0 , -1 , kFALSE );
943+ hm->AddHistogram (histClass, " Pt_cosThetaCS_phiCS_phiTildeCS" , " " , 4 , varspTCS, bins, xmin, xmax, 0 , -1 , kFALSE );
944+ }
945945 }
946946 if (!groupStr.CompareTo (" mctruth_quad" )) {
947947 hm->AddHistogram (histClass, " hMass_defaultDileptonMass" , " " , false , 1000 , 3.0 , 5.0 , VarManager::kQuadDefaultDileptonMass );
@@ -1084,31 +1084,21 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h
10841084 }
10851085 if (subGroupStr.Contains (" polarization" )) {
10861086 if (subGroupStr.Contains (" helicity" )) {
1087- hm->AddHistogram (histClass, " cosThetaHE" , " " , false , 100 , -1 ., 1 ., VarManager::kCosThetaHE );
1088- hm->AddHistogram (histClass, " phiHE" , " " , false , 100 , 0 , 2 * o2::constants::math::PI, VarManager::kPhiHE );
1089- hm->AddHistogram (histClass, " phitildeHE" , " " , false , 100 , 0 , 2 * o2::constants::math::PI, VarManager::kPhiTildeHE );
10901087 hm->AddHistogram (histClass, " Mass_Pt_CosThetaHE" , " " , false , 100 , 1.0 , 5.0 , VarManager::kMass , 40 , 0.0 , 20.0 , VarManager::kPt , 20 , -1 ., 1 ., VarManager::kCosThetaHE );
10911088 hm->AddHistogram (histClass, " Mass_Pt_PhiHE" , " " , false , 100 , 1.0 , 5.0 , VarManager::kMass , 40 , 0.0 , 20.0 , VarManager::kPt , 20 , 0 ., 2 * o2::constants::math::PI, VarManager::kPhiHE );
10921089 hm->AddHistogram (histClass, " Mass_Pt_PhiTildeHE" , " " , false , 100 , 1.0 , 5.0 , VarManager::kMass , 40 , 0.0 , 20.0 , VarManager::kPt , 20 , 0 ., 2 * o2::constants::math::PI, VarManager::kPhiTildeHE );
10931090 }
10941091 if (subGroupStr.Contains (" collins-soper" )) {
1095- hm->AddHistogram (histClass, " cosThetaCS" , " " , false , 100 , -1 ., 1 ., VarManager::kCosThetaCS );
1096- hm->AddHistogram (histClass, " phiCS" , " " , false , 100 , 0 , 2 * o2::constants::math::PI, VarManager::kPhiCS );
1097- hm->AddHistogram (histClass, " phitildeCS" , " " , false , 100 , 0 , 2 * o2::constants::math::PI, VarManager::kPhiTildeCS );
10981092 hm->AddHistogram (histClass, " Mass_Pt_CosThetaCS" , " " , false , 100 , 1.0 , 5.0 , VarManager::kMass , 40 , 0.0 , 20.0 , VarManager::kPt , 20 , -1 ., 1 ., VarManager::kCosThetaCS );
10991093 hm->AddHistogram (histClass, " Mass_Pt_PhiCS" , " " , false , 100 , 1.0 , 5.0 , VarManager::kMass , 40 , 0.0 , 20.0 , VarManager::kPt , 20 , 0 ., 2 * o2::constants::math::PI, VarManager::kPhiCS );
11001094 hm->AddHistogram (histClass, " Mass_Pt_PhiTildeCS" , " " , false , 100 , 1.0 , 5.0 , VarManager::kMass , 40 , 0.0 , 20.0 , VarManager::kPt , 20 , 0 ., 2 * o2::constants::math::PI, VarManager::kPhiTildeCS );
11011095 }
11021096 if (subGroupStr.Contains (" production" )) {
1103- hm->AddHistogram (histClass, " cosThetaPP" , " " , false , 100 , -1 ., 1 ., VarManager::kCosThetaPP );
1104- hm->AddHistogram (histClass, " phiPP" , " " , false , 100 , 0 , 2 * o2::constants::math::PI, VarManager::kPhiPP );
1105- hm->AddHistogram (histClass, " phitildePP" , " " , false , 100 , 0 , 2 * o2::constants::math::PI, VarManager::kPhiTildePP );
11061097 hm->AddHistogram (histClass, " Mass_Pt_CosThetaPP" , " " , false , 100 , 1.0 , 5.0 , VarManager::kMass , 40 , 0.0 , 20.0 , VarManager::kPt , 20 , -1 ., 1 ., VarManager::kCosThetaPP );
11071098 hm->AddHistogram (histClass, " Mass_Pt_PhiPP" , " " , false , 100 , 1.0 , 5.0 , VarManager::kMass , 40 , 0.0 , 20.0 , VarManager::kPt , 20 , 0 ., 2 * o2::constants::math::PI, VarManager::kPhiPP );
11081099 hm->AddHistogram (histClass, " Mass_Pt_PhiTildePP" , " " , false , 100 , 1.0 , 5.0 , VarManager::kMass , 40 , 0.0 , 20.0 , VarManager::kPt , 20 , 0 ., 2 * o2::constants::math::PI, VarManager::kPhiTildePP );
11091100 }
11101101 if (subGroupStr.Contains (" random" )) {
1111- hm->AddHistogram (histClass, " cosThetaRM" , " " , false , 100 , -1 ., 1 ., VarManager::kCosThetaRM );
11121102 hm->AddHistogram (histClass, " Mass_Pt_CosThetaRM" , " " , false , 200 , 1.0 , 5.0 , VarManager::kMass , 40 , 0.0 , 20.0 , VarManager::kPt , 20 , -1 ., 1 ., VarManager::kCosThetaRM );
11131103 }
11141104 }
@@ -1856,18 +1846,6 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h
18561846 hm->AddHistogram (histClass, " Mass" , " " , false , 750 , 0.0 , 30.0 , VarManager::kPairMass );
18571847 hm->AddHistogram (histClass, " Pt" , " " , false , 750 , 0.0 , 30.0 , VarManager::kPairPt );
18581848 }
1859- if (subGroupStr.Contains (" mixedevent-energy-correlator" )) { // for mixed event_correnergyelator
1860- hm->AddHistogram (histClass, " Coschi" , " " , false , 40 , -1.0 , 1.0 , VarManager::kCosChi , 0 , 0 , 0 , -1 , 0 , 0 , 0 , -1 , " " , " " , " " , -1 , VarManager::kECWeight );
1861- hm->AddHistogram (histClass, " CosTheta" , " " , false , 40 , -1.0 , 1.0 , VarManager::kCosTheta , 0 , 0 , 0 , -1 , 0 , 0 , 0 , -1 , " " , " " , " " , -1 , VarManager::kEWeight_before );
1862- hm->AddHistogram (histClass, " Pt_Hadron" , " ;P_{T}" , false , 120 , 0.0 , 30.0 , VarManager::kPtDau );
1863- hm->AddHistogram (histClass, " Eta_Hadron" , " ;#eta" , false , 120 , -2.0 , 2.0 , VarManager::kEtaDau );
1864- hm->AddHistogram (histClass, " Phi_Hadron" , " ;#phi" , false , 120 , -8 , 8 , VarManager::kPhiDau );
1865- hm->AddHistogram (histClass, " DeltaEta_DeltaPhi" , " " , false , 20 , -2.0 , 2.0 , VarManager::kDeltaEta , 50 , -8.0 , 8.0 , VarManager::kDeltaPhi );
1866- hm->AddHistogram (histClass, " DeltaEta" , " " , false , 20 , -2.0 , 2.0 , VarManager::kDeltaEta );
1867- hm->AddHistogram (histClass, " DeltaPhi" , " " , false , 50 , -8.0 , 8.0 , VarManager::kDeltaPhi );
1868- hm->AddHistogram (histClass, " Coschi_hadron_kMCWeight_hadron_DeltaEta" , " " , false , 40 , -1.0 , 1.0 , VarManager::kCosChi , 50 , -8.0 , 8.0 , VarManager::kDeltaEta , 120 , 0.0 , 50 , VarManager::kECWeight );
1869- hm->AddHistogram (histClass, " Costheta_hadron_kMCWeight_before_DeltaEta" , " " , false , 40 , -1.0 , 1.0 , VarManager::kCosTheta , 50 , -8.0 , 8.0 , VarManager::kDeltaEta , 120 , 0.0 , 50 , VarManager::kEWeight_before );
1870- }
18711849 if (subGroupStr.Contains (" invmass" )) {
18721850 hm->AddHistogram (histClass, " Mass_Dilepton" , " " , false , 125 , 0.0 , 5.0 , VarManager::kPairMassDau );
18731851 hm->AddHistogram (histClass, " Mass_Hadron" , " " , false , 125 , 0.0 , 5.0 , VarManager::kMassDau );
0 commit comments