Skip to content

Commit 96c2504

Browse files
authored
Please consider the following formatting changes (#434)
1 parent 1307de8 commit 96c2504

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

Common/Tools/EventSelectionTools.h

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#define bitcheck64(var, nbit) ((var) & (static_cast<uint64_t>(1) << (nbit)))
2121

2222
#include "MetadataHelper.h"
23+
#include "TableHelper.h"
2324

2425
#include "Common/CCDB/EventSelectionParams.h"
2526
#include "Common/CCDB/TriggerAliases.h"
@@ -39,7 +40,6 @@
3940
#include "Framework/HistogramRegistry.h"
4041
#include "ITSMFTBase/DPLAlpideParam.h"
4142
#include "ITSMFTReconstruction/ChipMappingITS.h"
42-
#include "TableHelper.h"
4343

4444
#include <array>
4545
#include <cmath>
@@ -90,7 +90,7 @@ struct bcselConfigurables : o2::framework::ConfigurableGroup {
9090
struct evselConfigurables : o2::framework::ConfigurableGroup {
9191
std::string prefix = "evselOpts";
9292
bool isMC_metadata = false;
93-
o2::framework::Configurable<int> amIneeded{"amIneeded", -1, "run event selection or not. -1: automatic; 0: no; 1: yes"}; // o2-linter: disable=name/configurable (temporary fix)
93+
o2::framework::Configurable<int> amIneeded{"amIneeded", -1, "run event selection or not. -1: automatic; 0: no; 1: yes"}; // o2-linter: disable=name/configurable (temporary fix)
9494
o2::framework::Configurable<int> muonSelection{"muonSelection", 0, "0 - barrel, 1 - muon selection with pileup cuts, 2 - muon selection without pileup cuts"};
9595
o2::framework::Configurable<float> maxDiffZvtxFT0vsPV{"maxDiffZvtxFT0vsPV", 1., "maximum difference (in cm) between z-vertex from FT0 and PV"};
9696
o2::framework::Configurable<int> isMC{"isMC", -1, "-1 - autoset, 0 - data, 1 - MC"};
@@ -111,7 +111,7 @@ struct evselConfigurables : o2::framework::ConfigurableGroup {
111111
// luminosity configurables
112112
struct lumiConfigurables : o2::framework::ConfigurableGroup {
113113
std::string prefix = "lumiOpts";
114-
o2::framework::Configurable<int> amIneeded{"amIneeded", -1, "run BC selection or not. -1: automatic; 0: no; 1: yes"}; // o2-linter: disable=name/configurable (temporary fix)
114+
o2::framework::Configurable<int> amIneeded{"amIneeded", -1, "run BC selection or not. -1: automatic; 0: no; 1: yes"}; // o2-linter: disable=name/configurable (temporary fix)
115115
};
116116

117117
class BcSelectionModule
@@ -154,20 +154,20 @@ class BcSelectionModule
154154
// read in configurations from the task where it's used
155155
bcselOpts = external_bcselopts;
156156

157-
if(bcselOpts.amIneeded.value<0){
157+
if (bcselOpts.amIneeded.value < 0) {
158158
int bcSelNeeded = -1, evSelNeeded = -1;
159159
bcselOpts.amIneeded.value = 0;
160160
enableFlagIfTableRequired(context, "BcSels", bcSelNeeded);
161161
enableFlagIfTableRequired(context, "EvSels", evSelNeeded);
162-
if(bcSelNeeded==1){
162+
if (bcSelNeeded == 1) {
163163
bcselOpts.amIneeded.value = 1;
164164
LOGF(info, "BC Selection / Autodetection for aod::BcSels: subscription present, will generate.");
165165
}
166-
if(evSelNeeded==1 && bcSelNeeded==0){
166+
if (evSelNeeded == 1 && bcSelNeeded == 0) {
167167
bcselOpts.amIneeded.value = 1;
168168
LOGF(info, "BC Selection / Autodetection for aod::BcSels: not there, but EvSel needed. Will generate.");
169169
}
170-
if(bcSelNeeded == 0 && evSelNeeded == 0){
170+
if (bcSelNeeded == 0 && evSelNeeded == 0) {
171171
LOGF(info, "BC Selection / Autodetection for aod::BcSels: not required. Skipping generation.");
172172
return;
173173
}
@@ -267,8 +267,8 @@ class BcSelectionModule
267267
template <typename TCCDB, typename TBCs, typename TBcSelBuffer, typename TBcSelCursor>
268268
void processRun2(TCCDB const& ccdb, TBCs const& bcs, TBcSelBuffer& bcselbuffer, TBcSelCursor& bcsel)
269269
{
270-
if(bcselOpts.amIneeded.value == 0){
271-
bcselbuffer.clear();
270+
if (bcselOpts.amIneeded.value == 0) {
271+
bcselbuffer.clear();
272272
return;
273273
}
274274
bcselbuffer.clear();
@@ -404,8 +404,8 @@ class BcSelectionModule
404404
template <typename TCCDB, typename THistoRegistry, typename TBCs, typename TBcSelBuffer, typename TBcSelCursor>
405405
void processRun3(TCCDB const& ccdb, THistoRegistry& histos, TBCs const& bcs, TBcSelBuffer& bcselbuffer, TBcSelCursor& bcsel)
406406
{
407-
if(bcselOpts.amIneeded.value == 0){
408-
bcselbuffer.clear();
407+
if (bcselOpts.amIneeded.value == 0) {
408+
bcselbuffer.clear();
409409
return;
410410
}
411411
bcselbuffer.clear();
@@ -665,12 +665,12 @@ class EventSelectionModule
665665
// read in configurations from the task where it's used
666666
evselOpts = external_evselopts;
667667

668-
if(evselOpts.amIneeded.value<0){
668+
if (evselOpts.amIneeded.value < 0) {
669669
enableFlagIfTableRequired(context, "EvSels", evselOpts.amIneeded.value);
670-
if(evselOpts.amIneeded.value==0){
670+
if (evselOpts.amIneeded.value == 0) {
671671
LOGF(info, "Event Selection / Autodetecting for aod::EvSels: not required, won't generate.");
672672
return;
673-
}else{
673+
} else {
674674
LOGF(info, "Event Selection / Autodetecting for aod::EvSels: subscription present, will generate.");
675675
}
676676
}
@@ -724,7 +724,7 @@ class EventSelectionModule
724724
template <typename TCCDB, typename THistoRegistry, typename TCollisions, typename TTracklets, typename TSlicecache, typename TBcSelBuffer, typename TEvselCursor>
725725
void processRun2(TCCDB const& ccdb, THistoRegistry& histos, TCollisions const& collisions, TTracklets const& tracklets, TSlicecache& cache, TBcSelBuffer const& bcselbuffer, TEvselCursor& evsel)
726726
{
727-
if(evselOpts.amIneeded.value == 0){
727+
if (evselOpts.amIneeded.value == 0) {
728728
return; // dummy process
729729
}
730730
for (const auto& col : collisions) {
@@ -805,7 +805,7 @@ class EventSelectionModule
805805
template <typename TCCDB, typename THistoRegistry, typename TBCs, typename TCollisions, typename TPVTracks, typename TFT0s, typename TSlicecache, typename TBcSelBuffer, typename TEvselCursor>
806806
void processRun3(TCCDB const& ccdb, THistoRegistry& histos, TBCs const& bcs, TCollisions const& cols, TPVTracks const& pvTracks, TFT0s const& ft0s, TSlicecache& cache, TBcSelBuffer const& bcselbuffer, TEvselCursor& evsel)
807807
{
808-
if(evselOpts.amIneeded.value == 0){
808+
if (evselOpts.amIneeded.value == 0) {
809809
return; // dummy process
810810
}
811811
if (!configure(ccdb, bcs))
@@ -1302,22 +1302,22 @@ class LumiModule
13021302
template <typename TContext, typename TLumiOpts, typename THistoRegistry>
13031303
void init(TContext& context, TLumiOpts const& external_lumiopts, THistoRegistry& histos)
13041304
{
1305-
lumiOpts = external_lumiopts;
1305+
lumiOpts = external_lumiopts;
13061306

1307-
if(lumiOpts.amIneeded.value<0){
1307+
if (lumiOpts.amIneeded.value < 0) {
13081308
int bcSelNeeded = -1, evSelNeeded = -1;
13091309
lumiOpts.amIneeded.value = 0;
13101310
enableFlagIfTableRequired(context, "BcSels", bcSelNeeded);
13111311
enableFlagIfTableRequired(context, "EvSels", evSelNeeded);
1312-
if(bcSelNeeded==1){
1312+
if (bcSelNeeded == 1) {
13131313
lumiOpts.amIneeded.value = 1;
13141314
LOGF(info, "Luminosity / Autodetection for aod::BcSels: subscription present, will generate.");
13151315
}
1316-
if(evSelNeeded==1 && bcSelNeeded==0){
1316+
if (evSelNeeded == 1 && bcSelNeeded == 0) {
13171317
lumiOpts.amIneeded.value = 1;
13181318
LOGF(info, "Luminosity / Autodetection for aod::BcSels: not there, but EvSel needed. Will generate.");
13191319
}
1320-
if(bcSelNeeded == 0 && evSelNeeded == 0){
1320+
if (bcSelNeeded == 0 && evSelNeeded == 0) {
13211321
LOGF(info, "Luminosity / Autodetection for aod::BcSels: not required. Skipping generation.");
13221322
return;
13231323
}
@@ -1514,7 +1514,7 @@ class LumiModule
15141514
template <typename TCCDB, typename THistoRegistry, typename TBCs, typename TBcSelBuffer>
15151515
void process(TCCDB& ccdb, THistoRegistry& histos, TBCs const& bcs, TBcSelBuffer const& bcselBuffer)
15161516
{
1517-
if(lumiOpts.amIneeded.value == 0){
1517+
if (lumiOpts.amIneeded.value == 0) {
15181518
return;
15191519
}
15201520

0 commit comments

Comments
 (0)