Skip to content

Commit 788898a

Browse files
author
Marcello Di Costanzo
committed
Implement Vit comments
1 parent 63aacd7 commit 788898a

File tree

5 files changed

+11
-31
lines changed

5 files changed

+11
-31
lines changed

ALICE3/DataModel/A3DecayFinderTables.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,6 @@ DECLARE_SOA_COLUMN(ZSecondaryVertex, zSecondaryVertex, double); //!
6666
DECLARE_SOA_DYNAMIC_COLUMN(RSecondaryVertex, rSecondaryVertex, //!
6767
[](float xVtxS, float yVtxS) -> float { return RecoDecay::sqrtSumOfSquares(xVtxS, yVtxS); });
6868
DECLARE_SOA_COLUMN(Chi2PCA, chi2PCA, float); //! sum of (non-weighted) distances of the secondary vertex to its prongs
69-
// Prong index columns
70-
DECLARE_SOA_INDEX_COLUMN_FULL(Prong0, prong0, int, Tracks, "_0"); //! Index to first prong
71-
DECLARE_SOA_INDEX_COLUMN_FULL(Prong1, prong1, int, Tracks, "_1"); //! Index to second prong
72-
DECLARE_SOA_INDEX_COLUMN_FULL(Prong2, prong2, int, Tracks, "_2"); //! Index to third prong
7369
// prong properties
7470
DECLARE_SOA_COLUMN(PxProng0, pxProng0, float); //!
7571
DECLARE_SOA_COLUMN(PyProng0, pyProng0, float); //!
@@ -340,7 +336,6 @@ DECLARE_SOA_TABLE(Alice3Cand3Ps, "AOD", "ALICE3CAND3P", //!
340336
a3_hf_cand_3prong::Phi,
341337
a3_hf_cand_3prong::Pt,
342338
// prong properties
343-
a3_hf_cand::Prong0Id, a3_hf_cand::Prong1Id, a3_hf_cand::Prong2Id,
344339
a3_hf_cand::PxProng0, a3_hf_cand::PyProng0, a3_hf_cand::PzProng0, // proton track
345340
a3_hf_cand::PxProng1, a3_hf_cand::PyProng1, a3_hf_cand::PzProng1, // kaon track
346341
a3_hf_cand::PxProng2, a3_hf_cand::PyProng2, a3_hf_cand::PzProng2, // pion track
Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,11 @@
1313
/// \brief Class to compute the ML response for HF 3-prong candidates
1414
/// \author Marcello Di Costanzo <marcello.di.costanzo@cern.ch>, Polytechnic University of Turin and INFN Turin
1515

16-
#ifndef ALICE3_ML_MLRESPONSE3PRONG_H_
17-
#define ALICE3_ML_MLRESPONSE3PRONG_H_
16+
#ifndef ALICE3_ML_HFMLRESPONSE3PRONG_H_
17+
#define ALICE3_ML_HFMLRESPONSE3PRONG_H_
1818

1919
#include "Tools/ML/MlResponse.h"
2020

21-
#include <CommonConstants/PhysicsConstants.h>
22-
2321
#include <cstdint>
2422
#include <map>
2523
#include <string>
@@ -98,13 +96,13 @@ enum class InputFeatures3Prong : uint8_t {
9896
};
9997

10098
template <typename TypeOutputScore = float>
101-
class MlResponse3Prong : public MlResponse<TypeOutputScore>
99+
class HfMlResponse3Prong : public MlResponse<TypeOutputScore>
102100
{
103101
public:
104102
/// Default constructor
105-
MlResponse3Prong() = default;
103+
HfMlResponse3Prong() = default;
106104
/// Default destructor
107-
virtual ~MlResponse3Prong() = default;
105+
virtual ~HfMlResponse3Prong() = default;
108106

109107
/// Method to get the input features vector needed for ML inference
110108
/// \tparam T1 type of the 3-prong candidate
@@ -221,4 +219,4 @@ class MlResponse3Prong : public MlResponse<TypeOutputScore>
221219
#undef FILL_MAP_3PRONG
222220
#undef CHECK_AND_FILL_ML_ALICE3
223221

224-
#endif // ALICE3_ML_MLRESPONSE3PRONG_H_
222+
#endif // ALICE3_ML_HFMLRESPONSE3PRONG_H_

ALICE3/TableProducer/alice3-decayfinder.cxx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1021,7 +1021,6 @@ struct alice3decayFinder {
10211021
cand3prong.eta,
10221022
cand3prong.phi,
10231023
cand3prong.pt,
1024-
prong0.globalIndex(), prong1.globalIndex(), prong2.globalIndex(),
10251024
cand3prong.Pdaug2[0], cand3prong.Pdaug2[1], cand3prong.Pdaug2[2],
10261025
cand3prong.Pdaug1[0], cand3prong.Pdaug1[1], cand3prong.Pdaug1[2],
10271026
cand3prong.Pdaug0[0], cand3prong.Pdaug0[1], cand3prong.Pdaug0[2],

ALICE3/TableProducer/alice3HfSelector3Prong.cxx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,12 @@
2222
#include "ALICE3/DataModel/OTFRICH.h"
2323
#include "ALICE3/DataModel/OTFTOF.h"
2424
#include "ALICE3/DataModel/RICH.h"
25-
#include "ALICE3/ML/MlResponse3Prong.h"
2625
#include "ALICE3/Utils/utilsHfAlice3.h"
2726
#include "ALICE3/Utils/utilsSelectionsAlice3.h"
27+
#include "ALICE3/ML/HfMlResponse3Prong.h"
28+
29+
#include "PWGHF/Core/SelectorCuts.h"
30+
#include "PWGHF/DataModel/CandidateSelectionTables.h"
2831

2932
#include <CCDB/CcdbApi.h>
3033
#include <CommonConstants/PhysicsConstants.h>
@@ -98,7 +101,7 @@ struct Alice3HfSelector3Prong {
98101
Configurable<bool> loadModelsFromCCDB{"loadModelsFromCCDB", false, "Flag to enable or disable the loading of models from CCDB"};
99102

100103
HfHelperAlice3 hfHelper;
101-
o2::analysis::MlResponse3Prong<float> mlResponse;
104+
o2::analysis::HfMlResponse3Prong<float> mlResponse;
102105
o2::ccdb::CcdbApi ccdbApi;
103106

104107
using CandsLc = soa::Join<aod::Alice3Cand3Ps, aod::Alice3PidLcs>;

ALICE3/Utils/utilsHfAlice3.h

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,6 @@
1818
#define ALICE3_UTILS_UTILSHFALICE3_H_
1919

2020
#include "PWGHF/Core/HfHelper.h"
21-
#include "PWGHF/Utils/utilsAnalysis.h"
22-
23-
#include "Common/Core/RecoDecay.h"
24-
#include "Common/Core/TrackSelectorPID.h"
25-
26-
#include <CommonConstants/MathConstants.h>
27-
#include <CommonConstants/PhysicsConstants.h>
28-
29-
#include <Math/GenVector/Boost.h>
30-
#include <Math/Vector4D.h> // IWYU pragma: keep (do not replace with Math/Vector4Dfwd.h)
31-
#include <Math/Vector4Dfwd.h>
32-
33-
#include <array>
34-
#include <cmath>
35-
#include <vector>
3621

3722
namespace o2::analysis
3823
{

0 commit comments

Comments
 (0)