Skip to content

Commit e75ff50

Browse files
Refactor ML configuration and update includes
1 parent 4e42d3d commit e75ff50

1 file changed

Lines changed: 14 additions & 4 deletions

File tree

‎PWGHF/HFC/TableProducer/producerCharmHadronsCharmFemtoDream.cxx‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include "PWGHF/Core/CentralityEstimation.h"
1818
#include "PWGHF/Core/HfMlResponseD0ToKPi.h"
1919
#include "PWGHF/Core/HfMlResponseDstarToD0Pi.h"
20-
#include "PWGHF/DataModel/AliasTables.h"
2120
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
2221
#include "PWGHF/DataModel/CandidateSelectionTables.h"
2322
#include "PWGHF/Utils/utilsBfieldCCDB.h"
@@ -27,19 +26,30 @@
2726
#include "Common/DataModel/Centrality.h"
2827
#include "Common/DataModel/EventSelection.h"
2928
#include "Common/DataModel/Multiplicity.h"
29+
#include "Common/DataModel/TrackSelectionTables.h"
30+
#include <Tools/ML/MlResponse.h>
3031

3132
#include <CCDB/BasicCCDBManager.h>
3233
#include <CCDB/CcdbApi.h>
3334
#include <CommonConstants/PhysicsConstants.h>
3435
#include <DetectorsBase/Propagator.h>
36+
#include <Framework/ASoA.h>
37+
#include <Framework/AnalysisDataModel.h>
38+
#include <Framework/AnalysisHelpers.h>
3539
#include <Framework/AnalysisTask.h>
40+
#include <Framework/Array2D.h>
41+
#include <Framework/Configurable.h>
3642
#include <Framework/Expressions.h>
3743
#include <Framework/HistogramRegistry.h>
44+
#include <Framework/HistogramSpec.h>
45+
#include <Framework/InitContext.h>
46+
#include <Framework/OutputObjHeader.h>
3847
#include <Framework/runDataProcessing.h>
3948

4049
#include <algorithm>
4150
#include <array>
4251
#include <cmath>
52+
#include <cstdint>
4353
#include <string>
4454
#include <vector>
4555

@@ -56,10 +66,10 @@ struct HfProducerCharmHadronsCharmFemtoDream {
5666
// Each species needs its own model, feature order and pT-dependent cuts.
5767
struct MlConfig : ConfigurableGroup {
5868
std::string prefix;
59-
static constexpr double DefaultCuts[3] = {1., 0., 0.};
69+
static inline const std::array<double, 3> DefaultCuts{1., 0., 0.};
6070
Configurable<int> applyMlMode{"applyMlMode", FillMlFromSelector, "0: no ML, 1: selector scores, 2: new BDT after selector"};
6171
Configurable<std::vector<double>> binsPtMl{"binsPtMl", std::vector<double>{0., 36.}, "pT bin limits for new BDT"};
62-
Configurable<LabeledArray<double>> cutsMl{"cutsMl", {DefaultCuts, 1, 3}, "New BDT cuts per pT bin: background, prompt, nonprompt"};
72+
Configurable<LabeledArray<double>> cutsMl{"cutsMl", {DefaultCuts.data(), 1, 3}, "New BDT cuts per pT bin: background, prompt, nonprompt"};
6373
Configurable<std::vector<int>> cutDirMl{"cutDirMl", std::vector<int>{0, 1, 1}, "Reject scores above (0), below (1), or do not cut (2)"};
6474
Configurable<int> nClassesMl{"nClassesMl", 3, "Three output classes: background, prompt, nonprompt"};
6575
Configurable<std::vector<std::string>> namesInputFeatures{"namesInputFeatures", std::vector<std::string>{}, "Ordered input feature names for new BDT"};
@@ -81,7 +91,7 @@ struct HfProducerCharmHadronsCharmFemtoDream {
8191
Configurable<int> selectionFlagD0{"selectionFlagD0", 1, "Minimum D0 selector decision"};
8292
Configurable<std::string> ccdbUrl{"ccdbUrl", "http://alice-ccdb.cern.ch", "CCDB URL"};
8393
Configurable<std::string> ccdbPathGrpMag{"ccdbPathGrpMag", "GLO/Config/GRPMagField", "Run 3 magnetic field"};
84-
Service<o2::ccdb::BasicCCDBManager> ccdb;
94+
Service<o2::ccdb::BasicCCDBManager> ccdb{};
8595
o2::hf_evsel::HfEventSelection hfEvSel;
8696
OutputObj<ZorroSummary> zorroSummary{"zorroSummary"};
8797
HistogramRegistry registry{"QA", {}, OutputObjHandlingPolicy::AnalysisObject};

0 commit comments

Comments
 (0)