Skip to content

[PWGUD] personal task modification #10781

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
rolavick merged 4 commits into from
Apr 7, 2025
Merged

[PWGUD] personal task modification #10781

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
103295b
initiate adding more columns
rolavick Apr 7, 2025
86b9747
adding its and zdc info
rolavick Apr 7, 2025
ecb4a2b
Please consider the following formatting changes
alibuild Apr 7, 2025
89df154
Merge pull request #59 from alibuild/alibot-cleanup-10781
rolavick Apr 7, 2025
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
29 changes: 23 additions & 6 deletions PWGUD/Tasks/upcTauRl.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,13 @@
DECLARE_SOA_COLUMN(TotalFT0AmplitudeA, totalFT0AmplitudeA, float);
DECLARE_SOA_COLUMN(TotalFT0AmplitudeC, totalFT0AmplitudeC, float);
DECLARE_SOA_COLUMN(TotalFV0AmplitudeA, totalFV0AmplitudeA, float);
DECLARE_SOA_COLUMN(EnergyCommonZNA, energyCommonZNA, float);
DECLARE_SOA_COLUMN(EnergyCommonZNC, energyCommonZNC, float);
DECLARE_SOA_COLUMN(TimeFT0A, timeFT0A, float);
DECLARE_SOA_COLUMN(TimeFT0C, timeFT0C, float);
DECLARE_SOA_COLUMN(TimeFV0A, timeFV0A, float);
DECLARE_SOA_COLUMN(TimeZNA, timeZNA, float);
DECLARE_SOA_COLUMN(TimeZNC, timeZNC, float);
// tracks
DECLARE_SOA_COLUMN(TrkPx, trkPx, float[2]);
DECLARE_SOA_COLUMN(TrkPy, trkPy, float[2]);
Expand All @@ -90,6 +94,8 @@
DECLARE_SOA_COLUMN(TrkDCAxy, trkDCAxy, float[2]);
DECLARE_SOA_COLUMN(TrkDCAz, trkDCAz, float[2]);
DECLARE_SOA_COLUMN(TrkTimeRes, trkTimeRes, float[2]);
DECLARE_SOA_COLUMN(Trk1ITSclusterSizes, trk1ITSclusterSizes, uint32_t);
DECLARE_SOA_COLUMN(Trk2ITSclusterSizes, trk2ITSclusterSizes, uint32_t);
DECLARE_SOA_COLUMN(TrkTPCsignal, trkTPCsignal, float[2]);
DECLARE_SOA_COLUMN(TrkTPCnSigmaEl, trkTPCnSigmaEl, float[2]);
DECLARE_SOA_COLUMN(TrkTPCnSigmaMu, trkTPCnSigmaMu, float[2]);
Expand All @@ -103,18 +109,19 @@
DECLARE_SOA_COLUMN(TrkTOFnSigmaPi, trkTOFnSigmaPi, float[2]);
DECLARE_SOA_COLUMN(TrkTOFnSigmaKa, trkTOFnSigmaKa, float[2]);
DECLARE_SOA_COLUMN(TrkTOFnSigmaPr, trkTOFnSigmaPr, float[2]);
DECLARE_SOA_COLUMN(TrkTPCexpMom, trkTPCexpMom, float[2]);
DECLARE_SOA_COLUMN(TrkTOFexpMom, trkTOFexpMom, float[2]);

} // namespace tau_tree
DECLARE_SOA_TABLE(TauTwoTracks, "AOD", "TAUTWOTRACK",
tau_tree::RunNumber, tau_tree::Bc, tau_tree::TotalTracks, tau_tree::NumContrib, tau_tree::GlobalNonPVtracks, tau_tree::PosX, tau_tree::PosY, tau_tree::PosZ,
tau_tree::RecoMode, tau_tree::OccupancyInTime, tau_tree::HadronicRate,
tau_tree::Trs, tau_tree::Trofs, tau_tree::Hmpr, tau_tree::Tfb, tau_tree::ItsRofb, tau_tree::Sbp, tau_tree::ZvtxFT0vsPv, tau_tree::VtxITSTPC,
tau_tree::TotalFT0AmplitudeA, tau_tree::TotalFT0AmplitudeC, tau_tree::TotalFV0AmplitudeA,
tau_tree::TimeFT0A, tau_tree::TimeFT0C, tau_tree::TimeFV0A,
tau_tree::TotalFT0AmplitudeA, tau_tree::TotalFT0AmplitudeC, tau_tree::TotalFV0AmplitudeA, tau_tree::EnergyCommonZNA, tau_tree::EnergyCommonZNC,
tau_tree::TimeFT0A, tau_tree::TimeFT0C, tau_tree::TimeFV0A, tau_tree::TimeZNA, tau_tree::TimeZNC,
tau_tree::TrkPx, tau_tree::TrkPy, tau_tree::TrkPz, tau_tree::TrkSign, tau_tree::TrkDCAxy, tau_tree::TrkDCAz, tau_tree::TrkTimeRes,
tau_tree::Trk1ITSclusterSizes, tau_tree::Trk2ITSclusterSizes,
tau_tree::TrkTPCsignal, tau_tree::TrkTPCnSigmaEl, tau_tree::TrkTPCnSigmaMu, tau_tree::TrkTPCnSigmaPi, tau_tree::TrkTPCnSigmaKa, tau_tree::TrkTPCnSigmaPr, tau_tree::TrkTPCinnerParam,
tau_tree::TrkTOFsignal, tau_tree::TrkTOFnSigmaEl, tau_tree::TrkTOFnSigmaMu, tau_tree::TrkTOFnSigmaPi, tau_tree::TrkTOFnSigmaKa, tau_tree::TrkTOFnSigmaPr, tau_tree::TrkTPCexpMom);
tau_tree::TrkTOFsignal, tau_tree::TrkTOFnSigmaEl, tau_tree::TrkTOFnSigmaMu, tau_tree::TrkTOFnSigmaPi, tau_tree::TrkTOFnSigmaKa, tau_tree::TrkTOFnSigmaPr, tau_tree::TrkTOFexpMom);

} // namespace o2::aod

