Skip to content

Commit 42107a6

Browse files
sandor-lokossandor-lokos
committed
Executed clang-format on all modified/created files
1 parent 9c93277 commit 42107a6

8 files changed

Lines changed: 926 additions & 1069 deletions

File tree

‎PWGUD/Core/CMakeLists.txt‎

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,74 @@
1-
# Copyright 2019-2020 CERN and copyright holders of ALICE O2.
2-
# See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
3-
# All rights not expressly granted are reserved.
1+
#Copyright 2019 - 2020 CERN and copyright holders of ALICE O2.
2+
#See https: // alice-o2.web.cern.ch/copyright for details of the copyright holders.
3+
#All rights not expressly granted are reserved.
44
#
5-
# This software is distributed under the terms of the GNU General Public
6-
# License v3 (GPL Version 3), copied verbatim in the file "COPYING".
5+
#This software is distributed under the terms of the GNU General Public
6+
#License v3(GPL Version 3), copied verbatim in the file "COPYING".
77
#
8-
# In applying this license CERN does not waive the privileges and immunities
9-
# granted to it by virtue of its status as an Intergovernmental Organization
8+
#In applying this license CERN does not waive the privileges and immunities
9+
#granted to it by virtue of its status as an Intergovernmental Organization
1010
# or submit itself to any jurisdiction.
1111

1212
o2physics_add_library(UDGoodRunSelector
13-
SOURCES UDGoodRunSelector.cxx
14-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore ROOT::EG RapidJSON::RapidJSON)
13+
SOURCES UDGoodRunSelector.cxx
14+
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore ROOT::EG RapidJSON::RapidJSON)
1515

16-
o2physics_target_root_dictionary(UDGoodRunSelector
17-
HEADERS UDGoodRunSelector.h
18-
LINKDEF UDGoodRunSelectorLinkDef.h)
16+
o2physics_target_root_dictionary(UDGoodRunSelector
17+
HEADERS UDGoodRunSelector.h
18+
LINKDEF UDGoodRunSelectorLinkDef.h)
1919

20-
o2physics_add_library(UDFSParser
21-
SOURCES UDFSParser.cxx
22-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore)
20+
o2physics_add_library(UDFSParser
21+
SOURCES UDFSParser.cxx
22+
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore)
2323

24-
o2physics_target_root_dictionary(UDFSParser
25-
HEADERS UDFSParser.h
26-
LINKDEF UDFSParserLinkDef.h)
24+
o2physics_target_root_dictionary(UDFSParser
25+
HEADERS UDFSParser.h
26+
LINKDEF UDFSParserLinkDef.h)
2727

28-
o2physics_add_library(DGCutparHolder
29-
SOURCES DGCutparHolder.cxx
30-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore)
28+
o2physics_add_library(DGCutparHolder
29+
SOURCES DGCutparHolder.cxx
30+
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore)
3131

32-
o2physics_target_root_dictionary(DGCutparHolder
33-
HEADERS DGCutparHolder.h
34-
LINKDEF DGCutparHolderLinkDef.h)
32+
o2physics_target_root_dictionary(DGCutparHolder
33+
HEADERS DGCutparHolder.h
34+
LINKDEF DGCutparHolderLinkDef.h)
3535

36-
o2physics_add_library(SGCutParHolder
37-
SOURCES SGCutParHolder.cxx
38-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore)
36+
o2physics_add_library(SGCutParHolder
37+
SOURCES SGCutParHolder.cxx
38+
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore)
3939

40-
o2physics_target_root_dictionary(SGCutParHolder
41-
HEADERS SGCutParHolder.h
42-
LINKDEF SGCutParHolderLinkDef.h)
40+
o2physics_target_root_dictionary(SGCutParHolder
41+
HEADERS SGCutParHolder.h
42+
LINKDEF SGCutParHolderLinkDef.h)
4343

44-
o2physics_add_library(DGPIDSelector
45-
SOURCES DGPIDSelector.cxx
46-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore ROOT::EG)
44+
o2physics_add_library(DGPIDSelector
45+
SOURCES DGPIDSelector.cxx
46+
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore ROOT::EG)
4747

