Skip to content

Commit 8868390

Browse files
authored
Merge pull request AliceO2Group#38 from alibuild/alibot-cleanup-14362
Please consider the following formatting changes to AliceO2Group#14362
2 parents 066bb38 + 0291b48 commit 8868390

File tree

4 files changed

+31
-23
lines changed

4 files changed

+31
-23
lines changed

PWGLF/Utils/collisionCuts.h

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,12 @@
2121
#ifndef PWGLF_UTILS_COLLISIONCUTS_H_
2222
#define PWGLF_UTILS_COLLISIONCUTS_H_
2323

24+
#include "PWGLF/Utils/collisionCutsGroup.h"
25+
2426
#include "Common/DataModel/EventSelection.h"
2527

2628
#include "Framework/HistogramRegistry.h"
2729
#include "Framework/Logger.h"
28-
#include "PWGLF/Utils/collisionCutsGroup.h"
2930

3031
#include <map>
3132
#include <string>
@@ -491,17 +492,17 @@ class CollisonCuts
491492
private:
492493
/// Metadata structure for event selections
493494
struct SelectionMetadata {
494-
int evselFlag; ///< o2::aod::evsel::EventSelectionFlags value
495-
const char* label; ///< Histogram label
496-
const char* debugMessage; ///< Debug message for LOGF
497-
int histogramBin; ///< Position in EvtSel enum (for histogram bin)
495+
int evselFlag; ///< o2::aod::evsel::EventSelectionFlags value
496+
const char* label; ///< Histogram label
497+
const char* debugMessage; ///< Debug message for LOGF
498+
int histogramBin; ///< Position in EvtSel enum (for histogram bin)
498499
};
499500

500501
/// Central registry mapping EvtSel enum to metadata (auto-generated from EventSelectionFlagsMapping.def)
501502
inline static const std::map<int, SelectionMetadata> sSelectionRegistry = {
502-
// AUTO-GENERATED from EventSelectionFlagsMapping.def
503+
// AUTO-GENERATED from EventSelectionFlagsMapping.def
503504
#define EVSEL_FLAG(enumVal, member, defaultVal, evtSelEnum, setter, getter, label, desc) \
504-
{EvtSel::evtSelEnum, {aod::evsel::enumVal, label, desc " selection failed", EvtSel::evtSelEnum}},
505+
{EvtSel::evtSelEnum, {aod::evsel::enumVal, label, desc " selection failed", EvtSel::evtSelEnum}},
505506
#include "PWGLF/Utils/EventSelectionFlagsMapping.def"
506507
#undef EVSEL_FLAG
507508
};

PWGLF/Utils/collisionCutsGroup.cxx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
/// o2-linter: disable=name/workflow-file (Library implementation file, not a workflow)
2020

2121
#include "PWGLF/Utils/collisionCutsGroup.h"
22+
2223
#include "PWGLF/Utils/collisionCuts.h"
24+
2325
#include "Framework/Logger.h"
2426

2527
CollisionCutsGroup::CollisionCutsGroup()
@@ -28,9 +30,9 @@ CollisionCutsGroup::CollisionCutsGroup()
2830
occupancyInTimeRangeMin{-1},
2931
checkTrigger{false},
3032
checkOffline{true},
31-
// AUTO-GENERATED member initialization from EventSelectionFlagsMapping.def
33+
// AUTO-GENERATED member initialization from EventSelectionFlagsMapping.def
3234
#define EVSEL_FLAG(enumVal, member, defaultVal, evtSelEnum, setter, getter, label, desc) \
33-
member{defaultVal},
35+
member{defaultVal},
3436
#include "EventSelectionFlagsMapping.def"
3537
#undef EVSEL_FLAG
3638
// Manual Run2 flag initialization

PWGLF/Utils/collisionCutsGroup.h

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,12 @@
2929
#ifndef PWGLF_UTILS_COLLISIONCUTSGROUP_H_
3030
#define PWGLF_UTILS_COLLISIONCUTSGROUP_H_
3131

32-
#include <iosfwd>
33-
#include <Rtypes.h>
3432
#include "Common/CCDB/EventSelectionParams.h"
3533

34+
#include <Rtypes.h>
35+
36+
#include <iosfwd>
37+
3638
// Forward declaration to avoid circular dependency
3739
namespace o2::analysis
3840
{
@@ -84,24 +86,24 @@ class CollisionCutsGroup
8486

8587
private:
8688
// ===== Basic collision parameters =====
87-
float zvtxMax; ///< Maximum z-vertex position (cm)
88-
int occupancyInTimeRangeMax; ///< Maximum track occupancy (-1 = no cut)
89-
int occupancyInTimeRangeMin; ///< Minimum track occupancy (-1 = no cut)
89+
float zvtxMax; ///< Maximum z-vertex position (cm)
90+
int occupancyInTimeRangeMax; ///< Maximum track occupancy (-1 = no cut)
91+
int occupancyInTimeRangeMin; ///< Minimum track occupancy (-1 = no cut)
9092

9193
// ===== General event selection flags =====
92-
bool checkTrigger; ///< Check for trigger
93-
bool checkOffline; ///< Check for offline selection
94+
bool checkTrigger; ///< Check for trigger
95+
bool checkOffline; ///< Check for offline selection
9496

9597
// ===== AUTO-GENERATED event selection flag members =====
9698
// Generated from EventSelectionFlagsMapping.def
9799
#define EVSEL_FLAG(enumVal, member, defaultVal, evtSelEnum, setter, getter, label, desc) \
98-
bool member; ///< desc
100+
bool member; ///< desc
99101
#include "EventSelectionFlagsMapping.def"
100102
#undef EVSEL_FLAG
101103

102104
// ===== Run2-specific selections (not in EventSelectionFlags) =====
103-
bool applyRun2AliEventCuts; ///< Run2 AliEventCuts
104-
bool applyRun2INELgtZERO; ///< Run2 INEL>0 selection
105+
bool applyRun2AliEventCuts; ///< Run2 AliEventCuts
106+
bool applyRun2INELgtZERO; ///< Run2 INEL>0 selection
105107

106108
ClassDefNV(CollisionCutsGroup, 2);
107109
};

Tutorials/PWGLF/Utils/collisionCuts.cxx

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,16 @@
1414
/// \author Bong-Hwi Lim <[email protected]>
1515
/// \since 30/12/2024
1616

17-
#include "Framework/runDataProcessing.h"
18-
#include "Framework/AnalysisTask.h"
19-
#include "Common/DataModel/Centrality.h"
20-
#include "Common/DataModel/EventSelection.h"
2117
#include "PWGLF/Utils/collisionCuts.h"
18+
2219
#include "PWGLF/Utils/collisionCutsGroup.h"
2320

21+
#include "Common/DataModel/Centrality.h"
22+
#include "Common/DataModel/EventSelection.h"
23+
24+
#include "Framework/AnalysisTask.h"
25+
#include "Framework/runDataProcessing.h"
26+
2427
using namespace o2;
2528
using namespace o2::framework;
2629
using namespace o2::framework::expressions;

0 commit comments

Comments
 (0)