Skip to content

Commit d219424

Browse files
ariedel-cernariedel-cern
authored
[PWGCF] Update femto framework (#15579)
1 parent 1bf0789 commit d219424

Some content is hidden

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

47 files changed

+425
-348
lines changed

‎PWGCF/Femto/Core/baseSelection.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@
1818

1919
#include "PWGCF/Femto/Core/selectionContainer.h"
2020

21-
#include "Framework/HistogramRegistry.h"
21+
#include <Framework/HistogramRegistry.h>
22+
#include <Framework/HistogramSpec.h>
23+
#include <Framework/Logger.h>
2224

23-
#include "fairlogger/Logger.h"
25+
#include <TH1.h>
2426

2527
#include <climits>
2628
#include <cstddef>

‎PWGCF/Femto/Core/cascadeBuilder.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
#include "PWGCF/Femto/Core/selectionContainer.h"
2424
#include "PWGCF/Femto/DataModel/FemtoTables.h"
2525

26-
#include "CommonConstants/MathConstants.h"
27-
#include "Framework/AnalysisHelpers.h"
28-
#include "Framework/Configurable.h"
29-
30-
#include "fairlogger/Logger.h"
26+
#include <CommonConstants/MathConstants.h>
27+
#include <Framework/AnalysisHelpers.h>
28+
#include <Framework/Configurable.h>
29+
#include <Framework/HistogramRegistry.h>
30+
#include <Framework/Logger.h>
3131

3232
#include <algorithm>
3333
#include <array>

‎PWGCF/Femto/Core/cascadeHistManager.h‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,17 @@
2020
#include "PWGCF/Femto/Core/modes.h"
2121
#include "PWGCF/Femto/Core/trackHistManager.h"
2222

23-
#include "CommonConstants/MathConstants.h"
24-
#include "Framework/Configurable.h"
25-
#include "Framework/HistogramRegistry.h"
26-
#include "Framework/HistogramSpec.h"
23+
#include <CommonConstants/MathConstants.h>
24+
#include <Framework/Configurable.h>
25+
#include <Framework/HistogramRegistry.h>
26+
#include <Framework/HistogramSpec.h>
27+
#include <Framework/Logger.h>
28+
29+
#include <TH1.h>
30+
#include <TPDGCode.h>
2731

2832
#include <array>
33+
#include <cstddef>
2934
#include <map>
3035
#include <string>
3136
#include <string_view>

‎PWGCF/Femto/Core/closePairRejection.h‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,24 @@
1616
#ifndef PWGCF_FEMTO_CORE_CLOSEPAIRREJECTION_H_
1717
#define PWGCF_FEMTO_CORE_CLOSEPAIRREJECTION_H_
1818

19-
#include "RecoDecay.h"
20-
2119
#include "PWGCF/Femto/Core/histManager.h"
2220

23-
#include "Framework/Configurable.h"
24-
#include "Framework/HistogramRegistry.h"
25-
#include "Framework/HistogramSpec.h"
21+
#include <Common/Core/RecoDecay.h>
22+
23+
#include <CommonConstants/MathConstants.h>
24+
#include <Framework/Configurable.h>
25+
#include <Framework/HistogramRegistry.h>
26+
#include <Framework/HistogramSpec.h>
27+
#include <Framework/Logger.h>
2628

2729
#include <array>
2830
#include <chrono>
2931
#include <cmath>
3032
#include <cstddef>
33+
#include <cstdint>
3134
#include <map>
3235
#include <numeric>
36+
#include <optional>
3337
#include <random>
3438
#include <string>
3539
#include <vector>

‎PWGCF/Femto/Core/closeTripletRejection.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
#include "PWGCF/Femto/Core/closePairRejection.h"
2020

21-
#include "Framework/HistogramRegistry.h"
22-
#include "Framework/HistogramSpec.h"
21+
#include <Framework/HistogramRegistry.h>
22+
#include <Framework/HistogramSpec.h>
2323

2424
#include <cmath>
2525
#include <map>

‎PWGCF/Femto/Core/collisionBuilder.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
#include "PWGCF/Femto/Core/selectionContainer.h"
2424
#include "PWGCF/Femto/DataModel/FemtoTables.h"
2525

26-
#include "Common/CCDB/EventSelectionParams.h"
27-
#include "Common/CCDB/RCTSelectionFlags.h"
28-
#include "Common/Core/Zorro.h"
29-
30-
#include "DataFormatsParameters/GRPMagField.h"
31-
#include "Framework/AnalysisHelpers.h"
32-
#include "Framework/Configurable.h"
33-
34-
#include "fairlogger/Logger.h"
26+
#include <Common/CCDB/EventSelectionParams.h>
27+
#include <Common/CCDB/RCTSelectionFlags.h>
28+
#include <Common/Core/Zorro.h>
29+
30+
#include <DataFormatsParameters/GRPMagField.h>
31+
#include <Framework/AnalysisHelpers.h>
32+
#include <Framework/Configurable.h>
33+
#include <Framework/HistogramRegistry.h>
34+
#include <Framework/Logger.h>
3535

3636
#include <algorithm>
3737
#include <cmath>

‎PWGCF/Femto/Core/collisionHistManager.h‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,13 @@
1919
#include "PWGCF/Femto/Core/histManager.h"
2020
#include "PWGCF/Femto/Core/modes.h"
2121

22-
#include "Framework/Configurable.h"
23-
#include "Framework/HistogramRegistry.h"
24-
#include "Framework/HistogramSpec.h"
22+
#include <Framework/Configurable.h>
23+
#include <Framework/HistogramRegistry.h>
24+
#include <Framework/HistogramSpec.h>
2525

2626
#include <array>
27+
#include <cstddef>
28+
#include <cstdint>
2729
#include <map>
2830
#include <string>
2931
#include <string_view>

‎PWGCF/Femto/Core/femtoUtils.h‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,19 @@
1616
#ifndef PWGCF_FEMTO_CORE_FEMTOUTILS_H_
1717
#define PWGCF_FEMTO_CORE_FEMTOUTILS_H_
1818

19-
#include "Common/Core/TableHelper.h"
19+
#include <Common/Core/TableHelper.h>
2020

21-
#include "CommonConstants/MathConstants.h"
22-
#include "CommonConstants/PhysicsConstants.h"
23-
#include "Framework/InitContext.h"
21+
#include <CommonConstants/PhysicsConstants.h>
22+
#include <Framework/InitContext.h>
23+
#include <Framework/Logger.h>
2424

25-
#include "TPDGCode.h"
26-
27-
#include "fairlogger/Logger.h"
25+
#include <TPDGCode.h>
2826

2927
#include <cmath>
28+
#include <concepts>
3029
#include <cstdint>
31-
#include <experimental/type_traits>
3230
#include <optional>
3331
#include <unordered_map>
34-
#include <utility>
3532

3633
namespace o2::analysis::femto
3734
{
@@ -209,11 +206,16 @@ inline bool enableTable(const char* tableName, int userSetting, o2::framework::I
209206
return required;
210207
}
211208

212-
template <typename T>
213-
using HasMass = decltype(std::declval<T&>().mass());
209+
// template <typename T>
210+
// using HasMass = decltype(std::declval<T&>().mass());
211+
//
212+
// template <typename T>
213+
// using HasSign = decltype(std::declval<T&>().sign());
214214

215215
template <typename T>
216-
using HasSign = decltype(std::declval<T&>().sign());
216+
concept HasMass = requires(T t) {
217+
{ t.mass() } -> std::convertible_to<float>; // or double, whatever mass() returns
218+
};
217219

218220
template <typename T>
219221
inline int signum(T x)

‎PWGCF/Femto/Core/histManager.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#ifndef PWGCF_FEMTO_CORE_HISTMANAGER_H_
1717
#define PWGCF_FEMTO_CORE_HISTMANAGER_H_
1818

19-
#include "Framework/HistogramSpec.h"
19+
#include <Framework/HistogramSpec.h>
2020

2121
#include <string>
2222
#include <string_view>

‎PWGCF/Femto/Core/kinkBuilder.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
#include "PWGCF/Femto/Core/selectionContainer.h"
2525
#include "PWGCF/Femto/DataModel/FemtoTables.h"
2626

27-
#include "Common/Core/RecoDecay.h"
27+
#include <Common/Core/RecoDecay.h>
2828

29-
#include "CommonConstants/MathConstants.h"
30-
#include "Framework/AnalysisHelpers.h"
31-
#include "Framework/Configurable.h"
32-
33-
#include "fairlogger/Logger.h"
29+
#include <CommonConstants/MathConstants.h>
30+
#include <Framework/AnalysisHelpers.h>
31+
#include <Framework/Configurable.h>
32+
#include <Framework/HistogramRegistry.h>
33+
#include <Framework/Logger.h>
3434

3535
#include <algorithm>
3636
#include <array>

0 commit comments

Comments
 (0)