Skip to content

Commit f62d934

Browse files
YazhenLinYazhenLin
authored
Add files via upload
1 parent b12e9b5 commit f62d934

File tree

2 files changed

+57
-33
lines changed

2 files changed

+57
-33
lines changed

‎PWGDQ/Core/HistogramsLibrary.cxx‎

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1942,23 +1942,36 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h
19421942
hm->AddHistogram(histClass, "Delta_Mass_DstarD0region", "", false, 50, 0.14, 0.16, VarManager::kDeltaMass);
19431943
}
19441944
if (subGroupStr.Contains("energy-correlator")) {
1945-
hm->AddHistogram(histClass, "Coschi", "", false, 40, -1.0, 1.0, VarManager::kCosChi, 0, 0, 0, -1, 0, 0, 0, -1, "", "", "", -1, VarManager::kECWeight);
1946-
hm->AddHistogram(histClass, "CosTheta_woweight", "", false, 40, -1.0, 1.0, VarManager::kCosTheta);
1945+
double coschiBins[26];
1946+
for (int i = 0; i < 26; i++) {
1947+
coschiBins[i] = -1.0 + 2.0 * TMath::Power(0.04 * i, 2.0);
1948+
}
1949+
1950+
double deltaetaBins[21];
1951+
for (int i = 0; i < 21; i++) {
1952+
deltaetaBins[i] = -2.0 + 0.2 * i;
1953+
}
1954+
1955+
hm->AddHistogram(histClass, "Coschi", "", false, 25, coschiBins, VarManager::kCosChi, 0, nullptr, -1, 0, nullptr, -1, "", "", "", -1, VarManager::kECWeight);
19471956
hm->AddHistogram(histClass, "CosTheta", "", false, 40, -1.0, 1.0, VarManager::kCosTheta, 0, 0, 0, -1, 0, 0, 0, -1, "", "", "", -1, VarManager::kEWeight_before);
19481957
hm->AddHistogram(histClass, "Pt_Hadron", ";P_{T}", false, 120, 0.0, 30.0, VarManager::kPtDau);
1958+
hm->AddHistogram(histClass, "Coschi_wo", "", false, 25, coschiBins, VarManager::kCosChi);
19491959
hm->AddHistogram(histClass, "Eta_Hadron", ";#eta", false, 120, -2.0, 2.0, VarManager::kEtaDau);
19501960
hm->AddHistogram(histClass, "Phi_Hadron", ";#phi", false, 120, -8, 8, VarManager::kPhiDau);
1951-
hm->AddHistogram(histClass, "DeltaEta_DeltaPhi", "", false, 20, -2.0, 2.0, VarManager::kDeltaEta, 50, -8.0, 8.0, VarManager::kDeltaPhi);
1961+
hm->AddHistogram(histClass, "DeltaEta_DeltaPhi_weight", "", false, 20, -2.0, 2.0, VarManager::kDeltaEta, 50, -2.0, 6.0, VarManager::kDeltaPhi, 0, 0, 0, -1, "", "", "", -1, VarManager::kEWeight_before);
19521962
hm->AddHistogram(histClass, "DeltaEta", "", false, 20, -2.0, 2.0, VarManager::kDeltaEta);
1953-
hm->AddHistogram(histClass, "DeltaPhi", "", false, 50, -8.0, 8.0, VarManager::kDeltaPhi);
1963+
hm->AddHistogram(histClass, "DeltaPhi", "", false, 50, -2.0, 6.0, VarManager::kDeltaPhi);
1964+
hm->AddHistogram(histClass, "DeltaPhi_weight", "", false, 50, -2.0, 6.0, VarManager::kDeltaPhi, 0, 0, 0, -1, 0, 0, 0, -1, "", "", "", -1, VarManager::kEWeight_before);
1965+
hm->AddHistogram(histClass, "Coschi_DeltaEta", "", false, 25, coschiBins, VarManager::kCosChi, 20, deltaetaBins, VarManager::kDeltaEta, 0, nullptr, -1, "", "", "", -1, VarManager::kECWeight);
1966+
hm->AddHistogram(histClass, "Coschi_wo_DeltaEta", "", false, 25, coschiBins, VarManager::kCosChi, 20, deltaetaBins, VarManager::kDeltaEta);
19541967
// for bkg
1955-
hm->AddHistogram(histClass, "DeltaPhi_randomPhi_trans", "", false, 50, -8.0, 8.0, VarManager::kdeltaphi_randomPhi_trans);
1956-
hm->AddHistogram(histClass, "DeltaPhi_randomPhi_toward", "", false, 50, -8.0, 8.0, VarManager::kdeltaphi_randomPhi_toward);
1957-
hm->AddHistogram(histClass, "DeltaPhi_randomPhi_away", "", false, 50, -8.0, 8.0, VarManager::kdeltaphi_randomPhi_away);
1968+
hm->AddHistogram(histClass, "Coschi_randomPhi_trans", "", false, 25, coschiBins, VarManager::kCosChi_randomPhi_trans, 0, nullptr, -1, 0, nullptr, -1, "", "", "", -1, VarManager::kWeight_randomPhi_trans);
1969+
hm->AddHistogram(histClass, "Coschi_randomPhi_toward", "", false, 25, coschiBins, VarManager::kCosChi_randomPhi_toward, 0, nullptr, -1, 0, nullptr, -1, "", "", "", -1, VarManager::kWeight_randomPhi_toward);
1970+
hm->AddHistogram(histClass, "Coschi_randomPhi_away", "", false, 25, coschiBins, VarManager::kCosChi_randomPhi_away, 0, nullptr, -1, 0, nullptr, -1, "", "", "", -1, VarManager::kWeight_randomPhi_away);
19581971

1959-
hm->AddHistogram(histClass, "Coschi_randomPhi_trans", "", false, 40, -1.0, 1.0, VarManager::kCosChi_randomPhi_trans, 0, 0, 0, -1, 0, 0, 0, -1, "", "", "", -1, VarManager::kWeight_randomPhi_trans);
1960-
hm->AddHistogram(histClass, "Coschi_randomPhi_toward", "", false, 40, -1.0, 1.0, VarManager::kCosChi_randomPhi_toward, 0, 0, 0, -1, 0, 0, 0, -1, "", "", "", -1, VarManager::kWeight_randomPhi_toward);
1961-
hm->AddHistogram(histClass, "Coschi_randomPhi_away", "", false, 40, -1.0, 1.0, VarManager::kCosChi_randomPhi_away, 0, 0, 0, -1, 0, 0, 0, -1, "", "", "", -1, VarManager::kWeight_randomPhi_away);
1972+
hm->AddHistogram(histClass, "Coschi_wo_randomPhi_trans", "", false, 25, coschiBins, VarManager::kCosChi_randomPhi_trans);
1973+
hm->AddHistogram(histClass, "Coschi_wo_randomPhi_toward", "", false, 25, coschiBins, VarManager::kCosChi_randomPhi_toward);
1974+
hm->AddHistogram(histClass, "Coschi_wo_randomPhi_away", "", false, 25, coschiBins, VarManager::kCosChi_randomPhi_away);
19621975
}
19631976
}
19641977

