Skip to content

Commit 7fa4f5c

Browse files
author
Marcello Di Costanzo
committed
Update names
1 parent f4fade1 commit 7fa4f5c

File tree

8 files changed

+17
-31
lines changed

8 files changed

+17
-31
lines changed

‎ALICE3/DataModel/A3DecayFinderTables.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(Y, y,
331331
DECLARE_SOA_TABLE(Alice3Cand3Ps, "AOD", "ALICE3CAND3P", //!
332332
o2::soa::Index<>,
333333
// general candidate properties
334-
HFCAND_COLUMNS,
334+
HFCAND_COLUMNS,
335335
HFPRONG0_COLUMNS,
336336
HFPRONG1_COLUMNS,
337337
HFPRONG2_COLUMNS,

‎ALICE3/ML/MlResponse3Prong.h‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,8 @@
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_MLRESPONSE3PRONG_H_
17-
#define ALICE3_MLRESPONSE3PRONG_H_
18-
19-
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
16+
#ifndef ALICE3_ML_MLRESPONSE3PRONG_H_
17+
#define ALICE3_ML_MLRESPONSE3PRONG_H_
2018

2119
#include "Tools/ML/MlResponse.h"
2220

@@ -223,4 +221,4 @@ class MlResponse3Prong : public MlResponse<TypeOutputScore>
223221
#undef FILL_MAP_3PRONG
224222
#undef CHECK_AND_FILL_ML_ALICE3
225223

226-
#endif // ALICE3_MLRESPONSE3PRONG_H_
224+
#endif // ALICE3_ML_MLRESPONSE3PRONG_H_

‎ALICE3/TableProducer/hfSelector3Prong.cxx‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,8 @@
2424
#include "ALICE3/ML/MlResponse3Prong.h"
2525

2626
#include "PWGHF/Core/SelectorCuts.h"
27-
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
2827
#include "PWGHF/DataModel/CandidateSelectionTables.h"
2928

30-
#include "Common/Core/TrackSelectorPID.h"
31-
#include "Common/DataModel/PIDResponseCombined.h"
32-
3329
#include <CCDB/CcdbApi.h>
3430
#include <CommonConstants/PhysicsConstants.h>
3531
#include <Framework/ASoA.h>

‎ALICE3/TableProducer/hfTreeCreator3Prong.cxx‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515
///
1616
/// \author Marcello Di Costanzo <marcello.di.costanzo@cern.ch>, Turin Polytechnic University and INFN Turin
1717

18-
#include "PWGHF/Core/DecayChannels.h"
19-
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
20-
#include "PWGHF/DataModel/CandidateSelectionTables.h"
21-
2218
#include "ALICE3/DataModel/A3DecayFinderTables.h"
2319
#include "ALICE3/DataModel/OTFPIDTrk.h"
2420
#include "ALICE3/DataModel/OTFRICH.h"

‎ALICE3/Tasks/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ o2physics_add_dpl_workflow(alice3-multicharm
6565
COMPONENT_NAME Analysis)
6666

6767
o2physics_add_dpl_workflow(alice3-hf-task-3prong
68-
SOURCES alice3HfTask3Prong.cxx
68+
SOURCES hfTask3Prong.cxx
6969
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::SGCutParHolder O2Physics::MLCore
7070
COMPONENT_NAME Analysis)
7171

ALICE3/Tasks/alice3HfTask3Prong.cxx renamed to ALICE3/Tasks/hfTask3Prong.cxx

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,10 @@
99
// granted to it by virtue of its status as an Intergovernmental Organization
1010
// or submit itself to any jurisdiction.
1111

12-
/// \file alice3HfTask3Prong.cxx
12+
/// \file hfTask3Prong.cxx
1313
/// \brief 3-prong candidates analysis task for ALICE 3 simulation studies
1414
/// \author Marcello Di Costanzo <marcello.di.costanzo@cern.ch>, Polytechnic University of Turin and INFN Turin
1515

16-
#include "PWGHF/Core/DecayChannels.h"
17-
#include "PWGHF/DataModel/CandidateSelectionTables.h"
18-
1916
#include "ALICE3/DataModel/A3DecayFinderTables.h"
2017
#include "ALICE3/DataModel/OTFPIDTrk.h"
2118
#include "ALICE3/DataModel/OTFRICH.h"
@@ -24,7 +21,6 @@
2421
#include "ALICE3/Utils/utilsHfAlice3.h"
2522
#include "ALICE3/Utils/utilsSelectionsAlice3.h"
2623
#include "Common/Core/RecoDecay.h"
27-
#include "Common/DataModel/EventSelection.h"
2824

2925
#include <CCDB/BasicCCDBManager.h>
3026
#include <CommonConstants/PhysicsConstants.h>
@@ -57,7 +53,7 @@ using namespace o2::framework;
5753
using namespace o2::framework::expressions;
5854

5955
/// Λc± → p± K∓ π± analysis task
60-
struct Alice3Task3Prong {
56+
struct Alice3HfTask3Prong {
6157
Configurable<double> yCandGenMax{"yCandGenMax", 0.8, "max. gen particle rapidity"};
6258
Configurable<double> yCandRecoMax{"yCandRecoMax", 0.8, "max. cand. rapidity"};
6359
Configurable<std::vector<double>> binsPt{"binsPt", std::vector<double>{hf_cuts_3prongs_alice3::vecBinsPt}, "pT bin limits"};
@@ -354,18 +350,18 @@ struct Alice3Task3Prong {
354350
fillHistosMcRec<CharmHadAlice3::Lc, false>(candsLc);
355351
fillHistosMcGen<CharmHadAlice3::Lc>(candsGenLcs);
356352
}
357-
PROCESS_SWITCH(Alice3Task3Prong, processLc, "Process Lc w/o ML sels", true);
353+
PROCESS_SWITCH(Alice3HfTask3Prong, processLc, "Process Lc w/o ML sels", true);
358354

359355
void processLcWMl(Cands3PRecoWMl const& candsLcWMl,
360356
Cands3PGen const&)
361357
{
362358
fillHistosMcRec<CharmHadAlice3::Lc, true>(candsLcWMl);
363359
fillHistosMcGen<CharmHadAlice3::Lc>(candsGenLcs);
364360
}
365-
PROCESS_SWITCH(Alice3Task3Prong, processLcWMl, "Process Lc with ML sels", false);
361+
PROCESS_SWITCH(Alice3HfTask3Prong, processLcWMl, "Process Lc with ML sels", false);
366362
};
367363

368364
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
369365
{
370-
return WorkflowSpec{adaptAnalysisTask<Alice3Task3Prong>(cfgc)};
366+
return WorkflowSpec{adaptAnalysisTask<Alice3HfTask3Prong>(cfgc)};
371367
}

‎ALICE3/Utils/utilsHfAlice3.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
/// \file HfHelperAlice3.h
1313
/// \brief Class with helper functions for HF analyses
1414
///
15-
/// \author Vít Kučera <vit.kucera@cern.ch>, Inha University
15+
/// \author Marcello Di Costanzo <marcello.di.costanzo@cern.ch>, Polytechnic University of Turin and INFN Turin
1616

17-
#ifndef PWGHF_CORE_HFHELPERALICE3_H_
18-
#define PWGHF_CORE_HFHELPERALICE3_H_
17+
#ifndef ALICE3_UTILS_UTILSHFALICE3_H_
18+
#define ALICE3_UTILS_UTILSHFALICE3_H_
1919

2020
#include "PWGHF/Core/HfHelper.h"
2121
#include "PWGHF/Utils/utilsAnalysis.h"
@@ -109,4 +109,4 @@ class HfHelperAlice3
109109
}
110110
};
111111

112-
#endif // PWGHF_CORE_HFHELPERALICE3_H_
112+
#endif // ALICE3_UTILS_UTILSHFALICE3_H_

‎ALICE3/Utils/utilsSelectionsAlice3.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
///
1515
/// \author Marcello Di Costanzo <marcello.di.costanzo@cern.ch>, Polytechnic University of Turin and INFN Turin
1616

17-
#ifndef ALICE3_UTILS_SELECTIONS_H_
18-
#define ALICE3_UTILS_SELECTIONS_H_
17+
#ifndef ALICE3_UTILS_UTILSSELECTIONSALICE3_H_
18+
#define ALICE3_UTILS_UTILSSELECTIONSALICE3_H_
1919

2020
#include <string> // std::string
2121
#include <vector> // std::vector
@@ -73,4 +73,4 @@ static const std::vector<std::string> labelsCutVar = {"m", "pT prong 0", "pT pro
7373

7474
} // namespace o2::analysis
7575

76-
#endif // ALICE3_UTILS_SELECTIONS_H_
76+
#endif // ALICE3_UTILS_UTILSSELECTIONSALICE3_H_

0 commit comments

Comments
 (0)