Skip to content

Commit 0e2dfee

Browse files
YazhenLinYazhenLin
authored
Add files via upload
1 parent 243a5ff commit 0e2dfee

File tree

4 files changed

+92
-135
lines changed

4 files changed

+92
-135
lines changed

‎PWGDQ/Core/HistogramsLibrary.cxx‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -968,22 +968,21 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h
968968
hm->AddHistogram(histClass, "Weight", "", false, 50, 0.0, 5.0, VarManager::kMCParticleWeight);
969969
hm->AddHistogram(histClass, "MCImpPar_CentFT0CMC", "MC impact param vs MC Cent. FT0C", false, 20, 0.0, 20.0, VarManager::kMCEventImpParam, 100, 0.0, 100.0, VarManager::kMCEventCentrFT0C);
970970
}
971-
if (!groupStr.CompareTo("energy_correlator_gen")) {
972-
hm->AddHistogram(histClass, "MCCostheta", "Cos#theta", false, 40, -1.0, 1.0, VarManager::kMCCosTheta, 0, 0, 0, -1, 0, 0, 0, -1, "", "", "", -1, VarManager::kMCWeight_before); ////
973-
hm->AddHistogram(histClass, "MCHadronPdgCode", "MCHadronPdgCode", false, 6000, -3000, 3000, VarManager::kMCHadronPdgCode); ////
974-
hm->AddHistogram(histClass, "MCMotherPdgCode", "MCMotherPdgCode", false, 6000, -3000, 3000, VarManager::kMCMotherPdgCode); ////
975-
hm->AddHistogram(histClass, "MCPdgCode", "MCPdgCode", false, 1000, -1000, 1000, VarManager::kMCPdgCode); ////
976-
hm->AddHistogram(histClass, "Coschi_pion", "", false, 40, -1.0, 1.0, VarManager::kMCCosChi_pion, 0, 0, 0, -1, 0, 0, 0, -1, "", "", "", -1, VarManager::kMCWeight_pion);
977-
hm->AddHistogram(histClass, "Coschi_hadron", "", false, 40, -1.0, 1.0, VarManager::kMCCosChi_hadron, 0, 0, 0, -1, 0, 0, 0, -1, "", "", "", -1, VarManager::kMCWeight_hadron);
971+
972+
if (!groupStr.CompareTo("energy-correlator-gen")) {
973+
hm->AddHistogram(histClass, "MCCostheta", "Cos#theta", false, 40, -1.0, 1.0, VarManager::kMCCosTheta, 0, 0, 0, -1, 0, 0, 0, -1, "", "", "", -1, VarManager::kMCWeight_before);
974+
hm->AddHistogram(histClass, "MCHadronPdgCode", "MCHadronPdgCode", false, 6000, -3000, 3000, VarManager::kMCHadronPdgCode);
975+
hm->AddHistogram(histClass, "MCMotherPdgCode", "MCMotherPdgCode", false, 6000, -3000, 3000, VarManager::kMCMotherPdgCode);
976+
hm->AddHistogram(histClass, "MCPdgCode", "MCPdgCode", false, 1000, -1000, 1000, VarManager::kMCPdgCode);
977+
hm->AddHistogram(histClass, "Coschi", "", false, 40, -1.0, 1.0, VarManager::kMCCosChi, 0, 0, 0, -1, 0, 0, 0, -1, "", "", "", -1, VarManager::kMCWeight);
978978
hm->AddHistogram(histClass, "Pt_Hadron", "", false, 120, 0.0, 30.0, VarManager::kMCHadronPt);
979979
hm->AddHistogram(histClass, "Eta_Hadron", "", false, 120, -2.0, 2.0, VarManager::kMCHadronEta);
980980
hm->AddHistogram(histClass, "DeltaEta", "", false, 20, -2.0, 2.0, VarManager::kMCdeltaeta);
981981
hm->AddHistogram(histClass, "DeltaPhi", "", false, 50, -8.0, 8.0, VarManager::kMCdeltaphi);
982982
hm->AddHistogram(histClass, "DeltaEta_DeltaPhi", "", false, 20, -2.0, 2.0, VarManager::kMCdeltaeta, 50, -8.0, 8.0, VarManager::kMCdeltaphi);
983-
hm->AddHistogram(histClass, "Coschi_hadron_kMCWeight_hadron_DeltaEta", "", false, 40, -1.0, 1.0, VarManager::kMCCosChi_hadron, 50, -8.0, 8.0, VarManager::kMCdeltaeta, 120, 0.0, 50, VarManager::kMCWeight_hadron);
983+
hm->AddHistogram(histClass, "Coschi_hadron_kMCWeight_hadron_DeltaEta", "", false, 40, -1.0, 1.0, VarManager::kMCCosChi, 50, -8.0, 8.0, VarManager::kMCdeltaeta, 120, 0.0, 50, VarManager::kMCWeight);
984984
hm->AddHistogram(histClass, "Costheta_hadron_kMCWeight_before_DeltaEta", "", false, 40, -1.0, 1.0, VarManager::kMCCosTheta, 50, -8.0, 8.0, VarManager::kMCdeltaeta, 120, 0.0, 50, VarManager::kMCWeight_before);
985985
// for bkg
986-
987986
hm->AddHistogram(histClass, "DeltaPhi_minus", "", false, 50, -8.0, 8.0, VarManager::kMCdeltaphi_minus);
988987
hm->AddHistogram(histClass, "DeltaPhi_toward_minus", "", false, 50, -8.0, 8.0, VarManager::kMCdeltaphi_toward_minus);
989988
hm->AddHistogram(histClass, "DeltaPhi_away_minus", "", false, 50, -8.0, 8.0, VarManager::kMCdeltaphi_away_minus);
@@ -1014,8 +1013,6 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h
10141013
hm->AddHistogram(histClass, "Costheta_away_plus", "", false, 40, -1.0, 1.0, VarManager::kMCCosTheta_away_plus, 0, 0, 0, -1, 0, 0, 0, -1, "", "", "", -1, VarManager::kMCWeight_before);
10151014
hm->AddHistogram(histClass, "Costheta_trans_plus", "", false, 40, -1.0, 1.0, VarManager::kMCCosTheta_trans_plus, 0, 0, 0, -1, 0, 0, 0, -1, "", "", "", -1, VarManager::kMCWeight_before);
10161015
}
1017-
1018-
// }
10191016
if (!groupStr.CompareTo("pair")) {
10201017
if (subGroupStr.Contains("cepf")) {
10211018
hm->AddHistogram(histClass, "Mass", "", false, 300, 0.0, 12.0, VarManager::kMass);
@@ -1857,7 +1854,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h
18571854
hm->AddHistogram(histClass, "Mass", "", false, 750, 0.0, 30.0, VarManager::kPairMass);
18581855
hm->AddHistogram(histClass, "Pt", "", false, 750, 0.0, 30.0, VarManager::kPairPt);
18591856
}
1860-
if (subGroupStr.Contains("mixedevent_energy_correlator")) { // for mixed event energy_correlator
1857+
if (subGroupStr.Contains("mixedevent-energy-correlator")) { // for mixed event_correnergyelator
18611858
hm->AddHistogram(histClass, "Coschi", "", false, 40, -1.0, 1.0, VarManager::kCosChi, 0, 0, 0, -1, 0, 0, 0, -1, "", "", "", -1, VarManager::kECWeight);
18621859
hm->AddHistogram(histClass, "CosTheta", "", false, 40, -1.0, 1.0, VarManager::kCosTheta, 0, 0, 0, -1, 0, 0, 0, -1, "", "", "", -1, VarManager::kEWeight_before);
18631860
hm->AddHistogram(histClass, "Pt_Hadron", ";P_{T}", false, 120, 0.0, 30.0, VarManager::kPtDau);
@@ -1968,7 +1965,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h
19681965
if (subGroupStr.Contains("opencharm")) {
19691966
hm->AddHistogram(histClass, "Delta_Mass_DstarD0region", "", false, 50, 0.14, 0.16, VarManager::kDeltaMass);
19701967
}
1971-
if (subGroupStr.Contains("energy_correlator")) {
1968+
if (subGroupStr.Contains("energy-correlator")) {
19721969
hm->AddHistogram(histClass, "Coschi", "", false, 40, -1.0, 1.0, VarManager::kCosChi, 0, 0, 0, -1, 0, 0, 0, -1, "", "", "", -1, VarManager::kECWeight);
19731970
hm->AddHistogram(histClass, "CosTheta", "", false, 40, -1.0, 1.0, VarManager::kCosTheta, 0, 0, 0, -1, 0, 0, 0, -1, "", "", "", -1, VarManager::kEWeight_before);
19741971
hm->AddHistogram(histClass, "Pt_Hadron", ";P_{T}", false, 120, 0.0, 30.0, VarManager::kPtDau);

‎PWGDQ/Core/MCSignalLibrary.cxx‎

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -884,22 +884,6 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name)
884884
signal = new MCSignal(name, "ee pairs from j/psi decays", {prong, prong}, {1, 1}); // signal at pair level
885885
return signal;
886886
}
887-
/////
888-
if (!nameStr.compare("eeFrompromptJpsi")) {
889-
MCProng prong(2, {11, 443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {503}, {true});
890-
prong.SetSourceBit(0, MCProng::kPhysicalPrimary);
891-
signal = new MCSignal(name, "ee pairs from prompt j/psi decays", {prong, prong}, {1, 1}); // signal at pair level
892-
return signal;
893-
}
894-
895-
if (!nameStr.compare("eeFromnonpromptJpsi")) {
896-
MCProng prong(3, {11, 443, 503}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false});
897-
prong.SetSourceBit(0, MCProng::kPhysicalPrimary);
898-
signal = new MCSignal(name, "ee pairs from nonprompt j/psi decays", {prong, prong}, {2, 2}); // signal at pair level
899-
return signal;
900-
}
901-
902-
//////
903887
if (!nameStr.compare("eeFromJpsiExclusive")) {
904888
MCProng prong(2, {11, 443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false});
905889
prong.SetSourceBit(0, MCProng::kPhysicalPrimary);
@@ -1927,18 +1911,9 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name)
19271911
pronge.SetSourceBit(0, MCProng::kPhysicalPrimary);
19281912
MCProng prongPrimary(1);
19291913
prongPrimary.SetSourceBit(0, MCProng::kPhysicalPrimary);
1930-
signal = new MCSignal(name, "anyprimary and electron pair from non-prompt jpsi", {pronge, pronge, prongPrimary}, {2, 2, -1});
1914+
signal = new MCSignal(name, "anyprimary and electron pair from non-prompt jpsi", {pronge, pronge, prongPrimary}, {1, 1, -1});
19311915
return signal;
19321916
}
1933-
1934-
// if (!nameStr.compare("eeFromNonPromptJpsiAnyPrimary")) {
1935-
// MCProng pronge(2, {11, 443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {503}, {false});
1936-
// pronge.SetSourceBit(0, MCProng::kPhysicalPrimary);
1937-
// MCProng prongPrimary(1);
1938-
// prongPrimary.SetSourceBit(0, MCProng::kPhysicalPrimary);
1939-
// signal = new MCSignal(name, "anyprimary and electron pair from non-prompt jpsi", {pronge, pronge, prongPrimary}, {-1, -1, -1});
1940-
// return signal;
1941-
//}
19421917
return nullptr;
19431918
}
19441919

‎PWGDQ/Core/VarManager.cxx‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -736,15 +736,12 @@ void VarManager::SetDefaultVarNames()
736736
fgVariableUnits[kMuonTimeRes] = "ns";
737737
fgVariableNames[kMCPdgCode] = "MC PDG code";
738738
fgVariableUnits[kMCPdgCode] = "";
739-
/////
740739
fgVariableNames[kMCCosTheta] = "Cos#theta";
741740
fgVariableUnits[kMCCosTheta] = "";
742741
fgVariableNames[kMCHadronPdgCode] = "HadronPdgCode";
743742
fgVariableUnits[kMCHadronPdgCode] = "";
744-
fgVariableNames[kMCCosChi_pion] = "Cos#chi";
745-
fgVariableUnits[kMCCosChi_pion] = "";
746-
fgVariableNames[kMCCosChi_hadron] = "Cos#chi";
747-
fgVariableUnits[kMCCosChi_hadron] = "";
743+
fgVariableNames[kMCCosChi] = "Cos#chi";
744+
fgVariableUnits[kMCCosChi] = "";
748745
fgVariableNames[kMCJpsiPt] = "Jpsi p_{T}";
749746
fgVariableUnits[kMCJpsiPt] = "GeV/c";
750747
fgVariableNames[kMCHadronPt] = "Hadron p_{T}";
@@ -757,7 +754,6 @@ void VarManager::SetDefaultVarNames()
757754
fgVariableUnits[kMCdeltaeta] = "";
758755
fgVariableNames[kNhadron] = "N_{hadron}";
759756
fgVariableUnits[kNhadron] = "";
760-
/////
761757
fgVariableNames[kMCParticleWeight] = "MC particle weight";
762758
fgVariableUnits[kMCParticleWeight] = "";
763759
fgVariableNames[kMCPx] = "MC px";
@@ -1725,16 +1721,12 @@ void VarManager::SetDefaultVarNames()
17251721
fgVarNamesMap["kMuonNAssocsOutOfBunch"] = kMuonNAssocsOutOfBunch;
17261722
fgVarNamesMap["kNMuonTrackVariables"] = kNMuonTrackVariables;
17271723
fgVarNamesMap["kMCPdgCode"] = kMCPdgCode;
1728-
//////
17291724
fgVarNamesMap["kMCCosTheta"] = kMCCosTheta;
17301725
fgVarNamesMap["kMCHadronPdgCode"] = kMCHadronPdgCode;
1731-
fgVarNamesMap["kMCCosChi_pion"] = kMCCosChi_pion;
1732-
fgVarNamesMap["kMCCosChi_hadron"] = kMCCosChi_hadron;
1726+
fgVarNamesMap["kMCCosChi"] = kMCCosChi;
17331727
fgVarNamesMap["kMCHadronPt"] = kMCHadronPt;
17341728
fgVarNamesMap["kMCCosChi_minus"] = kMCCosChi_minus;
17351729
fgVarNamesMap["kMCWeight_before"] = kMCWeight_before;
1736-
1737-
/////
17381730
fgVarNamesMap["kMCParticleWeight"] = kMCParticleWeight;
17391731
fgVarNamesMap["kMCPx"] = kMCPx;
17401732
fgVarNamesMap["kMCPy"] = kMCPy;

0 commit comments

Comments
 (0)