‎PWGDQ/Core/VarManager.h‎

Lines changed: 34 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1231,6 +1231,8 @@ class VarManager : public TObject
12311231
template <typename T1, typename T2>
12321232
static void FillDileptonHadron(T1 const& dilepton, T2 const& hadron, float* values = nullptr, float hadronMass = 0.0f);
12331233
template <typename T1, typename T2>
1234+
static void FillEnergyCorrelator(T1 const& dilepton, T2 const& hadron, float* values = nullptr, bool applyFitMass = false, float sidebandMass = 0.0f);
1235+
template <typename T1, typename T2>
12341236
static void FillDileptonPhoton(T1 const& dilepton, T2 const& photon, float* values = nullptr);
12351237
template <typename T>
12361238
static void FillHadron(T const& hadron, float* values = nullptr, float hadronMass = 0.0f);
@@ -5301,8 +5303,39 @@ void VarManager::FillDileptonHadron(T1 const& dilepton, T2 const& hadron, float*
53015303
double Q1 = (dilepton.mass() * dilepton.mass() - hadronMass * hadronMass) / Pinv;
53025304
values[kDileptonHadronKstar] = sqrt(Q1 * Q1 - v12_Qvect.M2()) / 2.0;
53035305
}
5306+
5307+
if (fgUsedVars[kDeltaPhi]) {
5308+
double delta = dilepton.phi() - hadron.phi();
5309+
if (delta > 3.0 / 2.0 * M_PI) {
5310+
delta -= 2.0 * M_PI;
5311+
}
5312+
if (delta < -0.5 * M_PI) {
5313+
delta += 2.0 * M_PI;
5314+
}
5315+
values[kDeltaPhi] = delta;
5316+
}
5317+
if (fgUsedVars[kDeltaPhiSym]) {
5318+
double delta = std::abs(dilepton.phi() - hadron.phi());
5319+
if (delta > M_PI) {
5320+
delta = 2 * M_PI - delta;
5321+
}
5322+
values[kDeltaPhiSym] = delta;
5323+
}
5324+
if (fgUsedVars[kDeltaEta]) {
5325+
values[kDeltaEta] = dilepton.eta() - hadron.eta();
5326+
}
5327+
}
5328+
5329+
template <typename T1, typename T2>
5330+
void VarManager::FillEnergyCorrelator(T1 const& dilepton, T2 const& hadron, float* values, bool applyFitMass, float sidebandMass)
5331+
{
5332+
float dileptonmass = dilepton.mass();
5333+
if (applyFitMass) {
5334+
dileptonmass = sidebandMass;
5335+
}
5336+
53045337
if (fgUsedVars[kCosChi] || fgUsedVars[kECWeight] || fgUsedVars[kCosTheta] || fgUsedVars[kEWeight_before] || fgUsedVars[kPtDau] || fgUsedVars[kEtaDau] || fgUsedVars[kPhiDau] || fgUsedVars[kCosChi_randomPhi_trans] || fgUsedVars[kCosChi_randomPhi_toward] || fgUsedVars[kCosChi_randomPhi_away]) {
5305-
ROOT::Math::PtEtaPhiMVector v1(dilepton.pt(), dilepton.eta(), dilepton.phi(), dilepton.mass());
5338+
ROOT::Math::PtEtaPhiMVector v1(dilepton.pt(), dilepton.eta(), dilepton.phi(), dileptonmass);
53065339
ROOT::Math::PtEtaPhiMVector v2(hadron.pt(), hadron.eta(), hadron.phi(), o2::constants::physics::MassPionCharged);
53075340
values[kCosChi] = LorentzTransformJpsihadroncosChi("coschi", v1, v2);
53085341
float E_boost = LorentzTransformJpsihadroncosChi("weight_boost", v1, v2);
@@ -5348,29 +5381,7 @@ void VarManager::FillDileptonHadron(T1 const& dilepton, T2 const& hadron, float*
53485381
values[kdeltaphi_randomPhi_away] = RecoDecay::constrainAngle(v1.phi() - randomPhi_away, -o2::constants::math::PIHalf);
53495382
}
53505383
}
5351-
5352-
if (fgUsedVars[kDeltaPhi]) {
5353-
double delta = dilepton.phi() - hadron.phi();
5354-
if (delta > 3.0 / 2.0 * M_PI) {
5355-
delta -= 2.0 * M_PI;
5356-
}
5357-
if (delta < -0.5 * M_PI) {
5358-
delta += 2.0 * M_PI;
5359-
}
5360-
values[kDeltaPhi] = delta;
5361-
}
5362-
if (fgUsedVars[kDeltaPhiSym]) {
5363-
double delta = std::abs(dilepton.phi() - hadron.phi());
5364-
if (delta > M_PI) {
5365-
delta = 2 * M_PI - delta;
5366-
}
5367-
values[kDeltaPhiSym] = delta;
5368-
}
5369-
if (fgUsedVars[kDeltaEta]) {
5370-
values[kDeltaEta] = dilepton.eta() - hadron.eta();
5371-
}
53725384
}
5373-
53745385
template <typename T1, typename T2>
53755386
void VarManager::FillDileptonPhoton(T1 const& dilepton, T2 const& photon, float* values)
53765387
{

0 commit comments

Comments
 (0)