Skip to content

[PWGDQ,PWGJE] Add variables to dielectronAll and mixing library #13700

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

Open
JinjooSeo wants to merge 6 commits into
base: master
Choose a base branch
from
+117 −23
Open

[PWGDQ,PWGJE] Add variables to dielectronAll and mixing library #13700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9ce971a
Add varialbes to dielectronAll table and mixing libaray
JinjooSeo Nov 5, 2025
8c964f1
clang format
JinjooSeo Nov 5, 2025
6565b6c
correct miss ordering
JinjooSeo Nov 5, 2025
3d049e8
Add variables
JinjooSeo Nov 5, 2025
871aa51
Add variables to DQMLResponse and init setup
JinjooSeo Nov 7, 2025
7958ab2
clang format
JinjooSeo Nov 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
58 changes: 54 additions & 4 deletions PWGDQ/Core/DQMlResponse.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
namespace o2::analysis
{

enum class InputFeatures : uint8_t { // refer to DielectronsAll, TODO: add more features if needed
enum class InputFeatures : uint8_t { // refer to DielectronsAll
kMass = 0,
kPt,
kEta,
Expand Down Expand Up @@ -57,7 +57,17 @@
kTPCNSigmaPr2,
kTOFNSigmaEl2,
kTOFNSigmaPi2,
kTOFNSigmaPr2
kTOFNSigmaPr2,
kTauz,
kTauxy,
kLz,
kLxy,
kTauzCov,
kTauxyCov,
kLzCov,
kLxyCov,
kChi2pca,
kCosPointingAngle
};

static const std::map<InputFeatures, std::string> gFeatureNameMap = {
Expand Down Expand Up @@ -90,7 +100,17 @@
{InputFeatures::kTPCNSigmaPr2, "kTPCNSigmaPr2"},
{InputFeatures::kTOFNSigmaEl2, "kTOFNSigmaEl2"},
{InputFeatures::kTOFNSigmaPi2, "kTOFNSigmaPi2"},
{InputFeatures::kTOFNSigmaPr2, "kTOFNSigmaPr2"}};
{InputFeatures::kTOFNSigmaPr2, "kTOFNSigmaPr2"},
{InputFeatures::kTauz, "kTauz"},
{InputFeatures::kTauxy, "kTauxy"},
{InputFeatures::kLz, "kLz"},
{InputFeatures::kLxy, "kLxy"},
{InputFeatures::kTauzCov, "kTauzCov"},
{InputFeatures::kTauxyCov, "kTauxyCov"},
{InputFeatures::kLzCov, "kLzCov"},
{InputFeatures::kLxyCov, "kLxyCov"},
{InputFeatures::kChi2pca, "kChi2pca"},
{InputFeatures::kCosPointingAngle, "kCosPointingAngle"}};

template <typename TypeOutputScore = float>
class DQMlResponse : public MlResponse<TypeOutputScore>
Expand All @@ -117,7 +137,7 @@
std::vector<float> dqInputFeatures;
dqInputFeatures.reserve(MlResponse<TypeOutputScore>::mCachedIndices.size());

for (auto idx : MlResponse<TypeOutputScore>::mCachedIndices) {

Check failure on line 140 in PWGDQ/Core/DQMlResponse.h

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.
auto enumIdx = static_cast<InputFeatures>(idx);
auto mapIdx = gFeatureNameMap.find(enumIdx);
if (mapIdx == gFeatureNameMap.end()) {
Expand Down Expand Up @@ -185,6 +205,26 @@
dqInputFeatures.push_back(t2.tofNSigmaPi());
} else if (name == "kTOFNSigmaPr2") {
dqInputFeatures.push_back(t2.tofNSigmaPr());
} else if (name == "kTauz") {
dqInputFeatures.push_back(fg[VarManager::fgVarNamesMap["kVertexingTauzProjected"]]);
} else if (name == "kTauxy") {
dqInputFeatures.push_back(fg[VarManager::fgVarNamesMap["kVertexingTauxyProjected"]]);
} else if (name == "kLz") {
dqInputFeatures.push_back(fg[VarManager::fgVarNamesMap["kVertexingLzProjected"]]);
} else if (name == "kLxy") {
dqInputFeatures.push_back(fg[VarManager::fgVarNamesMap["kVertexingLxyProjected"]]);
} else if (name == "kTauzCov") {
dqInputFeatures.push_back(fg[VarManager::fgVarNamesMap["kVertexingTauz"]]);
} else if (name == "kTauxyCov") {
dqInputFeatures.push_back(fg[VarManager::fgVarNamesMap["kVertexingTauxy"]]);
} else if (name == "kLzCov") {
dqInputFeatures.push_back(fg[VarManager::fgVarNamesMap["kVertexingLz"]]);
} else if (name == "kLxyCov") {
dqInputFeatures.push_back(fg[VarManager::fgVarNamesMap["kVertexingLxy"]]);
} else if (name == "kChi2pca") {
dqInputFeatures.push_back(fg[VarManager::fgVarNamesMap["kVertexingChi2PCA"]]);
} else if (name == "kCosPointingAngle") {
dqInputFeatures.push_back(fg[VarManager::fgVarNamesMap["kCosPointingAngle"]]);
} else {
LOG(fatal) << "Missing accessor for feature: " << name;
}
Expand Down Expand Up @@ -230,7 +270,17 @@
{"kTPCNSigmaPr2", static_cast<uint8_t>(InputFeatures::kTPCNSigmaPr2)},
{"kTOFNSigmaEl2", static_cast<uint8_t>(InputFeatures::kTOFNSigmaEl2)},
{"kTOFNSigmaPi2", static_cast<uint8_t>(InputFeatures::kTOFNSigmaPi2)},
{"kTOFNSigmaPr2", static_cast<uint8_t>(InputFeatures::kTOFNSigmaPr2)}};
{"kTOFNSigmaPr2", static_cast<uint8_t>(InputFeatures::kTOFNSigmaPr2)},
{"kTauz", static_cast<uint8_t>(InputFeatures::kTauz)},
{"kTauxy", static_cast<uint8_t>(InputFeatures::kTauxy)},
{"kLz", static_cast<uint8_t>(InputFeatures::kLz)},
{"kLxy", static_cast<uint8_t>(InputFeatures::kLxy)},
{"kTauzCov", static_cast<uint8_t>(InputFeatures::kTauzCov)},
{"kTauxyCov", static_cast<uint8_t>(InputFeatures::kTauxyCov)},
{"kLzCov", static_cast<uint8_t>(InputFeatures::kLzCov)},
{"kLxyCov", static_cast<uint8_t>(InputFeatures::kLxyCov)},
{"kChi2pca", static_cast<uint8_t>(InputFeatures::kChi2pca)},
{"kCosPointingAngle", static_cast<uint8_t>(InputFeatures::kCosPointingAngle)}};
}
};

