Skip to content

Commit fd05be2

Browse files
LucasFerrandiLucasFerrandi
authored
Merge branch 'AliceO2Group:master' into master
2 parents a7fe874 + 185ff35 commit fd05be2

45 files changed

Lines changed: 4861 additions & 3219 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ALICE3/Tasks/alice3Multicharm.cxx‎

Lines changed: 54 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ struct Alice3Multicharm {
6969
Configurable<int64_t> timestampCCDB{"timestampCCDB", 1695750420200, "timestamp of the ONNX file for ML model used to query in CCDB. Please use 1695750420200"};
7070
Configurable<bool> loadModelsFromCCDB{"loadModelsFromCCDB", false, "Flag to enable or disable the loading of models from CCDB"};
7171
Configurable<bool> enableOptimizations{"enableOptimizations", false, "Enables the ONNX extended model-optimization: sessionOptions.SetGraphOptimizationLevel(GraphOptimizationLevel::ORT_ENABLE_EXTENDED)"};
72-
Configurable<bool> enableML{"enableML", false, "Enables bdt model"};
72+
Configurable<bool> enableML{"enableML", true, "Enables bdt model"};
7373
} bdt;
7474

7575
ConfigurableAxis axisEta{"axisEta", {80, -4.0f, +4.0f}, "#eta"};
@@ -196,36 +196,32 @@ struct Alice3Multicharm {
196196
bdtMCharm.initModel(bdt.localPath.value, bdt.enableOptimizations.value);
197197
}
198198