Expand Down Expand Up @@ -768,10 +775,10 @@
bool reinstallRun2JpsiTrackSelection(T const& track)
{
// kInAcceptance copy
if (eta(track.px(), track.py(), track.pz()) < -0.8 || eta(track.px(), track.py(), track.pz()) > 0.8)

Check warning on line 778 in PWGUD/Tasks/upcTauRl.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
return false;
// kPrimaryTracks
if (std::abs(track.dcaZ()) > 2.0)

Check warning on line 781 in PWGUD/Tasks/upcTauRl.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
return false;
float maxDCA = 0.0105f + 0.0350f / std::pow(track.pt(), 1.1f);
if (std::abs(track.dcaXY()) > maxDCA)
Expand All @@ -780,18 +787,18 @@
// ITS
if (!track.hasITS())
return false; // ITS refit
if (track.itsChi2NCl() > 36.)

Check warning on line 790 in PWGUD/Tasks/upcTauRl.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
return false;
if (!isFulfillsITSHitRequirementsReinstatement(track.itsClusterMap()))
return false;
// TPC
if (!track.hasTPC())
return false; // TPC refit
if ((track.tpcNClsFindable() - track.tpcNClsFindableMinusFound()) < 70)

Check warning on line 797 in PWGUD/Tasks/upcTauRl.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
return false; // tpcNClsFound()
if ((static_cast<float>(track.tpcNClsCrossedRows()) / static_cast<float>(track.tpcNClsFindable())) < 0.8)

Check warning on line 799 in PWGUD/Tasks/upcTauRl.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
return false;
if (track.tpcChi2NCl() > 4.)

Check warning on line 801 in PWGUD/Tasks/upcTauRl.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
return false;
// TOF
if (!track.hasTOF())
Expand All @@ -814,11 +821,11 @@
(trk1.tpcNSigmaEl() * trk1.tpcNSigmaEl() + trk2.tpcNSigmaEl() * trk2.tpcNSigmaEl()))
return false; // definitely muon than electron
// event
if (collision.posZ() > 15.)