Expand Down
4 changes: 4 additions & 0 deletions PWGDQ/Core/MixingLibrary.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,10 @@ void o2::aod::dqmixing::SetUpMixing(MixingHandler* mh, const char* mixingVarible
std::vector<float> fOccLimsHashing = {0.0f, 250.0f, 500.0f, 750.0f, 1000.0f, 1500.0f, 2000.0f, 3000.0f, 4500.0f, 6000.0f, 8000.0f, 10000.0f, 50000.0f};
mh->AddMixingVariable(VarManager::kTrackOccupancyInTimeRange, fOccLimsHashing.size(), fOccLimsHashing);
}
if (!nameStr.compare("Occupancy4")) {
std::vector<float> fOccLimsHashing = {0.0f, 50.0f, 100.0f, 500.0f, 1000.0f, 1500.0f, 2000.0f, 2500.0f, 3000.0f, 3500.0f, 4000.0f, 4500.0f, 5000.0f, 50000.0f};
mh->AddMixingVariable(VarManager::kTrackOccupancyInTimeRange, fOccLimsHashing.size(), fOccLimsHashing);
}
if (!nameStr.compare("Psi2A1")) {
std::vector<float> fPsi2A = {-TMath::Pi() / 2., 0.0f, TMath::Pi() / 2.};
mh->AddMixingVariable(VarManager::kPsi2A, fPsi2A.size(), fPsi2A);
Expand Down
45 changes: 36 additions & 9 deletions PWGDQ/Core/VarManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,14 @@
#include <cmath>
#include <complex>
#include <cstdint>
#include <iostream>

Check failure on line 68 in PWGDQ/Core/VarManager.h

View workflow job for this annotation

GitHub Actions / O2 linter

[include-iostream] 

Do not include iostream. Use O2 logging instead.
#include <map>
#include <utility>
#include <vector>

using std::complex;

Check failure on line 73 in PWGDQ/Core/VarManager.h

View workflow job for this annotation

GitHub Actions / O2 linter

[import-std-name] 

Do not import names from the std namespace in headers.
using std::cout;

Check failure on line 74 in PWGDQ/Core/VarManager.h

View workflow job for this annotation

GitHub Actions / O2 linter

[import-std-name] 

Do not import names from the std namespace in headers.
using std::endl;

Check failure on line 75 in PWGDQ/Core/VarManager.h

View workflow job for this annotation

GitHub Actions / O2 linter

[import-std-name] 

Do not import names from the std namespace in headers.

using SMatrix55 = ROOT::Math::SMatrix<double, 5, 5, ROOT::Math::MatRepSym<double, 5>>;
using SMatrix5 = ROOT::Math::SVector<double, 5>;
Expand Down Expand Up @@ -1230,15 +1230,15 @@

static float fgMagField;
static float fgzMatching;
static float fgCenterOfMassEnergy; // collision energy
static float fgMassofCollidingParticle; // mass of the colliding particle
static float fgTPCInterSectorBoundary; // TPC inter-sector border size at the TPC outer radius, in cm
static int fgITSROFbias; // ITS ROF bias (from ALPIDE parameters)
static int fgITSROFlength; // ITS ROF length (from ALPIDE parameters)
static int fgITSROFBorderMarginLow; // ITS ROF border low margin
static int fgITSROFBorderMarginHigh; // ITS ROF border high margin
static uint64_t fgSOR; // Timestamp for start of run
static uint64_t fgEOR; // Timestamp for end of run
static float fgCenterOfMassEnergy; // collision energy
static float fgMassofCollidingParticle; // mass of the colliding particle
static float fgTPCInterSectorBoundary; // TPC inter-sector border size at the TPC outer radius, in cm
static int fgITSROFbias; // ITS ROF bias (from ALPIDE parameters)
static int fgITSROFlength; // ITS ROF length (from ALPIDE parameters)
static int fgITSROFBorderMarginLow; // ITS ROF border low margin
static int fgITSROFBorderMarginHigh; // ITS ROF border high margin
static uint64_t fgSOR; // Timestamp for start of run
static uint64_t fgEOR; // Timestamp for end of run
static ROOT::Math::PxPyPzEVector fgBeamA; // beam from A-side 4-momentum vector
static ROOT::Math::PxPyPzEVector fgBeamC; // beam from C-side 4-momentum vector

Expand Down Expand Up @@ -1501,9 +1501,9 @@
}
if constexpr ((fillMap & MuonCov) > 0 || (fillMap & ReducedMuonCov) > 0) {
o2::dataformats::GlobalFwdTrack propmuon = PropagateMuon(muontrack, collision);
double px = propmuon.getP() * sin(M_PI / 2 - atan(mfttrack.tgl())) * cos(mfttrack.phi());

Check failure on line 1504 in PWGDQ/Core/VarManager.h

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
double py = propmuon.getP() * sin(M_PI / 2 - atan(mfttrack.tgl())) * sin(mfttrack.phi());

Check failure on line 1505 in PWGDQ/Core/VarManager.h

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
double pz = propmuon.getP() * cos(M_PI / 2 - atan(mfttrack.tgl()));

Check failure on line 1506 in PWGDQ/Core/VarManager.h

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
double pt = std::sqrt(std::pow(px, 2) + std::pow(py, 2));
values[kX] = mfttrack.x();
values[kY] = mfttrack.y();
Expand Down Expand Up @@ -2048,7 +2048,7 @@
trackPar.propagateParamToDCA({collision.posX(), collision.posY(), collision.posZ()}, fgMagField, &dca);

// if it is a displaced track longitudinally, add it to the track vector
if (abs(dca[0]) < 3.0 && abs(dca[1]) > 4.0) {

Check failure on line 2051 in PWGDQ/Core/VarManager.h

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
if (track.tgl() > 0.1) {
tracksP.push_back(track.z());
}
Expand Down Expand Up @@ -3249,6 +3249,9 @@
m2 = o2::constants::physics::MassMuon;
}

values[kCharge] = t1.sign() + t2.sign();
values[kCharge1] = t1.sign();
values[kCharge2] = t2.sign();
ROOT::Math::PtEtaPhiMVector v1(t1.pt(), t1.eta(), t1.phi(), m1);
ROOT::Math::PtEtaPhiMVector v2(t2.pt(), t2.eta(), t2.phi(), m2);
ROOT::Math::PtEtaPhiMVector v12 = v1 + v2;
Expand All @@ -3258,6 +3261,9 @@
// values[kPhi] = v12.Phi();
values[kPhi] = v12.Phi() > 0 ? v12.Phi() : v12.Phi() + 2. * M_PI;
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());
values[kDeltaPtotTracks] = Ptot1 - Ptot2;

