Skip to content

Commit f4a8954

Browse files
committed
formatting
1 parent 0b84850 commit f4a8954

File tree

3 files changed

+40
-45
lines changed

3 files changed

+40
-45
lines changed

ALICE3/DataModel/OTFMulticharm.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ DECLARE_SOA_INDEX_COLUMN_FULL(XiCPion1, xiCPion1, int, Tracks, "_Pi1XiC");
3232
DECLARE_SOA_INDEX_COLUMN_FULL(XiCPion2, xiCPion2, int, Tracks, "_Pi2XiC");
3333
DECLARE_SOA_INDEX_COLUMN_FULL(XiCCPion, xiCCPion, int, Tracks, "_PiXiCC");
3434

35-
3635
DECLARE_SOA_COLUMN(XicMass, xicMass, float);
3736
DECLARE_SOA_COLUMN(XiccMass, xiccMass, float);
3837

@@ -100,7 +99,6 @@ DECLARE_SOA_COLUMN(Pi2cEta, pi2cEta, float);
10099
DECLARE_SOA_COLUMN(PiccPt, piccPt, float);
101100
DECLARE_SOA_COLUMN(PiccEta, piccEta, float);
102101

103-
104102
} // namespace otfmulticharm
105103
DECLARE_SOA_TABLE(MCharmIndices, "AOD", "MCharmIndices",
106104
o2::soa::Index<>,
@@ -158,7 +156,7 @@ DECLARE_SOA_TABLE(MCharmCores, "AOD", "MCharmCores",
158156
otfmulticharm::PiccTofNSigmaInner,
159157
otfmulticharm::PiccTofDeltaOuter,
160158
otfmulticharm::PiccTofNSigmaOuter,
161-
159+
162160
otfmulticharm::BachPt,
163161
otfmulticharm::BachEta,
164162

ALICE3/TableProducer/alice3-multicharmTable.cxx

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -726,14 +726,14 @@ struct alice3multicharmTable {
726726
thisXiCcandidate.dca, thisXiCCcandidate.dca,
727727
thisXiCcandidate.mass, thisXiCCcandidate.mass,
728728
thisXiCCcandidate.pt, thisXiCCcandidate.eta,
729-
xi.dcaXY(), xi.dcaZ(),
730-
xicdcaXY, xicdcaZ,
729+
xi.dcaXY(), xi.dcaZ(),
730+
xicdcaXY, xicdcaZ,
731731
xiccdcaXY, xiccdcaZ,
732-
piFromXi.dcaXY(), piFromXi.dcaZ(),
733-
piFromLa.dcaXY(), piFromLa.dcaZ(),
732+
piFromXi.dcaXY(), piFromXi.dcaZ(),
733+
piFromLa.dcaXY(), piFromLa.dcaZ(),
734734
prFromLa.dcaXY(), prFromLa.dcaZ(),
735-
pi1c.dcaXY(), pi1c.dcaZ(),
736-
pi2c.dcaXY(), pi2c.dcaZ(),
735+
pi1c.dcaXY(), pi1c.dcaZ(),
736+
pi2c.dcaXY(), pi2c.dcaZ(),
737737
picc.dcaXY(), picc.dcaZ(),
738738
xicDecayRadius2D, xiccDecayRadius2D,
739739
xicProperLength, xicDecayDistanceFromPV,
@@ -749,8 +749,7 @@ struct alice3multicharmTable {
749749
piFromLa.pt(), piFromLa.eta(),
750750
pi1c.pt(), pi1c.eta(),
751751
pi2c.pt(), pi2c.eta(),
752-
picc.pt(), picc.eta()
753-
);
752+
picc.pt(), picc.eta());
754753
}
755754
}
756755
histos.fill(HIST("hCombinationsXiCC"), nCombinationsCC);

ALICE3/Tasks/alice3-multicharm.cxx

Lines changed: 32 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,15 @@
5353
#include "DetectorsVertexing/PVertexerHelpers.h"
5454
#include "CommonConstants/PhysicsConstants.h"
5555

56-
5756
using namespace o2;
5857
using namespace o2::framework;
5958
using namespace o2::framework::expressions;
6059

6160
using multicharmtracks = soa::Join<aod::MCharmIndices, aod::MCharmCores>;
6261