48-
o2physics_target_root_dictionary(DGPIDSelector
49-
HEADERS DGPIDSelector.h
50-
LINKDEF DGPIDSelectorLinkDef.h)
48+
o2physics_target_root_dictionary(DGPIDSelector
49+
HEADERS DGPIDSelector.h
50+
LINKDEF DGPIDSelectorLinkDef.h)
5151

52-
o2physics_add_library(UPCCutparHolder
53-
SOURCES UPCCutparHolder.cxx
54-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore)
52+
o2physics_add_library(UPCCutparHolder
53+
SOURCES UPCCutparHolder.cxx
54+
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore)
5555

56-
o2physics_target_root_dictionary(UPCCutparHolder
57-
HEADERS UPCCutparHolder.h
58-
LINKDEF UPCCutparHolderLinkDef.h)
56+
o2physics_target_root_dictionary(UPCCutparHolder
57+
HEADERS UPCCutparHolder.h
58+
LINKDEF UPCCutparHolderLinkDef.h)
5959

60-
o2physics_add_library(decayTree
61-
SOURCES decayTree.cxx
62-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore ROOT::EG RapidJSON::RapidJSON)
60+
o2physics_add_library(decayTree
61+
SOURCES decayTree.cxx
62+
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore ROOT::EG RapidJSON::RapidJSON)
6363

64-
o2physics_target_root_dictionary(decayTree
65-
HEADERS decayTree.h
66-
LINKDEF decayTreeLinkDef.h)
64+
o2physics_target_root_dictionary(decayTree
65+
HEADERS decayTree.h
66+
LINKDEF decayTreeLinkDef.h)
6767

68-
o2physics_add_library(FITCutParHolder
69-
SOURCES FITCutParHolder.cxx
70-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore)
68+
o2physics_add_library(FITCutParHolder
69+
SOURCES FITCutParHolder.cxx
70+
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore)
7171

72-
o2physics_target_root_dictionary(FITCutParHolder
73-
HEADERS FITCutParHolder.h
74-
LINKDEF FITCutParHolderLinkDef.h)
72+
o2physics_target_root_dictionary(FITCutParHolder
73+
HEADERS FITCutParHolder.h
74+
LINKDEF FITCutParHolderLinkDef.h)