if (fgUsedVars[kDeltaPhiPair2]) {
double phipair2ME = v1.Phi() - v2.Phi();
Expand All @@ -3274,6 +3280,27 @@
values[kDeltaEtaPair2] = v1.Eta() - v2.Eta();
}

if (fgUsedVars[kPsiPair]) {
values[kDeltaPhiPair] = (t1.sign() * fgMagField > 0.) ? (v1.Phi() - v2.Phi()) : (v2.Phi() - v1.Phi());
double xipair = TMath::ACos((v1.Px() * v2.Px() + v1.Py() * v2.Py() + v1.Pz() * v2.Pz()) / v1.P() / v2.P());
values[kPsiPair] = (t1.sign() * fgMagField > 0.) ? TMath::ASin((v1.Theta() - v2.Theta()) / xipair) : TMath::ASin((v2.Theta() - v1.Theta()) / xipair);
}

if (fgUsedVars[kOpeningAngle]) {
double scalar = v1.Px() * v2.Px() + v1.Py() * v2.Py() + v1.Pz() * v2.Pz();
double Ptot12 = Ptot1 * Ptot2;
if (Ptot12 <= 0) {
values[kOpeningAngle] = 0.;
} else {
double arg = scalar / Ptot12;
if (arg > 1.)
arg = 1.;
if (arg < -1)
arg = -1;
values[kOpeningAngle] = TMath::ACos(arg);
}
}

