Skip to content

[PWGDQ] Track rotation ep preserving mepm rotated legs #17983

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
XiaozhiBai merged 13 commits into from
Sep 21, 2026
+82 −3
Merged

[PWGDQ] Track rotation ep preserving mepm rotated legs #17983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ec8659b
Add phi-map correction for track rotation
Jul 27, 2026
4b3f0df
edit phi distribution
Jul 27, 2026
c7d5ef1
Add EP-preserving track rotation
Aug 26, 2026
73d4a77
Add EP-preserving track rotation
Aug 26, 2026
e85c101
Add EP-preserving track rotation
Aug 26, 2026
4896ea8
Merge branch 'master' into track-rotation-ep-preserving
ayatsujiringo Aug 26, 2026
99c6855
add MEPM rotated legs
Sep 20, 2026
8ea40f2
Merge remote-tracking branch 'upstream/master' into track-rotation-ep…
Sep 20, 2026
3c4f361
format
Sep 20, 2026
1cc3502
format
Sep 20, 2026
2a7605a
format
Sep 20, 2026
20dee4c
format
Sep 20, 2026
bc7e0e3
format
Sep 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 52 additions & 1 deletion PWGDQ/Core/VarManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1495,6 +1495,8 @@ class VarManager : public TObject
static void FillPair(T1 const& t1, T2 const& t2, float* values = nullptr);
template <int pairType, uint32_t fillMap, typename T1, typename T2>
static void FillPairRotation(T1 const& t1, T2 const& t2, int rotation, float* values = nullptr);
template <typename T>
static void FillPairRotation_ME(T const& t1, T const& t2, int rotation, float* values = nullptr);
template <int pairType, uint32_t fillMap, typename C, typename T1, typename T2>
static void FillPairCollision(C const& collision, T1 const& t1, T2 const& t2, float* values = nullptr);
template <int pairType, uint32_t fillMap, typename C, typename T1, typename T2, typename M, typename P>
Expand Down Expand Up @@ -4084,7 +4086,11 @@ void VarManager::FillPairRotation(T1 const& t1, T2 const& t2, int rotation, floa
rotationphi2 = 2 * values[kPsi2A] - t2.phi() + o2::constants::math::PI;
}

rotationphi2 = RecoDecay::constrainAngle(rotationphi2);
if (rotationphi2 >= o2::constants::math::TwoPI) {
rotationphi2 -= o2::constants::math::TwoPI;
} else if (rotationphi2 < 0) {
rotationphi2 += o2::constants::math::TwoPI;
}
Comment on lines +4089 to +4093

@vkucera vkucera Sep 22, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ayatsujiringo Why did you replace the constrainAngle function?


values[kCharge] = t1.sign() + t2.sign();
values[kCharge1] = t1.sign();
Expand Down Expand Up @@ -4547,6 +4553,51 @@ void VarManager::FillPairME(T1 const& t1, T2 const& t2, float* values)
}
}

template <typename T>
void VarManager::FillPairRotation_ME(T const& t1, T const& t2, int rotation, float* values)
{
if (!values) {
values = fgValues;
}

float m1 = o2::constants::physics::MassElectron;
double rotationphi2 = t2.phi;

if (rotation == 1) {
rotationphi2 = t2.phi + o2::constants::math::PI;
} else if (rotation == 2) {
rotationphi2 = 2 * values[kPsi2A] - t2.phi;
} else if (rotation == 3) {
rotationphi2 = 2 * values[kPsi2A] - t2.phi + o2::constants::math::PI;
}

if (rotationphi2 >= o2::constants::math::TwoPI) {
rotationphi2 -= o2::constants::math::TwoPI;
} else if (rotationphi2 < 0) {
rotationphi2 += o2::constants::math::TwoPI;
}
Comment on lines +4574 to +4578

@vkucera vkucera Sep 22, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again, this should be done with constrainAngle.


ROOT::Math::PtEtaPhiMVector v1(t1.pt, t1.eta, t1.phi, m1);
ROOT::Math::PtEtaPhiMVector v2(t2.pt, t2.eta, rotationphi2, m1);
ROOT::Math::PtEtaPhiMVector v12 = v1 + v2;
Comment on lines +4580 to +4582

@vkucera vkucera Sep 22, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please consider using RecoDecay methods.

values[kMass] = v12.M();
values[kPt] = v12.Pt();
values[kEta] = v12.Eta();
// values[kPhi] = v12.Phi();
values[kPhi] = RecoDecay::constrainAngle(v12.Phi());
values[kRap] = -v12.Rapidity();
double Ptot1 = TMath::Sqrt(v1.Px() * v1.Px() + v1.Py() * v1.Py() + v1.Pz() * v1.Pz());
double Ptot2 = TMath::Sqrt(v2.Px() * v2.Px() + v2.Py() * v2.Py() + v2.Pz() * v2.Pz());
Comment on lines +4589 to +4590

@vkucera vkucera Sep 22, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please consider using RecoDecay methods.

values[kDeltaPtotTracks] = Ptot1 - Ptot2;

values[kPt1] = t1.pt;
values[kEta1] = t1.eta;
values[kPhi1] = t1.phi;
values[kPt2] = t2.pt;
values[kEta2] = t2.eta;
values[kPhi2] = rotationphi2;
}