63-
struct alice3multicharm
64-
{
62+
struct alice3multicharm {
6563
SliceCache cache;
66-
64+
6765
ConfigurableAxis axisEta{"axisEta", {80, -4.0f, +4.0f}, "#eta"};
6866
ConfigurableAxis axisXiccMass{"axisXiccMass", {200, 3.521f, 3.721f}, "Xicc Inv Mass (GeV/c^{2})"};
6967
ConfigurableAxis axisDCA{"axisDCA", {400, 0, 400}, "DCA (#mum)"};
@@ -82,7 +80,7 @@ struct alice3multicharm
8280
Configurable<float> picMinDCAz{"picMinDCAz", -1, "[0] in |DCAxy| > [0]+[1]/pT"};
8381
Configurable<float> picMaxTofDiffInner{"picTofDiffInner", 1e+4, "|signal - expected| (ps)"};
8482
Configurable<float> picMinPt{"picMinPt", -1, "Minimum pT for Xic pions"};
85-
83+
8684
Configurable<float> piccMinDCAxy{"piccMinDCAxy", -1, "[0] in |DCAxy| > [0]+[1]/pT"};
8785
Configurable<float> piccMinDCAz{"piccMinDCAz", -1, "[0] in |DCAz| > [0]+[1]/pT"};
8886
Configurable<float> piccMaxTofDiffInner{"piccMaxTofDiffInner", 1e+4, "|signal - expected| (ps)"};
@@ -97,7 +95,7 @@ struct alice3multicharm
9795
Configurable<float> xicMinDecayDistanceFromPV{"xicMinDecayDistanceFromPV", -1, "Minimum distance for Xic decay from PV (cm)"};
9896
Configurable<float> xicMinProperLength{"xicMinProperLength", -1, "Minimum proper length for Xic decay (cm)"};
9997
Configurable<float> xicMaxProperLength{"xicMaxProperLength", 1e+4, "Minimum proper length for Xic decay (cm)"};
100-
98+
10199
Configurable<float> xiccMaxDauDCA{"xiccMaxDauDCA", 1e+4, "DCA between Xicc daughters (cm)"};
102100
Configurable<float> xiccMinRadius{"xiccMinRadius", -1, "Minimum R2D for Xicc decay (cm)"};
103101
Configurable<float> xiccMinProperLength{"xiccMinProperLength", -1, "Minimum proper length for Xicc decay (cm)"};
@@ -141,59 +139,59 @@ struct alice3multicharm
141139
for (const auto& xiccCand : multiCharmTracks) {
142140
if (xiccCand.xicDauDCA() > xicMaxDauDCA || xiccCand.xiccDauDCA() > xiccMaxDauDCA)
143141
continue;
144-
142+
145143
if (std::fabs(xiccCand.xiDCAxy()) < xiMinDCAxy || std::fabs(xiccCand.xiDCAz()) < xiMinDCAz)
146144
continue;
147-
145+
148146
if (std::fabs(xiccCand.pi1cDCAxy()) < picMinDCAxy || std::fabs(xiccCand.pi1cDCAz()) < picMinDCAz)
149-
continue;
150-
147+
continue;
148+
151149
if (std::fabs(xiccCand.pi2cDCAxy()) < picMinDCAxy || std::fabs(xiccCand.pi2cDCAz()) < picMinDCAz)
152-
continue;
153-
150+
continue;
151+
154152
if (std::fabs(xiccCand.piccDCAxy()) < piccMinDCAxy || std::fabs(xiccCand.piccDCAz()) < piccMinDCAz)
155-
continue;
156-
153+
continue;
154+
157155
if (std::fabs(xiccCand.xicDCAxy()) < xicMinDCAxy || std::fabs(xiccCand.xicDCAz()) < xicMinDCAz)
158-
continue;
159-
156+
continue;
157+
160158
if (std::fabs(xiccCand.pi1cDCAxy()) < picMinDCAxy || std::fabs(xiccCand.pi1cDCAz()) < picMinDCAz)
161-
continue;
162-
159+
continue;
160+
163161
if (std::fabs(xiccCand.pi2cDCAxy()) < picMinDCAxy || std::fabs(xiccCand.pi2cDCAz()) < picMinDCAz)
164162
continue;
165-
163+
166164
if (std::fabs(xiccCand.xiccDCAxy()) > xiccMaxDCAxy || std::fabs(xiccCand.xiccDCAz()) > xiccMaxDCAz)
167165
continue;
168-
166+
169167
// Cut on time delta as LoI for now
170168
if (xiccCand.pi1cTofDeltaInner() > picMaxTofDiffInner)
171-
continue;
172-
169+
continue;
170+
173171
if (xiccCand.pi2cTofDeltaInner() > picMaxTofDiffInner)
174172
continue;
175-
173+
176174
if (xiccCand.piccTofDeltaInner() > piccMaxTofDiffInner)
177-
continue;
178-
175+
continue;
176+
179177
if (xiccCand.pi1cPt() < picMinPt || xiccCand.pi2cPt() < picMinPt)
180178
continue;
181-
179+
182180
if (xiccCand.piccPt() < piccMinPt)
183-
continue;
184-
181+
continue;
182+
185183
if (xiccCand.xicDecayRadius2D() < xicMinRadius)
186-
continue;
187-
184+
continue;
185+
188186
if (xiccCand.xiccDecayRadius2D() < xiccMinRadius)
189187
continue;
190-
188+
191189
if (xiccCand.xicProperLength() < xicMinProperLength || xiccCand.xicProperLength() > xicMaxProperLength)
192190
continue;
193-
191+
194192
if (xiccCand.xiccProperLength() < xiccMinProperLength || xiccCand.xiccProperLength() > xiccMaxProperLength)
195-
continue;
196-
193+
continue;
194+
197195
if (xiccCand.xicDistanceFromPV() < xicMinDecayDistanceFromPV)
198196
continue;
199197

0 commit comments

Comments
 (0)