Check warning on line 824 in PWGUD/Tasks/upcTauRl.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
return false;
if (rapMother < -0.8 || rapMother > 0.8)

Check warning on line 826 in PWGUD/Tasks/upcTauRl.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
return false;
if (aco > 4 * o2::constants::math::PI / 5) // max opening angle 144 degrees (I hope, check)

Check warning on line 828 in PWGUD/Tasks/upcTauRl.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
return false;

return true;
Expand All @@ -839,7 +846,7 @@
{

// FTOA
if ((std::abs(coll.timeFT0A()) > maxFITtime) && coll.timeFT0A() > -998.)

Check warning on line 849 in PWGUD/Tasks/upcTauRl.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
return false;

// FTOC
Expand Down Expand Up @@ -2117,6 +2124,8 @@
float dcaxy[2] = {trk1.dcaXY(), trk2.dcaXY()};
float dcaz[2] = {trk1.dcaZ(), trk2.dcaZ()};
float trkTimeRes[2] = {trk1.trackTimeRes(), trk2.trackTimeRes()};
uint32_t itsClusterSizesTrk1 = trk1.itsClusterSizes();
uint32_t itsClusterSizesTrk2 = trk2.itsClusterSizes();
float tpcSignal[2] = {trk1.tpcSignal(), trk2.tpcSignal()};
float tpcEl[2] = {trk1.tpcNSigmaEl(), trk2.tpcNSigmaEl()};
float tpcMu[2] = {trk1.tpcNSigmaMu(), trk2.tpcNSigmaMu()};
Expand All @@ -2131,13 +2140,21 @@
float tofKa[2] = {trk1.tofNSigmaKa(), trk2.tofNSigmaKa()};
float tofPr[2] = {trk1.tofNSigmaPr(), trk2.tofNSigmaPr()};
float tofEP[2] = {trk1.tofExpMom(), trk2.tofExpMom()};
float ZNinfo[4] = {-999., -999., -999., -999.};
if constexpr (requires { collision.udZdcsReduced(); }) {
ZNinfo[0] = collision.energyCommonZNA();
ZNinfo[1] = collision.energyCommonZNC();
ZNinfo[2] = collision.timeZNA();
ZNinfo[3] = collision.timeZNC();
}

tauTwoTracks(collision.runNumber(), collision.globalBC(), countTracksPerCollision, collision.numContrib(), countGoodNonPVtracks, collision.posX(), collision.posY(), collision.posZ(),
collision.flags(), collision.occupancyInTime(), collision.hadronicRate(), collision.trs(), collision.trofs(), collision.hmpr(),
collision.tfb(), collision.itsROFb(), collision.sbp(), collision.zVtxFT0vPV(), collision.vtxITSTPC(),
collision.totalFT0AmplitudeA(), collision.totalFT0AmplitudeC(), collision.totalFV0AmplitudeA(),
collision.timeFT0A(), collision.timeFT0C(), collision.timeFV0A(),
collision.totalFT0AmplitudeA(), collision.totalFT0AmplitudeC(), collision.totalFV0AmplitudeA(), ZNinfo[0], ZNinfo[1],
collision.timeFT0A(), collision.timeFT0C(), collision.timeFV0A(), ZNinfo[2], ZNinfo[3],
px, py, pz, sign, dcaxy, dcaz, trkTimeRes,
itsClusterSizesTrk1, itsClusterSizesTrk2,
tpcSignal, tpcEl, tpcMu, tpcPi, tpcKa, tpcPr, tpcIP,
tofSignal, tofEl, tofMu, tofPi, tofKa, tofPr, tofEP);
} else {
Expand Down
Loading