Skip to content

Commit 820357d

Browse files
alibuildalibuild
authored
Please consider the following formatting changes (#472)
1 parent aa74c34 commit 820357d

File tree

5 files changed

+331
-320
lines changed

5 files changed

+331
-320
lines changed

‎PWGLF/DataModel/LFStrangenessPIDTables.h‎

Lines changed: 37 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,14 @@
1515
#ifndef PWGLF_DATAMODEL_LFSTRANGENESSPIDTABLES_H_
1616
#define PWGLF_DATAMODEL_LFSTRANGENESSPIDTABLES_H_
1717

18-
#include <cmath>
19-
#include "Framework/AnalysisDataModel.h"
18+
#include "PWGLF/DataModel/LFStrangenessTables.h"
19+
2020
#include "Common/Core/RecoDecay.h"
21+
2122
#include "CommonConstants/PhysicsConstants.h"
22-
#include "PWGLF/DataModel/LFStrangenessTables.h"
23+
#include "Framework/AnalysisDataModel.h"
24+
25+
#include <cmath>
2326

2427
namespace o2::aod
2528
{
@@ -39,30 +42,34 @@ static constexpr float underflow_return = -100.0f;
3942
static constexpr float overflow_return = +100.0f;
4043

4144
// define helper function to do packing
42-
int8_t packInInt8(float nSigma){
45+
int8_t packInInt8(float nSigma)
46+
{
4347
// calculate
44-
if(nSigma<=binned_min) return underflowBin;
45-
if(nSigma>=binned_max) return overflowBin;
46-
if(nSigma>=0){
47-
return static_cast<int8_t>((nSigma/bin_width)+0.5f);
48+
if (nSigma <= binned_min)
49+
return underflowBin;
50+
if (nSigma >= binned_max)
51+
return overflowBin;
52+
if (nSigma >= 0) {
53+
return static_cast<int8_t>((nSigma / bin_width) + 0.5f);
4854
}
4955
// automatic: this is the case in which nSigma < 0
50-
return static_cast<int8_t>((nSigma/bin_width)-0.5f);
56+
return static_cast<int8_t>((nSigma / bin_width) - 0.5f);
5157
}
5258

5359
// define helper function to do unpacking
54-
float unpackInt8(int8_t nSigma){
55-
if(nSigma == underflowBin){
60+
float unpackInt8(int8_t nSigma)
61+
{
62+
if (nSigma == underflowBin) {
5663
return underflow_return;
5764
}
58-
if(nSigma == overflowBin){
65+
if (nSigma == overflowBin) {
5966
return overflow_return;
6067
}
61-
return bin_width*nSigma;
68+
return bin_width * nSigma;
6269
}
6370

64-
} // end packing namespace
65-
} // end dautrack namespace
71+
} // namespace packing
72+
} // namespace dautrack
6673

6774
namespace dautrack_legacy
6875
{
@@ -72,11 +79,12 @@ DECLARE_SOA_COLUMN(TPCNSigmaPi, tpcNSigmaPi, float); //! Nsigma proton
7279
DECLARE_SOA_COLUMN(TPCNSigmaKa, tpcNSigmaKa, float); //! Nsigma proton
7380
DECLARE_SOA_COLUMN(TPCNSigmaPr, tpcNSigmaPr, float); //! Nsigma proton
7481
DECLARE_SOA_COLUMN(TPCNSigmaHe, tpcNSigmaHe, float); //! Nsigma proton
75-
}
82+
} // namespace dautrack_legacy
7683

77-
namespace dautrack{
78-
// ==== COMPACT TPC INFORMATION (full size tables) ===
79-
DECLARE_SOA_COLUMN(TPCSignal, tpcSignal, float); //! track TPC signal
84+
namespace dautrack
85+
{
86+
// ==== COMPACT TPC INFORMATION (full size tables) ===
87+
DECLARE_SOA_COLUMN(TPCSignal, tpcSignal, float); //! track TPC signal
8088
DECLARE_SOA_COLUMN(PackedTPCNSigmaEl, packedTpcNSigmaEl, int8_t); //! Nsigma proton
8189
DECLARE_SOA_COLUMN(PackedTPCNSigmaPi, packedTpcNSigmaPi, int8_t); //! Nsigma proton
8290
DECLARE_SOA_COLUMN(PackedTPCNSigmaKa, packedTpcNSigmaKa, int8_t); //! Nsigma proton
@@ -92,7 +100,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(TPCNSigmaPr, tpcNSigmaPr, //! unpacked TPC nsigma
92100
[](int8_t nsigma_packed) -> float { return o2::aod::dautrack::packing::unpackInt8(nsigma_packed); });
93101

94102
// ==== TOF INFORMATION ===
95-
DECLARE_SOA_INDEX_COLUMN(DauTrackExtra, dauTrackExtra); //! point to daughter this TOF info belongs to
103+
DECLARE_SOA_INDEX_COLUMN(DauTrackExtra, dauTrackExtra); //! point to daughter this TOF info belongs to
96104
DECLARE_SOA_INDEX_COLUMN(StraCollision, straCollision); //! point to collision associated with this track (not the V0/Casc)
97105
DECLARE_SOA_COLUMN(TOFSignal, tofSignal, float); //! track TOF signal
98106
DECLARE_SOA_COLUMN(TOFEvTime, tofEvTime, float); //! event time
@@ -132,13 +140,13 @@ DECLARE_SOA_TABLE(DauTrackTPCPIDs_000, "AOD", "DAUTRACKTPCPID", // nsigma table
132140
dautrack_legacy::TPCNSigmaPr, dautrack_legacy::TPCNSigmaHe);
133141

134142
DECLARE_SOA_TABLE_VERSIONED(DauTrackTPCPIDs_001, "AOD", "DAUTRACKTPCPID", 1, // nsigma table (for analysis)
135-
dautrack::TPCSignal,
136-
dautrack::PackedTPCNSigmaEl, dautrack::PackedTPCNSigmaPi,
137-
dautrack::PackedTPCNSigmaKa, dautrack::PackedTPCNSigmaPr,
138-
dautrack::TPCNSigmaEl<dautrack::PackedTPCNSigmaEl>,
139-
dautrack::TPCNSigmaPi<dautrack::PackedTPCNSigmaPi>,
140-
dautrack::TPCNSigmaKa<dautrack::PackedTPCNSigmaKa>,
141-
dautrack::TPCNSigmaPr<dautrack::PackedTPCNSigmaPr>);
143+
dautrack::TPCSignal,
144+
dautrack::PackedTPCNSigmaEl, dautrack::PackedTPCNSigmaPi,
145+
dautrack::PackedTPCNSigmaKa, dautrack::PackedTPCNSigmaPr,
146+
dautrack::TPCNSigmaEl<dautrack::PackedTPCNSigmaEl>,
147+
dautrack::TPCNSigmaPi<dautrack::PackedTPCNSigmaPi>,
148+
dautrack::TPCNSigmaKa<dautrack::PackedTPCNSigmaKa>,
149+
dautrack::TPCNSigmaPr<dautrack::PackedTPCNSigmaPr>);
142150

143151
using DauTrackTPCPIDs = DauTrackTPCPIDs_001; // second gen: packed Nsigma, no He
144152

@@ -148,8 +156,8 @@ DECLARE_SOA_TABLE(DauTrackTOFPIDs_000, "AOD", "DAUTRACKTOFPID", // raw table (fo
148156
DECLARE_SOA_TABLE_VERSIONED(DauTrackTOFPIDs_001, "AOD", "DAUTRACKTOFPID", 1, // raw table (for posterior TOF calculation)
149157
o2::soa::Index<>,
150158
dautrack::StraCollisionId, dautrack::DauTrackExtraId,
151-
dautrack::TOFSignal, dautrack::TOFEvTime,
152-
dautrack::Length, dautrack::TOFExpMom,
159+
dautrack::TOFSignal, dautrack::TOFEvTime,
160+
dautrack::Length, dautrack::TOFExpMom,
153161
dautrack::TOFExpTimeEl<dautrack::Length, dautrack::TOFExpMom>,
154162
dautrack::TOFExpTimePi<dautrack::Length, dautrack::TOFExpMom>,
155163
dautrack::TOFExpTimeKa<dautrack::Length, dautrack::TOFExpMom>,

‎PWGLF/TableProducer/Strangeness/Converters/stradautrackstofpidconverter2.cxx‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@
88
// In applying this license CERN does not waive the privileges and immunities
99
// granted to it by virtue of its status as an Intergovernmental Organization
1010
// or submit itself to any jurisdiction.
11-
#include "Framework/runDataProcessing.h"
12-
#include "Framework/AnalysisTask.h"
13-
#include "Framework/AnalysisDataModel.h"
14-
#include "PWGLF/DataModel/LFStrangenessTables.h"
1511
#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
12+
#include "PWGLF/DataModel/LFStrangenessTables.h"
13+
14+
#include "Framework/AnalysisDataModel.h"
15+
#include "Framework/AnalysisTask.h"
16+
#include "Framework/runDataProcessing.h"
1617

1718
using namespace o2;
1819
using namespace o2::framework;
@@ -24,7 +25,7 @@ struct stradautrackstofpidconverter2 {
2425
void process(aod::DauTrackTOFPIDs_000 const& dauTrackTOFPIDs)
2526
{
2627
for (int ii = 0; ii < dauTrackTOFPIDs.size(); ii++) {
27-
auto dauTrackTOFPID = dauTrackTOFPIDs.rawIteratorAt(ii);
28+
auto dauTrackTOFPID = dauTrackTOFPIDs.rawIteratorAt(ii);
2829
dautracktofpids(-1, -1, dauTrackTOFPID.tofSignal(), dauTrackTOFPID.tofEvTime(), dauTrackTOFPID.length(), 0.0f);
2930
}
3031
}
@@ -34,4 +35,5 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
3435
{
3536
return WorkflowSpec{
3637
adaptAnalysisTask<stradautrackstofpidconverter2>(cfgc)};
37-
}
38+
}
39+

‎PWGLF/TableProducer/Strangeness/Converters/stradautrackstpcpidconverter.cxx‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@
88
// In applying this license CERN does not waive the privileges and immunities
99
// granted to it by virtue of its status as an Intergovernmental Organization
1010
// or submit itself to any jurisdiction.
11-
#include "Framework/runDataProcessing.h"
12-
#include "Framework/AnalysisTask.h"
13-
#include "Framework/AnalysisDataModel.h"
14-
#include "PWGLF/DataModel/LFStrangenessTables.h"
1511
#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
12+
#include "PWGLF/DataModel/LFStrangenessTables.h"
13+
14+
#include "Framework/AnalysisDataModel.h"
15+
#include "Framework/AnalysisTask.h"
16+
#include "Framework/runDataProcessing.h"
1617

1718
using namespace o2;
1819
using namespace o2::framework;
@@ -24,10 +25,10 @@ struct stradautrackstpcpidconverter {
2425
void process(aod::DauTrackTPCPIDs_000 const& v000s)
2526
{
2627
for (int ii = 0; ii < v000s.size(); ii++) {
27-
auto dauTrackTPCPID = v000s.rawIteratorAt(ii);
28-
dautrackpcpids(dauTrackTPCPID.tpcSignal(),
28+
auto dauTrackTPCPID = v000s.rawIteratorAt(ii);
29+
dautrackpcpids(dauTrackTPCPID.tpcSignal(),
2930
aod::dautrack::packing::packInInt8(dauTrackTPCPID.tpcNSigmaEl()),
30-
aod::dautrack::packing::packInInt8(dauTrackTPCPID.tpcNSigmaPi()),
31+
aod::dautrack::packing::packInInt8(dauTrackTPCPID.tpcNSigmaPi()),
3132
aod::dautrack::packing::packInInt8(dauTrackTPCPID.tpcNSigmaKa()),
3233
aod::dautrack::packing::packInInt8(dauTrackTPCPID.tpcNSigmaPr()));
3334
}
@@ -38,4 +39,5 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
3839
{
3940
return WorkflowSpec{
4041
adaptAnalysisTask<stradautrackstpcpidconverter>(cfgc)};
41-
}
42+
}
43+

0 commit comments

Comments
 (0)