199-
histos.add("hBDTScore", "hBDTScore", kTH1D, {axisBDTScore});
200-
histos.add("hBDTScoreVsXiccMass", "hBDTScoreVsXiccMass", kTH2D, {axisXiccMass, axisBDTScore});
201-
histos.add("hBDTScoreVsXiccPt", "hBDTScoreVsXiccPt", kTH2D, {axisPt, axisBDTScore});
202-
histos.add("h3dBDTScore", "h3dBDTScore", kTH3D, {axisPt, axisXiccMass, axisBDTScore});
203-
histos.add("hDCAXicDaughters", "hDCAXicDaughters", kTH2D, {{axisBDTScore, axisDcaDaughters}});
204-
histos.add("hDCAXiccDaughters", "hDCAXiccDaughters", kTH2D, {{axisBDTScore, axisDcaDaughters}});
205-
histos.add("hDCAxyXi", "hDCAxyXi", kTH2D, {{axisBDTScore, axisDCA}});
206-
histos.add("hDCAzXi", "hDCAzXi", kTH2D, {{axisBDTScore, axisDCA}});
207-
histos.add("hDCAxyXic", "hDCAxyXic", kTH2D, {{axisBDTScore, axisDCA}});
208-
histos.add("hDCAzXic", "hDCAzXic", kTH2D, {{axisBDTScore, axisDCA}});
209-
histos.add("hDCAxyXicc", "hDCAxyXicc", kTH2D, {{axisBDTScore, axisDCA}});
210-
histos.add("hDCAzXicc", "hDCAzXicc", kTH2D, {{axisBDTScore, axisDCA}});
211-
histos.add("hDecayRadiusXic", "hDecayRadiusXic", kTH2D, {{axisBDTScore, axisRadius}});
212-
histos.add("hDecayRadiusXicc", "hDecayRadiusXicc", kTH2D, {{axisBDTScore, axisRadius}});
213-
histos.add("hDecayDistanceFromPVXic", "hDecayDistanceFromPVXic", kTH2D, {{axisBDTScore, axisDecayLength}});
214-
histos.add("hProperLengthXic", "hProperLengthXic", kTH2D, {{axisBDTScore, axisDecayLength}});
215-
histos.add("hProperLengthXicc", "hProperLengthXicc", kTH2D, {{axisBDTScore, axisDecayLength}});
216-
histos.add("hPi1cDCAxy", "hPi1cDCAxy", kTH2D, {{axisBDTScore, axisDCA}});
217-
histos.add("hPi1cDCAz", "hPi1cDCAz", kTH2D, {{axisBDTScore, axisDCA}});
218-
histos.add("hPi2cDCAxy", "hPi2cDCAxy", kTH2D, {{axisBDTScore, axisDCA}});
219-
histos.add("hPi2cDCAz", "hPi2cDCAz", kTH2D, {{axisBDTScore, axisDCA}});
220-
histos.add("hPiccDCAxy", "hPiccDCAxy", kTH2D, {{axisBDTScore, axisDCA}});
221-
histos.add("hPiccDCAz", "hPiccDCAz", kTH2D, {{axisBDTScore, axisDCA}});
222-
histos.add("hPi1cPt", "hPi1cPt", kTH2D, {{axisBDTScore, axisPt}});
223-
histos.add("hPi2cPt", "hPi2cPt", kTH2D, {{axisBDTScore, axisPt}});
224-
histos.add("hPiccPt", "hPiccPt", kTH2D, {{axisBDTScore, axisPt}});
225-
histos.add("hXiccMass", "hXiccMass", kTH2D, {{axisBDTScore, axisXiccMass}});
226-
histos.add("hXicMass", "hXicMass", kTH2D, {{axisBDTScore, axisXicMass}});
227-
histos.add("hXiccPt", "hXiccPt", kTH2D, {{axisBDTScore, axisPt}});
228-
histos.add("hXicPt", "hXicPt", kTH2D, {{axisBDTScore, axisPt}});
199+
histos.add("BDT/hBDTScore", "hBDTScore", kTH1D, {axisBDTScore});
200+
histos.add("BDT/hBDTScoreVsXiccMass", "hBDTScoreVsXiccMass", kTH2D, {axisXiccMass, axisBDTScore});
201+
histos.add("BDT/hBDTScoreVsXiccPt", "hBDTScoreVsXiccPt", kTH2D, {axisPt, axisBDTScore});
202+
histos.add("BDT/h3dBDTScore", "h3dBDTScore", kTH3D, {axisPt, axisXiccMass, axisBDTScore});
203+
histos.add("BDT/hDCAXicDaughters", "hDCAXicDaughters", kTH2D, {{axisBDTScore, axisDcaDaughters}});
204+
histos.add("BDT/hDCAXiccDaughters", "hDCAXiccDaughters", kTH2D, {{axisBDTScore, axisDcaDaughters}});
205+
histos.add("BDT/hDCAxyXi", "hDCAxyXi", kTH2D, {{axisBDTScore, axisDCA}});
206+
histos.add("BDT/hDCAzXi", "hDCAzXi", kTH2D, {{axisBDTScore, axisDCA}});
207+
histos.add("BDT/hDCAxyXic", "hDCAxyXic", kTH2D, {{axisBDTScore, axisDCA}});
208+
histos.add("BDT/hDCAzXic", "hDCAzXic", kTH2D, {{axisBDTScore, axisDCA}});
209+
histos.add("BDT/hDCAxyXicc", "hDCAxyXicc", kTH2D, {{axisBDTScore, axisDCA}});
210+
histos.add("BDT/hDCAzXicc", "hDCAzXicc", kTH2D, {{axisBDTScore, axisDCA}});
211+
histos.add("BDT/hDecayRadiusXic", "hDecayRadiusXic", kTH2D, {{axisBDTScore, axisRadius}});
212+
histos.add("BDT/hDecayRadiusXicc", "hDecayRadiusXicc", kTH2D, {{axisBDTScore, axisRadius}});
213+
histos.add("BDT/hDecayDistanceFromPVXic", "hDecayDistanceFromPVXic", kTH2D, {{axisBDTScore, axisDecayLength}});
214+
histos.add("BDT/hProperLengthXic", "hProperLengthXic", kTH2D, {{axisBDTScore, axisDecayLength}});
215+
histos.add("BDT/hProperLengthXicc", "hProperLengthXicc", kTH2D, {{axisBDTScore, axisDecayLength}});
216+
histos.add("BDT/hPi1cDCAxy", "hPi1cDCAxy", kTH2D, {{axisBDTScore, axisDCA}});
217+
histos.add("BDT/hPi1cDCAz", "hPi1cDCAz", kTH2D, {{axisBDTScore, axisDCA}});
218+
histos.add("BDT/hPi2cDCAxy", "hPi2cDCAxy", kTH2D, {{axisBDTScore, axisDCA}});
219+
histos.add("BDT/hPi2cDCAz", "hPi2cDCAz", kTH2D, {{axisBDTScore, axisDCA}});
220+
histos.add("BDT/hPiccDCAxy", "hPiccDCAxy", kTH2D, {{axisBDTScore, axisDCA}});
221+
histos.add("BDT/hPiccDCAz", "hPiccDCAz", kTH2D, {{axisBDTScore, axisDCA}});
222+
histos.add("BDT/hPi1cPt", "hPi1cPt", kTH2D, {{axisBDTScore, axisPt}});
223+
histos.add("BDT/hPi2cPt", "hPi2cPt", kTH2D, {{axisBDTScore, axisPt}});
224+
histos.add("BDT/hPiccPt", "hPiccPt", kTH2D, {{axisBDTScore, axisPt}});
229225
}
230226
}
231227