‎PWGUD/Core/UDHelpers.h‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -559,52 +559,52 @@ inline void buildFT0FV0Words(TFT0 const& ft0, TFV0A const& fv0a,
559559
constexpr int kFV0Offset = 208;
560560

561561
auto ampsA = ft0.amplitudeA();
562-
auto chanA = ft0.channelA();
563-
const int nA = std::min<int>(ampsA.size(), chanA.size());
562+
auto chanA = ft0.channelA();
563+
const int nA = std::min<int>(ampsA.size(), chanA.size());
564564

565-
for (int i = 0; i < nA; ++i) {
566-
const auto a = ampsA[i];
567-
const int c = chanA[i];
565+
for (int i = 0; i < nA; ++i) {
566+
const auto a = ampsA[i];
567+
const int c = chanA[i];
568568

569-
if (c < 0 || c >= 96) {
570-
continue;
571-
}
569+
if (c < 0 || c >= 96) {
570+
continue;
571+
}
572572

573-
setBit(thr1, kFT0AOffset + c, a >= thr1_FT0A);
574-
setBit(thr2, kFT0AOffset + c, a >= thr2_FT0A);
575-
}
573+
setBit(thr1, kFT0AOffset + c, a >= thr1_FT0A);
574+
setBit(thr2, kFT0AOffset + c, a >= thr2_FT0A);
575+
}
576576

577577
auto ampsC = ft0.amplitudeC();
578-
auto chanC = ft0.channelC();
579-
const int nC = std::min<int>(ampsC.size(), chanC.size());
578+
auto chanC = ft0.channelC();
579+
const int nC = std::min<int>(ampsC.size(), chanC.size());
580580

581-
for (int i = 0; i < nC; ++i) {
582-
const auto a = ampsC[i];
583-
const int c = chanC[i]; // physical FT0C channel id
581+
for (int i = 0; i < nC; ++i) {
582+
const auto a = ampsC[i];
583+
const int c = chanC[i]; // physical FT0C channel id
584+
585+
if (c < 0 || c >= 112) {
586+
continue;
587+
}
584588

585-
if (c < 0 || c >= 112) {
586-
continue;
587-
}
589+
setBit(thr1, kFT0COffset + c, a >= thr1_FT0C);
590+
setBit(thr2, kFT0COffset + c, a >= thr2_FT0C);
591+
}
588592

589-
setBit(thr1, kFT0COffset + c, a >= thr1_FT0C);
590-
setBit(thr2, kFT0COffset + c, a >= thr2_FT0C);
591-
}
592-
593593
auto ampsV = fv0a.amplitude();
594-
auto chanV = fv0a.channel();
595-
const int nV = std::min<int>(ampsV.size(), chanV.size());
594+
auto chanV = fv0a.channel();
595+
const int nV = std::min<int>(ampsV.size(), chanV.size());
596596

597-
for (int i = 0; i < nV; ++i) {
598-
const auto a = ampsV[i];
599-
const int c = chanV[i];
597+
for (int i = 0; i < nV; ++i) {
598+
const auto a = ampsV[i];
599+
const int c = chanV[i];
600600

601-
if (c < 0 || c >= 48) {
602-
continue;
603-
}
601+
if (c < 0 || c >= 48) {
602+
continue;
603+
}
604604

605-
setBit(thr1, kFV0Offset + c, a >= thr1_FV0A);
606-
setBit(thr2, kFV0Offset + c, a >= thr2_FV0A);
607-
}
605+
setBit(thr1, kFV0Offset + c, a >= thr1_FV0A);
606+
setBit(thr2, kFV0Offset + c, a >= thr2_FV0A);
607+
}
608608
}
609609

610610
// -----------------------------------------------------------------------------