// polarization parameters
bool useHE = fgUsedVars[kCosThetaHE] || fgUsedVars[kPhiHE]; // helicity frame
bool useCS = fgUsedVars[kCosThetaCS] || fgUsedVars[kPhiCS]; // Collins-Soper frame
Expand Down Expand Up @@ -3922,7 +3949,7 @@
values[kVertexingLxyErr] = (KFPV.GetCovariance(0) + KFGeoTwoProng.GetCovariance(0)) * dxPair2PV * dxPair2PV + (KFPV.GetCovariance(2) + KFGeoTwoProng.GetCovariance(2)) * dyPair2PV * dyPair2PV + 2 * ((KFPV.GetCovariance(1) + KFGeoTwoProng.GetCovariance(1)) * dxPair2PV * dyPair2PV);
values[kVertexingLzErr] = (KFPV.GetCovariance(5) + KFGeoTwoProng.GetCovariance(5)) * dzPair2PV * dzPair2PV;
values[kVertexingLxyzErr] = (KFPV.GetCovariance(0) + KFGeoTwoProng.GetCovariance(0)) * dxPair2PV * dxPair2PV + (KFPV.GetCovariance(2) + KFGeoTwoProng.GetCovariance(2)) * dyPair2PV * dyPair2PV + (KFPV.GetCovariance(5) + KFGeoTwoProng.GetCovariance(5)) * dzPair2PV * dzPair2PV + 2 * ((KFPV.GetCovariance(1) + KFGeoTwoProng.GetCovariance(1)) * dxPair2PV * dyPair2PV + (KFPV.GetCovariance(3) + KFGeoTwoProng.GetCovariance(3)) * dxPair2PV * dzPair2PV + (KFPV.GetCovariance(4) + KFGeoTwoProng.GetCovariance(4)) * dyPair2PV * dzPair2PV);
if (fabs(values[kVertexingLxy]) < 1.e-8f)