@@ -260,37 +256,33 @@ struct Alice3Multicharm {
260256
float* probabilityMCharm = bdtMCharm.evalModel(inputFeatures);
261257
float bdtScore = probabilityMCharm[1];
262258

263-
histos.fill(HIST("hBDTScore"), bdtScore);
264-
histos.fill(HIST("hBDTScoreVsXiccMass"), xiccCand.xiccMass(), bdtScore);
265-
histos.fill(HIST("hBDTScoreVsXiccPt"), xiccCand.xiccPt(), bdtScore);
266-
histos.fill(HIST("h3dBDTScore"), xiccCand.xiccPt(), xiccCand.xiccMass(), bdtScore);
267-
histos.fill(HIST("hDCAXicDaughters"), xiccCand.xiccPt(), bdtScore);
268-
histos.fill(HIST("hDCAXiccDaughters"), xiccCand.xiccPt(), bdtScore);
269-
histos.fill(HIST("hDCAxyXi"), xiccCand.xiccPt(), bdtScore);
270-
histos.fill(HIST("hDCAzXi"), xiccCand.xiccPt(), bdtScore);
271-
histos.fill(HIST("hDCAxyXic"), xiccCand.xiccPt(), bdtScore);
272-
histos.fill(HIST("hDCAzXic"), xiccCand.xiccPt(), bdtScore);
273-
histos.fill(HIST("hDCAxyXicc"), xiccCand.xiccPt(), bdtScore);
274-
histos.fill(HIST("hDCAzXicc"), xiccCand.xiccPt(), bdtScore);
275-
histos.fill(HIST("hDecayRadiusXic"), xiccCand.xiccPt(), bdtScore);
276-
histos.fill(HIST("hDecayRadiusXicc"), xiccCand.xiccPt(), bdtScore);
277-
histos.fill(HIST("hDecayDistanceFromPVXic"), xiccCand.xiccPt(), bdtScore);
278-
histos.fill(HIST("hProperLengthXic"), xiccCand.xiccPt(), bdtScore);
279-
histos.fill(HIST("hProperLengthXicc"), xiccCand.xiccPt(), bdtScore);
280-
histos.fill(HIST("hPi1cDCAxy"), xiccCand.xiccPt(), bdtScore);
281-
histos.fill(HIST("hPi1cDCAz"), xiccCand.xiccPt(), bdtScore);
282-
histos.fill(HIST("hPi2cDCAxy"), xiccCand.xiccPt(), bdtScore);
283-
histos.fill(HIST("hPi2cDCAz"), xiccCand.xiccPt(), bdtScore);
284-
histos.fill(HIST("hPiccDCAxy"), xiccCand.xiccPt(), bdtScore);
285-
histos.fill(HIST("hPiccDCAz"), xiccCand.xiccPt(), bdtScore);
286-
histos.fill(HIST("hPi1cPt"), xiccCand.xiccPt(), bdtScore);
287-
histos.fill(HIST("hPi2cPt"), xiccCand.xiccPt(), bdtScore);
288-
histos.fill(HIST("hPiccPt"), xiccCand.xiccPt(), bdtScore);
289-
histos.fill(HIST("hXiccMass"), xiccCand.xiccPt(), bdtScore);
290-
histos.fill(HIST("hXicMass"), xiccCand.xiccPt(), bdtScore);
291-
histos.fill(HIST("hXicPt"), xiccCand.xiccPt(), bdtScore);
292-
histos.fill(HIST("hXiccPt"), xiccCand.xiccPt(), bdtScore);
293-
histos.fill(HIST("h3dXicc"), xiccCand.xiccPt(), bdtScore);
259+
histos.fill(HIST("BDT/hBDTScore"), bdtScore);
260+
histos.fill(HIST("BDT/hBDTScoreVsXiccMass"), xiccCand.xiccMass(), bdtScore);
261+
histos.fill(HIST("BDT/hBDTScoreVsXiccPt"), xiccCand.xiccPt(), bdtScore);
262+
histos.fill(HIST("BDT/h3dBDTScore"), xiccCand.xiccPt(), xiccCand.xiccMass(), bdtScore);
263+
264+
histos.fill(HIST("BDT/hDCAXicDaughters"), bdtScore, xiccCand.xicDauDCA() * 1e+4);
265+
histos.fill(HIST("BDT/hDCAXiccDaughters"), bdtScore, xiccCand.xiccDauDCA() * 1e+4);
266+
histos.fill(HIST("BDT/hDCAxyXi"), bdtScore, std::fabs(xiccCand.xiDCAxy() * 1e+4));
267+
histos.fill(HIST("BDT/hDCAzXi"), bdtScore, std::fabs(xiccCand.xiDCAz() * 1e+4));
268+
histos.fill(HIST("BDT/hDCAxyXic"), bdtScore, std::fabs(xiccCand.xicDCAxy() * 1e+4));
269+
histos.fill(HIST("BDT/hDCAzXic"), bdtScore, std::fabs(xiccCand.xicDCAz() * 1e+4));
270+
histos.fill(HIST("BDT/hDCAxyXicc"), bdtScore, std::fabs(xiccCand.xiccDCAxy() * 1e+4));
271+
histos.fill(HIST("BDT/hDCAzXicc"), bdtScore, std::fabs(xiccCand.xiccDCAz() * 1e+4));
272+
histos.fill(HIST("BDT/hDecayRadiusXic"), bdtScore, xiccCand.xicDecayRadius2D() * 1e+4);
273+
histos.fill(HIST("BDT/hDecayRadiusXicc"), bdtScore, xiccCand.xiccDecayRadius2D() * 1e+4);
274+
histos.fill(HIST("BDT/hDecayDistanceFromPVXic"), bdtScore, xiccCand.xicDistanceFromPV() * 1e+4);
275+
histos.fill(HIST("BDT/hProperLengthXic"), bdtScore, xiccCand.xicProperLength() * 1e+4);
276+
histos.fill(HIST("BDT/hProperLengthXicc"), bdtScore, xiccCand.xiccProperLength() * 1e+4);
277+
histos.fill(HIST("BDT/hPi1cDCAxy"), bdtScore, xiccCand.pi1cDCAxy() * 1e+4);
278+
histos.fill(HIST("BDT/hPi1cDCAz"), bdtScore, xiccCand.pi1cDCAz() * 1e+4);
279+
histos.fill(HIST("BDT/hPi2cDCAxy"), bdtScore, xiccCand.pi2cDCAxy() * 1e+4);
280+
histos.fill(HIST("BDT/hPi2cDCAz"), bdtScore, xiccCand.pi2cDCAz() * 1e+4);
281+
histos.fill(HIST("BDT/hPiccDCAxy"), bdtScore, xiccCand.piccDCAxy() * 1e+4);
282+
histos.fill(HIST("BDT/hPiccDCAz"), bdtScore, xiccCand.piccDCAz() * 1e+4);
283+
histos.fill(HIST("BDT/hPi1cPt"), bdtScore, xiccCand.pi1cPt());
284+
histos.fill(HIST("BDT/hPi2cPt"), bdtScore, xiccCand.pi2cPt());
285+
histos.fill(HIST("BDT/hPiccPt"), bdtScore, xiccCand.piccPt());
294286
}
295287

296288
histos.fill(HIST("hMCharmBuilding"), 0);

0 commit comments

Comments
 (0)