Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 5 additions & 6 deletions PWGEM/Dilepton/Core/DielectronCut.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#define PWGEM_DILEPTON_CORE_DIELECTRONCUT_H_

#include "PWGEM/Dilepton/Utils/EMTrackUtilities.h"
#include "PWGEM/Dilepton/Utils/MlResponseDielectronSingleTrack.h"
#include "PWGEM/Dilepton/Utils/PairUtilities.h"

#include "CommonConstants/PhysicsConstants.h"
Expand Down Expand Up @@ -547,10 +546,10 @@ class DielectronCut : public TNamed
void IncludeITSsa(bool flag, float maxpt);
void EnableTTCA(bool flag);

void SetPIDMlResponse(o2::analysis::MlResponseDielectronSingleTrack<float>* mlResponse)
{
mPIDMlResponse = mlResponse;
}
// void SetPIDMlResponse(o2::analysis::MlResponseDielectronSingleTrack<float>* mlResponse)
// {
// mPIDMlResponse = mlResponse;
// }

void SetMLThresholds(const std::vector<float> bins, const std::vector<float> cuts)
{
Expand Down Expand Up @@ -646,7 +645,7 @@ class DielectronCut : public TNamed
// float mMinP_ITSNsigmaKa{0.0}, mMaxP_ITSNsigmaKa{0.0};
// float mMinP_ITSNsigmaPr{0.0}, mMaxP_ITSNsigmaPr{0.0};

o2::analysis::MlResponseDielectronSingleTrack<float>* mPIDMlResponse{nullptr};
// o2::analysis::MlResponseDielectronSingleTrack<float>* mPIDMlResponse{nullptr};
std::vector<float> mMLBins{}; // binning for a feature variable. e.g. tpcInnerParam
std::vector<float> mMLCuts{}; // threshold for each bin. mMLCuts.size() must be mMLBins.size()-1.

Expand Down
34 changes: 3 additions & 31 deletions PWGEM/Dilepton/Core/Dilepton.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,11 @@
#include "PWGEM/Dilepton/Utils/EMTrackUtilities.h"
#include "PWGEM/Dilepton/Utils/EventHistograms.h"
#include "PWGEM/Dilepton/Utils/EventMixingHandler.h"
#include "PWGEM/Dilepton/Utils/MlResponseDielectronSingleTrack.h"
#include "PWGEM/Dilepton/Utils/PairUtilities.h"

#include "Common/CCDB/RCTSelectionFlags.h"
#include "Common/Core/RecoDecay.h"
#include "Common/Core/Zorro.h"
#include "Common/Core/trackUtilities.h"
#include "Tools/ML/MlResponse.h"

#include "CCDB/BasicCCDBManager.h"
#include "CommonConstants/LHCConstants.h"
Expand All @@ -58,6 +55,7 @@
#include <random>
#include <string>
#include <tuple>
#include <unordered_map>
#include <utility>
#include <vector>

Expand Down Expand Up @@ -241,8 +239,8 @@ struct Dilepton {
// configuration for PID ML
Configurable<std::vector<std::string>> onnxFileNames{"onnxFileNames", std::vector<std::string>{"filename"}, "ONNX file names for each bin (if not from CCDB full path)"};
Configurable<std::vector<std::string>> onnxPathsCCDB{"onnxPathsCCDB", std::vector<std::string>{"path"}, "Paths of models on CCDB"};
Configurable<std::vector<double>> binsMl{"binsMl", std::vector<double>{-999999., 999999.}, "Bin limits for ML application"};
Configurable<std::vector<double>> cutsMl{"cutsMl", std::vector<double>{0.95}, "ML cuts per bin"};
Configurable<std::vector<double>> binsMl{"binsMl", std::vector<double>{0.1, 0.15, 0.2, 0.25, 0.4, 0.8, 1.6, 2.0, 20.f}, "Bin limits for ML application"};
Configurable<std::vector<double>> cutsMl{"cutsMl", std::vector<double>{0.98, 0.98, 0.9, 0.9, 0.95, 0.95, 0.8, 0.8}, "ML cuts per bin"};
Configurable<std::vector<std::string>> namesInputFeatures{"namesInputFeatures", std::vector<std::string>{"feature"}, "Names of ML model input features"};
Configurable<std::string> nameBinningFeature{"nameBinningFeature", "pt", "Names of ML model binning feature"};
Configurable<int64_t> timestampCCDB{"timestampCCDB", -1, "timestamp of the ONNX file for ML model used to query in CCDB. Exceptions: > 0 for the specific timestamp, 0 gets the run dependent timestamp"};
Expand Down Expand Up @@ -700,7 +698,6 @@ struct Dilepton {
fEMEventCut.SetRequireGoodITSLayersAll(eventcuts.cfgRequireGoodITSLayersAll);
}

o2::analysis::MlResponseDielectronSingleTrack<float> mlResponseSingleTrack;
void DefineDielectronCut()
{
fDielectronCut = DielectronCut("fDielectronCut", "fDielectronCut");
Expand Down Expand Up @@ -758,31 +755,6 @@ struct Dilepton {
thresholdsML.emplace_back(dielectroncuts.cutsMl.value[i]);
}
fDielectronCut.SetMLThresholds(binsML, thresholdsML);

// static constexpr int nClassesMl = 2;
// const std::vector<int> cutDirMl = {o2::cuts_ml::CutNot, o2::cuts_ml::CutSmaller};
// const std::vector<std::string> labelsClasses = {"Background", "Signal"};
// const uint32_t nBinsMl = dielectroncuts.binsMl.value.size() - 1;
// const std::vector<std::string> labelsBins(nBinsMl, "bin");
// double cutsMlArr[nBinsMl][nClassesMl];
// for (uint32_t i = 0; i < nBinsMl; i++) {
// cutsMlArr[i][0] = 0.;
// cutsMlArr[i][1] = dielectroncuts.cutsMl.value[i];
// }
// o2::framework::LabeledArray<double> cutsMl = {cutsMlArr[0], nBinsMl, nClassesMl, labelsBins, labelsClasses};

// mlResponseSingleTrack.configure(dielectroncuts.binsMl.value, cutsMl, cutDirMl, nClassesMl);
// if (dielectroncuts.loadModelsFromCCDB) {
// ccdbApi.init(ccdburl);
// mlResponseSingleTrack.setModelPathsCCDB(dielectroncuts.onnxFileNames.value, ccdbApi, dielectroncuts.onnxPathsCCDB.value, dielectroncuts.timestampCCDB.value);
// } else {
// mlResponseSingleTrack.setModelPathsLocal(dielectroncuts.onnxFileNames.value);
// }
// mlResponseSingleTrack.cacheInputFeaturesIndices(dielectroncuts.namesInputFeatures);
// mlResponseSingleTrack.cacheBinningIndex(dielectroncuts.nameBinningFeature);
// mlResponseSingleTrack.init(dielectroncuts.enableOptimizations.value);

// fDielectronCut.SetPIDMlResponse(&mlResponseSingleTrack);
} // end of PID ML
}

Expand Down
33 changes: 2 additions & 31 deletions PWGEM/Dilepton/Core/DileptonHadronMPC.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,11 @@
#include "PWGEM/Dilepton/Utils/EMTrackUtilities.h"
#include "PWGEM/Dilepton/Utils/EventHistograms.h"
#include "PWGEM/Dilepton/Utils/EventMixingHandler.h"
#include "PWGEM/Dilepton/Utils/MlResponseDielectronSingleTrack.h"
#include "PWGEM/Dilepton/Utils/PairUtilities.h"

#include "Common/CCDB/RCTSelectionFlags.h"
#include "Common/Core/RecoDecay.h"
#include "Common/Core/Zorro.h"
#include "Common/Core/trackUtilities.h"
#include "Tools/ML/MlResponse.h"

#include "CCDB/BasicCCDBManager.h"
#include "CommonConstants/LHCConstants.h"
Expand Down Expand Up @@ -228,8 +225,8 @@ struct DileptonHadronMPC {
// configuration for PID ML
Configurable<std::vector<std::string>> onnxFileNames{"onnxFileNames", std::vector<std::string>{"filename"}, "ONNX file names for each bin (if not from CCDB full path)"};
Configurable<std::vector<std::string>> onnxPathsCCDB{"onnxPathsCCDB", std::vector<std::string>{"path"}, "Paths of models on CCDB"};
Configurable<std::vector<double>> binsMl{"binsMl", std::vector<double>{-999999., 999999.}, "Bin limits for ML application"};
Configurable<std::vector<double>> cutsMl{"cutsMl", std::vector<double>{0.95}, "ML cuts per bin"};
Configurable<std::vector<double>> binsMl{"binsMl", std::vector<double>{0.1, 0.15, 0.2, 0.25, 0.4, 0.8, 1.6, 2.0, 20.f}, "Bin limits for ML application"};
Configurable<std::vector<double>> cutsMl{"cutsMl", std::vector<double>{0.98, 0.98, 0.9, 0.9, 0.95, 0.95, 0.8, 0.8}, "ML cuts per bin"};
Configurable<std::vector<std::string>> namesInputFeatures{"namesInputFeatures", std::vector<std::string>{"feature"}, "Names of ML model input features"};
Configurable<std::string> nameBinningFeature{"nameBinningFeature", "pt", "Names of ML model binning feature"};
Configurable<int64_t> timestampCCDB{"timestampCCDB", -1, "timestamp of the ONNX file for ML model used to query in CCDB. Exceptions: > 0 for the specific timestamp, 0 gets the run dependent timestamp"};
Expand Down Expand Up @@ -589,7 +586,6 @@ struct DileptonHadronMPC {
fEMEventCut.SetRequireGoodITSLayersAll(eventcuts.cfgRequireGoodITSLayersAll);
}

o2::analysis::MlResponseDielectronSingleTrack<float> mlResponseSingleTrack;
void DefineDielectronCut()
{
fDielectronCut = DielectronCut("fDielectronCut", "fDielectronCut");
Expand Down Expand Up @@ -646,31 +642,6 @@ struct DileptonHadronMPC {
thresholdsML.emplace_back(dielectroncuts.cutsMl.value[i]);
}
fDielectronCut.SetMLThresholds(binsML, thresholdsML);

// static constexpr int nClassesMl = 2;
// const std::vector<int> cutDirMl = {o2::cuts_ml::CutNot, o2::cuts_ml::CutSmaller};
// const std::vector<std::string> labelsClasses = {"Background", "Signal"};
// const uint32_t nBinsMl = dielectroncuts.binsMl.value.size() - 1;
// const std::vector<std::string> labelsBins(nBinsMl, "bin");
// double cutsMlArr[nBinsMl][nClassesMl];
// for (uint32_t i = 0; i < nBinsMl; i++) {
// cutsMlArr[i][0] = 0.;
// cutsMlArr[i][1] = dielectroncuts.cutsMl.value[i];
// }
// o2::framework::LabeledArray<double> cutsMl = {cutsMlArr[0], nBinsMl, nClassesMl, labelsBins, labelsClasses};

// mlResponseSingleTrack.configure(dielectroncuts.binsMl.value, cutsMl, cutDirMl, nClassesMl);
// if (dielectroncuts.loadModelsFromCCDB) {
// ccdbApi.init(ccdburl);
// mlResponseSingleTrack.setModelPathsCCDB(dielectroncuts.onnxFileNames.value, ccdbApi, dielectroncuts.onnxPathsCCDB.value, dielectroncuts.timestampCCDB.value);
// } else {
// mlResponseSingleTrack.setModelPathsLocal(dielectroncuts.onnxFileNames.value);
// }
// mlResponseSingleTrack.cacheInputFeaturesIndices(dielectroncuts.namesInputFeatures);
// mlResponseSingleTrack.cacheBinningIndex(dielectroncuts.nameBinningFeature);
// mlResponseSingleTrack.init(dielectroncuts.enableOptimizations.value);

// fDielectronCut.SetPIDMlResponse(&mlResponseSingleTrack);
} // end of PID ML
}

Expand Down
34 changes: 3 additions & 31 deletions PWGEM/Dilepton/Core/DileptonMC.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,10 @@
#include "PWGEM/Dilepton/Utils/EMTrackUtilities.h"
#include "PWGEM/Dilepton/Utils/EventHistograms.h"
#include "PWGEM/Dilepton/Utils/MCUtilities.h"
#include "PWGEM/Dilepton/Utils/MlResponseDielectronSingleTrack.h"
#include "PWGEM/Dilepton/Utils/PairUtilities.h"

#include "Common/CCDB/RCTSelectionFlags.h"
#include "Common/Core/RecoDecay.h"
#include "Common/Core/trackUtilities.h"
#include "Tools/ML/MlResponse.h"

#include "CCDB/BasicCCDBManager.h"
#include "CommonConstants/LHCConstants.h"
Expand All @@ -52,6 +49,7 @@
#include <format>
#include <map>
#include <string>
#include <unordered_map>
#include <utility>
#include <vector>

Expand Down Expand Up @@ -243,8 +241,8 @@ struct DileptonMC {
// configuration for PID ML
Configurable<std::vector<std::string>> onnxFileNames{"onnxFileNames", std::vector<std::string>{"filename"}, "ONNX file names for each bin (if not from CCDB full path)"};
Configurable<std::vector<std::string>> onnxPathsCCDB{"onnxPathsCCDB", std::vector<std::string>{"path"}, "Paths of models on CCDB"};
Configurable<std::vector<double>> binsMl{"binsMl", std::vector<double>{-999999., 999999.}, "Bin limits for ML application"};
Configurable<std::vector<double>> cutsMl{"cutsMl", std::vector<double>{0.95}, "ML cuts per bin"};
Configurable<std::vector<double>> binsMl{"binsMl", std::vector<double>{0.1, 0.15, 0.2, 0.25, 0.4, 0.8, 1.6, 2.0, 20.f}, "Bin limits for ML application"};
Configurable<std::vector<double>> cutsMl{"cutsMl", std::vector<double>{0.98, 0.98, 0.9, 0.9, 0.95, 0.95, 0.8, 0.8}, "ML cuts per bin"};
Configurable<std::vector<std::string>> namesInputFeatures{"namesInputFeatures", std::vector<std::string>{"feature"}, "Names of ML model input features"};
Configurable<std::string> nameBinningFeature{"nameBinningFeature", "pt", "Names of ML model binning feature"};
Configurable<int64_t> timestampCCDB{"timestampCCDB", -1, "timestamp of the ONNX file for ML model used to query in CCDB. Exceptions: > 0 for the specific timestamp, 0 gets the run dependent timestamp"};
Expand Down Expand Up @@ -708,7 +706,6 @@ struct DileptonMC {
fEMEventCut.SetRequireGoodITSLayersAll(eventcuts.cfgRequireGoodITSLayersAll);
}

o2::analysis::MlResponseDielectronSingleTrack<float> mlResponseSingleTrack;
void DefineDielectronCut()
{
fDielectronCut = DielectronCut("fDielectronCut", "fDielectronCut");
Expand Down Expand Up @@ -766,31 +763,6 @@ struct DileptonMC {
thresholdsML.emplace_back(dielectroncuts.cutsMl.value[i]);
}
fDielectronCut.SetMLThresholds(binsML, thresholdsML);

// static constexpr int nClassesMl = 2;
// const std::vector<int> cutDirMl = {o2::cuts_ml::CutNot, o2::cuts_ml::CutSmaller};
// const std::vector<std::string> labelsClasses = {"Background", "Signal"};
// const uint32_t nBinsMl = dielectroncuts.binsMl.value.size() - 1;
// const std::vector<std::string> labelsBins(nBinsMl, "bin");
// double cutsMlArr[nBinsMl][nClassesMl];
// for (uint32_t i = 0; i < nBinsMl; i++) {
// cutsMlArr[i][0] = 0.;
// cutsMlArr[i][1] = dielectroncuts.cutsMl.value[i];
// }
// o2::framework::LabeledArray<double> cutsMl = {cutsMlArr[0], nBinsMl, nClassesMl, labelsBins, labelsClasses};

// mlResponseSingleTrack.configure(dielectroncuts.binsMl.value, cutsMl, cutDirMl, nClassesMl);
// if (dielectroncuts.loadModelsFromCCDB) {
// ccdbApi.init(ccdburl);
// mlResponseSingleTrack.setModelPathsCCDB(dielectroncuts.onnxFileNames.value, ccdbApi, dielectroncuts.onnxPathsCCDB.value, dielectroncuts.timestampCCDB.value);
// } else {
// mlResponseSingleTrack.setModelPathsLocal(dielectroncuts.onnxFileNames.value);
// }
// mlResponseSingleTrack.cacheInputFeaturesIndices(dielectroncuts.namesInputFeatures);
// mlResponseSingleTrack.cacheBinningIndex(dielectroncuts.nameBinningFeature);
// mlResponseSingleTrack.init(dielectroncuts.enableOptimizations.value);

// fDielectronCut.SetPIDMlResponse(&mlResponseSingleTrack);
} // end of PID ML
}

Expand Down
4 changes: 2 additions & 2 deletions PWGEM/Dilepton/Core/DileptonProducer.h
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,8 @@ struct DileptonProducer {
// configuration for PID ML
Configurable<std::vector<std::string>> onnxFileNames{"onnxFileNames", std::vector<std::string>{"filename"}, "ONNX file names for each bin (if not from CCDB full path)"};
Configurable<std::vector<std::string>> onnxPathsCCDB{"onnxPathsCCDB", std::vector<std::string>{"path"}, "Paths of models on CCDB"};
Configurable<std::vector<double>> binsMl{"binsMl", std::vector<double>{-999999., 999999.}, "Bin limits for ML application"};
Configurable<std::vector<double>> cutsMl{"cutsMl", std::vector<double>{0.95}, "ML cuts per bin"};
Configurable<std::vector<double>> binsMl{"binsMl", std::vector<double>{0.1, 0.15, 0.2, 0.25, 0.4, 0.8, 1.6, 2.0, 20.f}, "Bin limits for ML application"};
Configurable<std::vector<double>> cutsMl{"cutsMl", std::vector<double>{0.98, 0.98, 0.9, 0.9, 0.95, 0.95, 0.8, 0.8}, "ML cuts per bin"};
Configurable<std::vector<std::string>> namesInputFeatures{"namesInputFeatures", std::vector<std::string>{"feature"}, "Names of ML model input features"};
Configurable<std::string> nameBinningFeature{"nameBinningFeature", "pt", "Names of ML model binning feature"};
Configurable<int64_t> timestampCCDB{"timestampCCDB", -1, "timestamp of the ONNX file for ML model used to query in CCDB. Exceptions: > 0 for the specific timestamp, 0 gets the run dependent timestamp"};
Expand Down
35 changes: 2 additions & 33 deletions PWGEM/Dilepton/Core/SingleTrackQC.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,10 @@
#include "PWGEM/Dilepton/Core/DimuonCut.h"
#include "PWGEM/Dilepton/Core/EMEventCut.h"
#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
#include "PWGEM/Dilepton/Utils/EMTrackUtilities.h"
#include "PWGEM/Dilepton/Utils/EventHistograms.h"
#include "PWGEM/Dilepton/Utils/MlResponseDielectronSingleTrack.h"
#include "PWGEM/Dilepton/Utils/PairUtilities.h"

#include "Common/CCDB/RCTSelectionFlags.h"
#include "Common/Core/Zorro.h"
#include "Tools/ML/MlResponse.h"

#include "CCDB/BasicCCDBManager.h"
#include "DataFormatsParameters/GRPMagField.h"
Expand All @@ -52,7 +48,6 @@ using namespace o2::aod;
using namespace o2::framework;
using namespace o2::framework::expressions;
using namespace o2::soa;
using namespace o2::aod::pwgem::dilepton::utils::emtrackutil;

using MyCollisions = soa::Join<aod::EMEvents, aod::EMEventsMult, aod::EMEventsCent>;
using MyCollision = MyCollisions::iterator;
Expand Down Expand Up @@ -175,8 +170,8 @@ struct SingleTrackQC {
// configuration for PID ML
Configurable<std::vector<std::string>> onnxFileNames{"onnxFileNames", std::vector<std::string>{"filename"}, "ONNX file names for each bin (if not from CCDB full path)"};
Configurable<std::vector<std::string>> onnxPathsCCDB{"onnxPathsCCDB", std::vector<std::string>{"path"}, "Paths of models on CCDB"};
Configurable<std::vector<double>> binsMl{"binsMl", std::vector<double>{-999999., 999999.}, "Bin limits for ML application"};
Configurable<std::vector<double>> cutsMl{"cutsMl", std::vector<double>{0.95}, "ML cuts per bin"};
Configurable<std::vector<double>> binsMl{"binsMl", std::vector<double>{0.1, 0.15, 0.2, 0.25, 0.4, 0.8, 1.6, 2.0, 20.f}, "Bin limits for ML application"};
Configurable<std::vector<double>> cutsMl{"cutsMl", std::vector<double>{0.98, 0.98, 0.9, 0.9, 0.95, 0.95, 0.8, 0.8}, "ML cuts per bin"};
Configurable<std::vector<std::string>> namesInputFeatures{"namesInputFeatures", std::vector<std::string>{"feature"}, "Names of ML model input features"};
Configurable<std::string> nameBinningFeature{"nameBinningFeature", "pt", "Names of ML model binning feature"};
Configurable<int64_t> timestampCCDB{"timestampCCDB", -1, "timestamp of the ONNX file for ML model used to query in CCDB. Exceptions: > 0 for the specific timestamp, 0 gets the run dependent timestamp"};
Expand Down Expand Up @@ -450,7 +445,6 @@ struct SingleTrackQC {
fEMEventCut.SetRequireGoodITSLayersAll(eventcuts.cfgRequireGoodITSLayersAll);
}

o2::analysis::MlResponseDielectronSingleTrack<float> mlResponseSingleTrack;
void DefineDielectronCut()
{
fDielectronCut = DielectronCut("fDielectronCut", "fDielectronCut");
Expand Down Expand Up @@ -497,31 +491,6 @@ struct SingleTrackQC {
thresholdsML.emplace_back(dielectroncuts.cutsMl.value[i]);
}
fDielectronCut.SetMLThresholds(binsML, thresholdsML);

// static constexpr int nClassesMl = 2;
// const std::vector<int> cutDirMl = {o2::cuts_ml::CutNot, o2::cuts_ml::CutSmaller};
// const std::vector<std::string> labelsClasses = {"Background", "Signal"};
// const uint32_t nBinsMl = dielectroncuts.binsMl.value.size() - 1;
// const std::vector<std::string> labelsBins(nBinsMl, "bin");
// double cutsMlArr[nBinsMl][nClassesMl];
// for (uint32_t i = 0; i < nBinsMl; i++) {
// cutsMlArr[i][0] = 0.;
// cutsMlArr[i][1] = dielectroncuts.cutsMl.value[i];
// }
// o2::framework::LabeledArray<double> cutsMl = {cutsMlArr[0], nBinsMl, nClassesMl, labelsBins, labelsClasses};

// mlResponseSingleTrack.configure(dielectroncuts.binsMl.value, cutsMl, cutDirMl, nClassesMl);
// if (dielectroncuts.loadModelsFromCCDB) {
// ccdbApi.init(ccdburl);
// mlResponseSingleTrack.setModelPathsCCDB(dielectroncuts.onnxFileNames.value, ccdbApi, dielectroncuts.onnxPathsCCDB.value, dielectroncuts.timestampCCDB.value);
// } else {
// mlResponseSingleTrack.setModelPathsLocal(dielectroncuts.onnxFileNames.value);
// }
// mlResponseSingleTrack.cacheInputFeaturesIndices(dielectroncuts.namesInputFeatures);
// mlResponseSingleTrack.cacheBinningIndex(dielectroncuts.nameBinningFeature);
// mlResponseSingleTrack.init(dielectroncuts.enableOptimizations.value);

// fDielectronCut.SetPIDMlResponse(&mlResponseSingleTrack);
} // end of PID ML
}

Expand Down
Loading
Loading