Check failure on line 3952 in PWGDQ/Core/VarManager.h

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
values[kVertexingLxy] = 1.e-8f;
values[kVertexingLxyErr] = values[kVertexingLxyErr] < 0. ? 1.e8f : std::sqrt(values[kVertexingLxyErr]) / values[kVertexingLxy];
if (fabs(values[kVertexingLz]) < 1.e-8f)
Expand Down
10 changes: 8 additions & 2 deletions PWGDQ/DataModel/ReducedInfoTables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,6 +747,10 @@ DECLARE_SOA_COLUMN(PairDCAxyz, pairDCAxyz, float);
DECLARE_SOA_COLUMN(PairDCAxy, pairDCAxy, float); //! Pair DCAxy to PV from KFParticle
DECLARE_SOA_COLUMN(DeviationPairKF, deviationPairKF, float); //! Pair chi2 deviation to PV from KFParticle
DECLARE_SOA_COLUMN(DeviationxyPairKF, deviationxyPairKF, float); //! Pair chi2 deviation to PV in XY from KFParticle
DECLARE_SOA_COLUMN(TauzCov, tauzCov, float); //! Longitudinal pseudo-proper time of lepton pair from covariance matrix
DECLARE_SOA_COLUMN(TauxyCov, tauxyCov, float); //! Transverse pseudo-proper time of lepton pair from covariance matrix
DECLARE_SOA_COLUMN(LzCov, lzCov, float); //! Longitudinal projection of decay length from covariance matrix
DECLARE_SOA_COLUMN(LxyCov, lxyCov, float); //! Transverse projection of decay length from covariance matrix
// DECLARE_SOA_INDEX_COLUMN(ReducedMuon, reducedmuon2); //!
DECLARE_SOA_COLUMN(CosThetaHE, costhetaHE, float); //! Cosine in the helicity frame
DECLARE_SOA_COLUMN(PhiHE, phiHe, float); //! Phi in the helicity frame
Expand Down Expand Up @@ -843,8 +847,10 @@ DECLARE_SOA_TABLE_STAGED(DielectronsAll, "RTDIELECTRONALL", //!
reducedpair::DeviationPairKF, reducedpair::DeviationxyPairKF,
reducedpair::MassKFGeoTop, reducedpair::Chi2OverNDFKFGeoTop,
reducedpair::Tauz, reducedpair::Tauxy,
reducedpair::Lz,
reducedpair::Lxy);
reducedpair::Lz, reducedpair::Lxy,
reducedpair::TauzCov, reducedpair::TauxyCov,
reducedpair::LzCov, reducedpair::LxyCov,
reducedpair::Chi2pca, reducedpair::CosPointingAngle);

DECLARE_SOA_TABLE(DimuonsAll, "AOD", "RTDIMUONALL", //!
collision::PosX, collision::PosY, collision::PosZ, collision::NumContrib,
Expand Down
3 changes: 2 additions & 1 deletion PWGDQ/Tasks/dqEfficiency.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -832,7 +832,8 @@ struct AnalysisSameEventPairing {
VarManager::fgValues[VarManager::kKFPairDeviationFromPV], VarManager::fgValues[VarManager::kKFPairDeviationxyFromPV],
VarManager::fgValues[VarManager::kKFMassGeoTop], VarManager::fgValues[VarManager::kKFChi2OverNDFGeoTop],
VarManager::fgValues[VarManager::kVertexingTauzProjected], VarManager::fgValues[VarManager::kVertexingTauxyProjected],
VarManager::fgValues[VarManager::kVertexingLzProjected], VarManager::fgValues[VarManager::kVertexingLxyProjected]);
VarManager::fgValues[VarManager::kVertexingLzProjected], VarManager::fgValues[VarManager::kVertexingLxyProjected],
VarManager::fgValues[VarManager::kVertexingTauz], VarManager::fgValues[VarManager::kVertexingTauxy], VarManager::fgValues[VarManager::kVertexingLz], VarManager::fgValues[VarManager::kVertexingLxy], VarManager::fgValues[VarManager::kVertexingChi2PCA], VarManager::fgValues[VarManager::kCosPointingAngle]);
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion PWGDQ/Tasks/dqEfficiency_withAssoc.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1865,7 +1865,8 @@ struct AnalysisSameEventPairing {
VarManager::fgValues[VarManager::kKFPairDeviationFromPV], VarManager::fgValues[VarManager::kKFPairDeviationxyFromPV],
VarManager::fgValues[VarManager::kKFMassGeoTop], VarManager::fgValues[VarManager::kKFChi2OverNDFGeoTop],
VarManager::fgValues[VarManager::kVertexingTauzProjected], VarManager::fgValues[VarManager::kVertexingTauxyProjected],
VarManager::fgValues[VarManager::kVertexingLzProjected], VarManager::fgValues[VarManager::kVertexingLxyProjected]);
VarManager::fgValues[VarManager::kVertexingLzProjected], VarManager::fgValues[VarManager::kVertexingLxyProjected],
VarManager::fgValues[VarManager::kVertexingTauz], VarManager::fgValues[VarManager::kVertexingTauxy], VarManager::fgValues[VarManager::kVertexingLz], VarManager::fgValues[VarManager::kVertexingLxy], VarManager::fgValues[VarManager::kVertexingChi2PCA], VarManager::fgValues[VarManager::kCosPointingAngle]);
}
}
}
Expand Down
5 changes: 3 additions & 2 deletions PWGDQ/Tasks/tableReader.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1177,7 +1177,7 @@ struct AnalysisSameEventPairing {
fDQMlResponse.setModelPathsLocal(onnxFileNames);
}
fDQMlResponse.cacheInputFeaturesIndices(namesInputFeatures);
fDQMlResponse.init();
fDQMlResponse.init(false, 1);
}

