Skip to content

Commit 35f7461

Browse files
Merge pull request #60 from alibuild/alibot-cleanup-11518
[PWGHF] Please consider the following formatting changes to #11518
2 parents a7c9421 + e3bebd4 commit 35f7461

File tree

4 files changed

+30
-29
lines changed

4 files changed

+30
-29
lines changed

PWGHF/TableProducer/candidateCreator2Prong.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -764,7 +764,7 @@ struct HfCandidateCreator2Prong {
764764
void processCollisionsUpc(soa::Join<aod::Collisions, aod::EvSels> const& collisions,
765765
aod::BcFullInfos const& bcs,
766766
aod::FT0s const& /*ft0s*/,
767-
aod::FV0As const& /*fv0as*/,
767+
aod::FV0As const& /*fv0as*/,
768768
aod::FDDs const& /*fdds*/,
769769
aod::Zdcs const& /*zdcs*/)
770770
{

PWGHF/TableProducer/candidateCreator3Prong.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ struct HfCandidateCreator3Prong {
242242
}
243243

244244
template <bool doPvRefit, bool applyUpcSel, o2::hf_centrality::CentralityEstimator centEstimator, typename Coll, typename Cand, typename BCsType>
245-
void runCreator3ProngWithDCAFitterN(Coll const&,
245+
void runCreator3ProngWithDCAFitterN(Coll const&,
246246
Cand const& rowsTrackIndexProng3,
247247
TracksWCovExtraPidPiKaPr const&,
248248
BCsType const& bcs)

PWGHF/TableProducer/trackIndexSkimCreator.cxx

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -164,51 +164,51 @@ struct HfTrackIndexSkimCreatorTagSelCollisions {
164164

165165
/// Event selection with trigger and FT0A centrality selection
166166
void processTrigAndCentFT0ASel(soa::Join<aod::Collisions,
167-
aod::EvSels, aod::CentFT0As>::iterator const& collision,
167+
aod::EvSels, aod::CentFT0As>::iterator const& collision,
168168
aod::BcFullInfos const& bcs)
169169
{
170170
selectCollision<true, false, CentralityEstimator::FT0A>(collision, bcs);
171171
}
172172
PROCESS_SWITCH(HfTrackIndexSkimCreatorTagSelCollisions, processTrigAndCentFT0ASel, "Use trigger and centrality selection with FT0A", false);
173173

174174
/// Event selection with trigger and FT0C centrality selection
175-
void processTrigAndCentFT0CSel(soa::Join<aod::Collisions,
176-
aod::EvSels, aod::CentFT0Cs>::iterator const& collision,
175+
void processTrigAndCentFT0CSel(soa::Join<aod::Collisions,
176+
aod::EvSels, aod::CentFT0Cs>::iterator const& collision,
177177
aod::BcFullInfos const& bcs)
178178
{
179179
selectCollision<true, false, CentralityEstimator::FT0C>(collision, bcs);
180180
}
181181
PROCESS_SWITCH(HfTrackIndexSkimCreatorTagSelCollisions, processTrigAndCentFT0CSel, "Use trigger and centrality selection with FT0C", false);
182182

183183
/// Event selection with trigger and FT0M centrality selection
184-
void processTrigAndCentFT0MSel(soa::Join<aod::Collisions,
185-
aod::EvSels, aod::CentFT0Ms>::iterator const& collision,
184+
void processTrigAndCentFT0MSel(soa::Join<aod::Collisions,
185+
aod::EvSels, aod::CentFT0Ms>::iterator const& collision,
186186
aod::BcFullInfos const& bcs)
187187
{
188188
selectCollision<true, false, CentralityEstimator::FT0M>(collision, bcs);
189189
}
190190
PROCESS_SWITCH(HfTrackIndexSkimCreatorTagSelCollisions, processTrigAndCentFT0MSel, "Use trigger and centrality selection with FT0M", false);
191191

192192
/// Event selection with trigger and FV0A centrality selection
193-
void processTrigAndCentFV0ASel(soa::Join<aod::Collisions,
194-
aod::EvSels, aod::CentFV0As>::iterator const& collision,
193+
void processTrigAndCentFV0ASel(soa::Join<aod::Collisions,
194+
aod::EvSels, aod::CentFV0As>::iterator const& collision,
195195
aod::BcFullInfos const& bcs)
196196
{
197197
selectCollision<true, false, CentralityEstimator::FV0A>(collision, bcs);
198198
}
199199
PROCESS_SWITCH(HfTrackIndexSkimCreatorTagSelCollisions, processTrigAndCentFV0ASel, "Use trigger and centrality selection with FV0A", false);
200200

201201
/// Event selection with trigger selection
202-
void processTrigSel(soa::Join<aod::Collisions,
203-
aod::EvSels>::iterator const& collision,
202+
void processTrigSel(soa::Join<aod::Collisions,
203+
aod::EvSels>::iterator const& collision,
204204
aod::BcFullInfos const& bcs)
205205
{
206206
selectCollision<true, false, CentralityEstimator::None>(collision, bcs);
207207
}
208208
PROCESS_SWITCH(HfTrackIndexSkimCreatorTagSelCollisions, processTrigSel, "Use trigger selection", false);
209209

210210
/// Event selection without trigger selection
211-
void processNoTrigSel(aod::Collision const& collision,
211+
void processNoTrigSel(aod::Collision const& collision,
212212
aod::BcFullInfos const& bcs)
213213
{
214214
selectCollision<false, false, CentralityEstimator::None>(collision, bcs);
@@ -217,7 +217,7 @@ struct HfTrackIndexSkimCreatorTagSelCollisions {
217217

218218
/// Event selection with UPC
219219
void processUpcSel(soa::Join<aod::Collisions,
220-
aod::EvSels>::iterator const& collision,
220+
aod::EvSels>::iterator const& collision,
221221
aod::BcFullInfos const& bcs,
222222
aod::FT0s const& /*ft0s*/,
223223
aod::FV0As const& /*fv0as*/,

PWGHF/Utils/utilsEvSelHf.h

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,31 +18,32 @@
1818
#ifndef PWGHF_UTILS_UTILSEVSELHF_H_
1919
#define PWGHF_UTILS_UTILSEVSELHF_H_
2020

21-
#include <fairlogger/Logger.h>
21+
#include "PWGHF/Core/CentralityEstimation.h"
22+
#include "PWGUD/Core/SGSelector.h"
2223

23-
#include <Rtypes.h>
24-
#include <TH1.h>
25-
#include <TH2.h>
24+
#include "Common/CCDB/EventSelectionParams.h"
25+
#include "Common/CCDB/RCTSelectionFlags.h"
26+
#include "EventFiltering/Zorro.h"
27+
#include "EventFiltering/ZorroSummary.h"
2628

2729
#include <Framework/AnalysisHelpers.h>
2830
#include <Framework/Configurable.h>
2931
#include <Framework/DeviceSpec.h>
3032
#include <Framework/HistogramRegistry.h>
3133
#include <Framework/HistogramSpec.h>
3234

33-
#include <cstdint>
35+
#include <TH1.h>
36+
#include <TH2.h>
37+
38+
#include <fairlogger/Logger.h>
39+
40+
#include <Rtypes.h>
41+
3442
#include <cstddef>
43+
#include <cstdint>
3544
#include <memory> // std::shared_ptr
3645
#include <string> // std::string
3746

38-
#include "Common/CCDB/EventSelectionParams.h"
39-
#include "Common/CCDB/RCTSelectionFlags.h"
40-
#include "EventFiltering/Zorro.h"
41-
#include "EventFiltering/ZorroSummary.h"
42-
43-
#include "PWGHF/Core/CentralityEstimation.h"
44-
#include "PWGUD/Core/SGSelector.h"
45-
4647
namespace o2::hf_occupancy
4748
{
4849
// centrality selection estimators
@@ -114,7 +115,7 @@ enum EventRejection {
114115
};
115116

116117
o2::framework::AxisSpec axisEvents = {EventRejection::NEventRejection, -0.5f, +EventRejection::NEventRejection - 0.5f, ""};
117-
o2::framework::AxisSpec axisUpcEvents = { o2::aod::sgselector::DoubleGap + 1, -0.5f, +o2::aod::sgselector::DoubleGap + 0.5f, ""};
118+
o2::framework::AxisSpec axisUpcEvents = {o2::aod::sgselector::DoubleGap + 1, -0.5f, +o2::aod::sgselector::DoubleGap + 0.5f, ""};
118119

119120
/// \brief Function to put labels on monitoring histogram
120121
/// \param hRejection monitoring histogram
@@ -228,7 +229,7 @@ struct HfEventSelection : o2::framework::ConfigurableGroup {
228229
hPosYAfterEvSel = registry.add<TH1>(NameHistPosYAfterEvSel, "selected events;#it{y}_{prim. vtx.} (cm);entries", {o2::framework::HistType::kTH1D, {{200, -0.5, 0.5}}});
229230
hNumPvContributorsAfterSel = registry.add<TH1>(NameHistNumPvContributorsAfterSel, "selected events;#it{y}_{prim. vtx.} (cm);entries", {o2::framework::HistType::kTH1D, {{500, -0.5, 499.5}}});
230231
setEventRejectionLabels(hCollisions, softwareTrigger);
231-
hUpCollisions = registry.add<TH1>(NameHistUpCollisions, "HF UPC counter;;# of UPC events", {o2::framework::HistType::kTH1D, {axisUpcEvents}});
232+
hUpCollisions = registry.add<TH1>(NameHistUpCollisions, "HF UPC counter;;# of UPC events", {o2::framework::HistType::kTH1D, {axisUpcEvents}});
232233
const o2::framework::AxisSpec th2AxisCent{th2ConfigAxisCent, "Centrality"};
233234
const o2::framework::AxisSpec th2AxisOccupancy{th2ConfigAxisOccupancy, "Occupancy"};
234235
hCollisionsCentOcc = registry.add<TH2>(NameHistCollisionsCentOcc, "selected events;Centrality; Occupancy", {o2::framework::HistType::kTH2D, {th2AxisCent, th2AxisOccupancy}});
@@ -378,7 +379,7 @@ struct HfEventSelection : o2::framework::ConfigurableGroup {
378379
if (upcEventType > o2::aod::sgselector::DoubleGap) {
379380
SETBIT(rejectionMaskWithUpc, EventRejection::UpcEventCut);
380381
} else {
381-
hUpCollisions->Fill(upcEventType);
382+
hUpCollisions->Fill(upcEventType);
382383
}
383384
}
384385

0 commit comments

Comments
 (0)