‎PWGUD/DataModel/UDTables.h‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -409,8 +409,8 @@ DECLARE_SOA_TABLE(UDTracksLabels, "AOD", "UDTRACKLABEL",
409409

410410
namespace udcollfitbits
411411
{
412-
413-
DECLARE_SOA_INDEX_COLUMN(UDCollision, udCollision); /// Link to the UDCOLLISION table
412+
413+
DECLARE_SOA_INDEX_COLUMN(UDCollision, udCollision); /// Link to the UDCOLLISION table
414414

415415
DECLARE_SOA_COLUMN(Thr1W0, thr1W0, uint64_t); /// 1 MIP thresholds for FT0A ch 0 - ch 63
416416
DECLARE_SOA_COLUMN(Thr1W1, thr1W1, uint64_t); /// 1 MIP thresholds for FT0A ch 64 - ch 96 & FT0C ch 0 - ch 31
@@ -425,15 +425,15 @@ DECLARE_SOA_COLUMN(Thr2W3, thr2W3, uint64_t); /// 2 MIP thresholds for FT0C ch 9
425425

426426
DECLARE_SOA_TABLE(UDCollisionFITBits, "AOD", "UDCOLLFITBITS",
427427
o2::soa::Index<>,
428-
udcollfitbits::UDCollisionId, /// Link to the UDCOLLISION table
429-
udcollfitbits::Thr1W0, /// 1 MIP thresholds for FT0A ch 0 - ch 63
430-
udcollfitbits::Thr1W1, /// 1 MIP thresholds for FT0A ch 63 - ch 96 & FT0C ch 0 - ch 31
431-
udcollfitbits::Thr1W2, /// 1 MIP thresholds for FT0C ch 32 - ch 96
432-
udcollfitbits::Thr1W3, /// 1 MIP thresholds for FT0C ch 97 - 112 & FV0 0 - 47
433-
udcollfitbits::Thr2W0, /// 2 MIP thresholds for FT0A ch 0 - ch 63
434-
udcollfitbits::Thr2W1, /// 2 MIP thresholds for FT0A ch 63 - ch 96 & FT0C ch 0 - ch 31
435-
udcollfitbits::Thr2W2, /// 2 MIP thresholds for FT0C ch 32 - ch 96
436-
udcollfitbits::Thr2W3 /// 2 MIP thresholds for FT0C ch 97 - 112 & FV0 0 - 47
428+
udcollfitbits::UDCollisionId, /// Link to the UDCOLLISION table
429+
udcollfitbits::Thr1W0, /// 1 MIP thresholds for FT0A ch 0 - ch 63
430+
udcollfitbits::Thr1W1, /// 1 MIP thresholds for FT0A ch 63 - ch 96 & FT0C ch 0 - ch 31
431+
udcollfitbits::Thr1W2, /// 1 MIP thresholds for FT0C ch 32 - ch 96
432+
udcollfitbits::Thr1W3, /// 1 MIP thresholds for FT0C ch 97 - 112 & FV0 0 - 47
433+
udcollfitbits::Thr2W0, /// 2 MIP thresholds for FT0A ch 0 - ch 63
434+
udcollfitbits::Thr2W1, /// 2 MIP thresholds for FT0A ch 63 - ch 96 & FT0C ch 0 - ch 31
435+
udcollfitbits::Thr2W2, /// 2 MIP thresholds for FT0C ch 32 - ch 96
436+
udcollfitbits::Thr2W3 /// 2 MIP thresholds for FT0C ch 97 - 112 & FV0 0 - 47
437437
);
438438

439439
using UDTrack = UDTracks::iterator;

‎PWGUD/TableProducer/CMakeLists.txt‎

Lines changed: 28 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,45 @@
1-
# Copyright 2019-2020 CERN and copyright holders of ALICE O2.
2-
# See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
3-
# All rights not expressly granted are reserved.
1+
#Copyright 2019 - 2020 CERN and copyright holders of ALICE O2.
2+
#See https: // alice-o2.web.cern.ch/copyright for details of the copyright holders.
3+
#All rights not expressly granted are reserved.
44
#
5-
# This software is distributed under the terms of the GNU General Public
6-
# License v3 (GPL Version 3), copied verbatim in the file "COPYING".
5+
#This software is distributed under the terms of the GNU General Public
6+
#License v3(GPL Version 3), copied verbatim in the file "COPYING".
77
#
8-
# In applying this license CERN does not waive the privileges and immunities
9-
# granted to it by virtue of its status as an Intergovernmental Organization
8+
#In applying this license CERN does not waive the privileges and immunities
9+
#granted to it by virtue of its status as an Intergovernmental Organization
1010
# or submit itself to any jurisdiction.
1111

1212
add_subdirectory(Converters)
1313

14-
o2physics_add_dpl_workflow(dg-cand-producer
15-
SOURCES dgCandProducer.cxx
16-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::DGCutparHolder O2Physics::AnalysisCCDB O2Physics::EventFilteringUtils
17-
COMPONENT_NAME Analysis)
14+
o2physics_add_dpl_workflow(dg - cand - producer SOURCES dgCandProducer.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::DGCutparHolder O2Physics::AnalysisCCDB O2Physics::EventFilteringUtils COMPONENT_NAME Analysis)
1815

19-
o2physics_add_dpl_workflow(sgcand-producer
20-
SOURCES SGCandProducer.cxx
21-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::SGCutParHolder O2Physics::AnalysisCCDB O2Physics::FITCutParHolder
22-
COMPONENT_NAME Analysis)
16+
o2physics_add_dpl_workflow(sgcand - producer
17+
SOURCES SGCandProducer.cxx
18+
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::SGCutParHolder O2Physics::AnalysisCCDB O2Physics::FITCutParHolder
19+
COMPONENT_NAME Analysis)
2320

24-
o2physics_add_dpl_workflow(dgbccand-producer
25-
SOURCES DGBCCandProducer.cxx
26-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::DGCutparHolder
27-
COMPONENT_NAME Analysis)
21+
o2physics_add_dpl_workflow(dgbccand - producer
22+
SOURCES DGBCCandProducer.cxx
23+
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::DGCutparHolder
24+
COMPONENT_NAME Analysis)
2825

29-
o2physics_add_dpl_workflow(upccand-producer
30-
SOURCES UPCCandidateProducer.cxx
31-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::UPCCutparHolder
32-
COMPONENT_NAME Analysis)
26+
o2physics_add_dpl_workflow(upccand - producer
27+
SOURCES UPCCandidateProducer.cxx
28+
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::UPCCutparHolder
29+
COMPONENT_NAME Analysis)
3330

34-
o2physics_add_dpl_workflow(tau-event-table-producer
35-
SOURCES tauEventTableProducer.cxx
36-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
37-
COMPONENT_NAME Analysis)
31+
o2physics_add_dpl_workflow(tau - event - table - producer SOURCES tauEventTableProducer.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore COMPONENT_NAME Analysis)
3832

39-
o2physics_add_dpl_workflow(two-tracks-event-table-producer
40-
SOURCES twoTracksEventTableProducer.cxx
41-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
42-
COMPONENT_NAME Analysis)
33+
o2physics_add_dpl_workflow(two - tracks - event - table - producer SOURCES twoTracksEventTableProducer.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore COMPONENT_NAME Analysis)
4334

44-
o2physics_add_dpl_workflow(fwd-track-propagation
45-
SOURCES fwdTrackPropagation.cxx
46-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2::GlobalTracking
47-
COMPONENT_NAME Analysis)
35+
o2physics_add_dpl_workflow(fwd - track - propagation SOURCES fwdTrackPropagation.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2::GlobalTracking COMPONENT_NAME Analysis)
4836

49-
o2physics_add_dpl_workflow(udmcparticles-to-udtracks
50-
SOURCES udMcParticles2udTracks.cxx
51-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
52-
COMPONENT_NAME Analysis)
37+
o2physics_add_dpl_workflow(udmcparticles - to - udtracks SOURCES udMcParticles2udTracks.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore COMPONENT_NAME Analysis)
5338

54-
o2physics_add_dpl_workflow(udmccollisions-to-udcollisions
55-
SOURCES udMcCollisions2udCollisions.cxx
56-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
57-
COMPONENT_NAME Analysis)
39+
o2physics_add_dpl_workflow(udmccollisions - to - udcollisions SOURCES udMcCollisions2udCollisions.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore COMPONENT_NAME Analysis)
5840

59-
o2physics_add_dpl_workflow(tau-three-prong-event-table-producer
60-
SOURCES tauThreeProngEventTableProducer.cxx
61-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
62-
COMPONENT_NAME Analysis)
41+
o2physics_add_dpl_workflow(tau - three - prong - event - table - producer SOURCES tauThreeProngEventTableProducer.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore COMPONENT_NAME Analysis)
6342

64-
o2physics_add_dpl_workflow(upc-cand-producer-muon
65-
SOURCES upcCandProducerMuon.cxx
66-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::UPCCutparHolder O2::GlobalTracking
67-
COMPONENT_NAME Analysis)
43+
o2physics_add_dpl_workflow(upc - cand - producer - muon SOURCES upcCandProducerMuon.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::UPCCutparHolder O2::GlobalTracking COMPONENT_NAME Analysis)
6844

69-
o2physics_add_dpl_workflow(upc-cand-producer-global-muon
70-
SOURCES upcCandProducerGlobalMuon.cxx
71-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::UPCCutparHolder O2::GlobalTracking
72-
COMPONENT_NAME Analysis)
45+
o2physics_add_dpl_workflow(upc - cand - producer - global - muon SOURCES upcCandProducerGlobalMuon.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::UPCCutparHolder O2::GlobalTracking COMPONENT_NAME Analysis)

‎PWGUD/TableProducer/SGCandProducer.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -342,8 +342,8 @@ struct SGCandProducer {
342342
}
343343

344344
outputFITBits(outputCollisions.lastIndex(),
345-
w1[0], w1[1], w1[2], w1[3],
346-
w2[0], w2[1], w2[2], w2[3]);
345+
w1[0], w1[1], w1[2], w1[3],
346+
w2[0], w2[1], w2[2], w2[3]);
347347

348348
if (newbc.has_zdc()) {
349349
auto zdc = newbc.zdc();

0 commit comments

Comments
 (0)