if (context.mOptions.get<bool>("processDecayToEESkimmed") || context.mOptions.get<bool>("processDecayToEESkimmedNoTwoProngFitter") || context.mOptions.get<bool>("processDecayToEESkimmedWithCov") || context.mOptions.get<bool>("processDecayToEESkimmedWithCovNoTwoProngFitter") || context.mOptions.get<bool>("processDecayToEEVertexingSkimmed") || context.mOptions.get<bool>("processVnDecayToEESkimmed") || context.mOptions.get<bool>("processDecayToEEPrefilterSkimmed") || context.mOptions.get<bool>("processDecayToEEPrefilterSkimmedNoTwoProngFitter") || context.mOptions.get<bool>("processDecayToEESkimmedWithColl") || context.mOptions.get<bool>("processDecayToEESkimmedWithCollNoTwoProngFitter") || context.mOptions.get<bool>("processDecayToPiPiSkimmed") || context.mOptions.get<bool>("processAllSkimmed")) {
Expand Down Expand Up @@ -1501,7 +1501,8 @@ struct AnalysisSameEventPairing {
VarManager::fgValues[VarManager::kKFTrack0DeviationFromPV], VarManager::fgValues[VarManager::kKFTrack1DeviationFromPV], VarManager::fgValues[VarManager::kKFTrack0DeviationxyFromPV], VarManager::fgValues[VarManager::kKFTrack1DeviationxyFromPV],
VarManager::fgValues[VarManager::kKFMass], VarManager::fgValues[VarManager::kKFChi2OverNDFGeo], VarManager::fgValues[VarManager::kVertexingLxyz], VarManager::fgValues[VarManager::kVertexingLxyzOverErr], VarManager::fgValues[VarManager::kVertexingLxy], VarManager::fgValues[VarManager::kVertexingLxyOverErr], VarManager::fgValues[VarManager::kVertexingTauxy], VarManager::fgValues[VarManager::kVertexingTauxyErr], VarManager::fgValues[VarManager::kKFCosPA], VarManager::fgValues[VarManager::kKFJpsiDCAxyz], VarManager::fgValues[VarManager::kKFJpsiDCAxy],
VarManager::fgValues[VarManager::kKFPairDeviationFromPV], VarManager::fgValues[VarManager::kKFPairDeviationxyFromPV],
VarManager::fgValues[VarManager::kKFMassGeoTop], VarManager::fgValues[VarManager::kKFChi2OverNDFGeoTop], VarManager::fgValues[VarManager::kVertexingTauzProjected], VarManager::fgValues[VarManager::kVertexingTauxyProjected], VarManager::fgValues[VarManager::kVertexingLzProjected], VarManager::fgValues[VarManager::kVertexingLxyProjected]);
VarManager::fgValues[VarManager::kKFMassGeoTop], VarManager::fgValues[VarManager::kKFChi2OverNDFGeoTop], VarManager::fgValues[VarManager::kVertexingTauzProjected], VarManager::fgValues[VarManager::kVertexingTauxyProjected], VarManager::fgValues[VarManager::kVertexingLzProjected], VarManager::fgValues[VarManager::kVertexingLxyProjected],
VarManager::fgValues[VarManager::kVertexingTauz], VarManager::fgValues[VarManager::kVertexingTauxy], VarManager::fgValues[VarManager::kVertexingLz], VarManager::fgValues[VarManager::kVertexingLxy], VarManager::fgValues[VarManager::kVertexingChi2PCA], VarManager::fgValues[VarManager::kCosPointingAngle]);
}
}
if constexpr (TPairType == pairTypeMuMu) {
Expand Down
7 changes: 4 additions & 3 deletions PWGDQ/Tasks/tableReader_withAssoc.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1396,7 +1396,7 @@ struct AnalysisSameEventPairing {
fDQMlResponse.setModelPathsLocal(onnxFileNames);
}
fDQMlResponse.cacheInputFeaturesIndices(namesInputFeatures);
fDQMlResponse.init();
fDQMlResponse.init(false, 1);
}