template <typename T>
void VarManager::FillPairMEAcrossTFs(T const& t1, T const& t2, float* values)
{
Expand Down
32 changes: 30 additions & 2 deletions PWGDQ/Tasks/tableReader_withAssoc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1608,13 +1608,14 @@ struct AnalysisSameEventPairing {
if (fConfigTRPairs) {
names.push_back(Form("PairsBarrelTRPM_%s", objArray->At(icut)->GetName()));
names.push_back(Form("PairsBarrelTRPM_ambiguousextra_%s", objArray->At(icut)->GetName()));
histNames += Form("%s;%s;", names[6].Data(), names[7].Data());
names.push_back(Form("PairsBarrelTR_MEPM_%s", objArray->At(icut)->GetName()));
histNames += Form("%s;%s;%s;", names[6].Data(), names[7].Data(), names[8].Data());
}
if (fEnableBarrelMixingHistos) {
names.push_back(Form("PairsBarrelMEPM_%s", objArray->At(icut)->GetName()));
names.push_back(Form("PairsBarrelMEPP_%s", objArray->At(icut)->GetName()));
names.push_back(Form("PairsBarrelMEMM_%s", objArray->At(icut)->GetName()));
histNames += Form("%s;%s;%s;", names[(fConfigTRPairs ? 8 : 6)].Data(), names[(fConfigTRPairs ? 9 : 7)].Data(), names[(fConfigTRPairs ? 10 : 8)].Data());
histNames += Form("%s;%s;%s;", names[(fConfigTRPairs ? 9 : 6)].Data(), names[(fConfigTRPairs ? 10 : 7)].Data(), names[(fConfigTRPairs ? 11 : 8)].Data());
}
fTrackHistNames[icut] = names;

Expand Down Expand Up @@ -2534,6 +2535,20 @@ struct AnalysisSameEventPairing {
fHistMan->FillHistClass(Form("PairsBarrelMEPM_%s", fTrackCuts[icut].Data()), dqtablereader_helpers::varValues());
}
}
if (fConfigTRPairs) {
// mixing event track should be rotated, so second parameter
if (fConfigNRotations.value != 1 && fConfigNRotations.value != 3) {
LOGF(fatal, "Unsupported number of rotations: %d, only 1 and 3 are supported", fConfigNRotations.value);
}
for (int irot = 1; irot <= fConfigNRotations.value; ++irot) {
VarManager::FillPairRotation_ME(t2, t1, irot);
for (int icut = 0; icut < ncuts; icut++) {
if (mixedTwoTrackFilter & (static_cast<uint32_t>(1) << icut)) {
fHistMan->FillHistClass(Form("PairsBarrelTR_MEPM_%s", fTrackCuts[icut].Data()), dqtablereader_helpers::varValues());
}
}
}
}
}
// run ++ pairing
for (auto const& t2 : poolEvent.tracks1) {
Expand Down Expand Up @@ -2564,6 +2579,19 @@ struct AnalysisSameEventPairing {
fHistMan->FillHistClass(Form("PairsBarrelMEPM_%s", fTrackCuts[icut].Data()), dqtablereader_helpers::varValues());
}
}
if (fConfigTRPairs) {
if (fConfigNRotations.value != 1 && fConfigNRotations.value != 3) {
LOGF(fatal, "Unsupported number of rotations: %d, only 1 and 3 are supported", fConfigNRotations.value);
}
for (int irot = 1; irot <= fConfigNRotations.value; ++irot) {
VarManager::FillPairRotation_ME(t2, t1, irot);
for (int icut = 0; icut < ncuts; icut++) {
if (mixedTwoTrackFilter & (static_cast<uint32_t>(1) << icut)) {
fHistMan->FillHistClass(Form("PairsBarrelTR_MEPM_%s", fTrackCuts[icut].Data()), dqtablereader_helpers::varValues());
}
}
}
}
}
// run -- pairing
for (auto const& t2 : poolEvent.tracks2) {
Expand Down
Loading