// get the barrel track selection cuts
Expand Down Expand Up @@ -1811,7 +1811,7 @@ struct AnalysisSameEventPairing {
continue;
}

LOG(debug) << "Model index: " << modelIndex << ", pT: " << VarManager::fgValues[VarManager::kPt] << ", centrality (kCentFT0C): " << VarManager::fgValues[VarManager::kCentFT0C];
// LOG(info) << "Model index: " << modelIndex << ", pT: " << VarManager::fgValues[VarManager::kPt] << ", centrality (kCentFT0C): " << VarManager::fgValues[VarManager::kCentFT0C];
isSelectedBDT = fDQMlResponse.isSelectedMl(dqInputFeatures, modelIndex, fOutputMlPsi2ee);
VarManager::FillBdtScore(fOutputMlPsi2ee); // TODO: check if this is needed or not
}
Expand All @@ -1828,7 +1828,8 @@ struct AnalysisSameEventPairing {
VarManager::fgValues[VarManager::kKFMass], VarManager::fgValues[VarManager::kKFChi2OverNDFGeo], VarManager::fgValues[VarManager::kVertexingLxyz], VarManager::fgValues[VarManager::kVertexingLxyzOverErr], VarManager::fgValues[VarManager::kVertexingLxy], VarManager::fgValues[VarManager::kVertexingLxyOverErr], VarManager::fgValues[VarManager::kVertexingTauxy], VarManager::fgValues[VarManager::kVertexingTauxyErr], VarManager::fgValues[VarManager::kKFCosPA], VarManager::fgValues[VarManager::kKFJpsiDCAxyz], VarManager::fgValues[VarManager::kKFJpsiDCAxy],
VarManager::fgValues[VarManager::kKFPairDeviationFromPV], VarManager::fgValues[VarManager::kKFPairDeviationxyFromPV],
VarManager::fgValues[VarManager::kKFMassGeoTop],
VarManager::fgValues[VarManager::kKFChi2OverNDFGeoTop], VarManager::fgValues[VarManager::kVertexingTauzProjected], VarManager::fgValues[VarManager::kVertexingTauxyProjected], VarManager::fgValues[VarManager::kVertexingLzProjected], VarManager::fgValues[VarManager::kVertexingLxyProjected]);
VarManager::fgValues[VarManager::kKFChi2OverNDFGeoTop], VarManager::fgValues[VarManager::kVertexingTauzProjected], VarManager::fgValues[VarManager::kVertexingTauxyProjected], VarManager::fgValues[VarManager::kVertexingLzProjected], VarManager::fgValues[VarManager::kVertexingLxyProjected],
VarManager::fgValues[VarManager::kVertexingTauz], VarManager::fgValues[VarManager::kVertexingTauxy], VarManager::fgValues[VarManager::kVertexingLz], VarManager::fgValues[VarManager::kVertexingLxy], VarManager::fgValues[VarManager::kVertexingChi2PCA], VarManager::fgValues[VarManager::kCosPointingAngle]);
}
}
}
Expand Down
5 changes: 4 additions & 1 deletion PWGJE/Core/JetDQUtilities.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,10 @@ void fillDielectronCandidateTable(T const& candidate, int32_t collisionIndex, U&
candidate.pairDCAxyz(), candidate.pairDCAxy(),
candidate.deviationPairKF(), candidate.deviationxyPairKF(),
candidate.massKFGeoTop(), candidate.chi2overndfKFGeoTop(),
candidate.tauz(), candidate.tauxy(), candidate.lz(), candidate.lxy());
candidate.tauz(), candidate.tauxy(), candidate.lz(), candidate.lxy(),
candidate.tauzCov(), candidate.tauxyCov(), candidate.lzCov(), candidate.lxyCov(),

candidate.chi2pca(), candidate.cosPointingAngle());
}

template <typename T, typename U>
Expand Down
Loading