Skip to content

Commit f7c1020

Browse files
mjkim525mjkim525
authored
Merge pull request #5 from alibuild/alibot-cleanup-10939
Please consider the following formatting changes to #10939
2 parents 2c80737 + 5e8447b commit f7c1020

File tree

2 files changed

+204
-233
lines changed

2 files changed

+204
-233
lines changed

‎PWGLF/TableProducer/Resonances/resonanceMergeDF.cxx‎

Lines changed: 101 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -98,32 +98,32 @@ struct ResonanceMergeDF {
9898

9999
std::vector<std::tuple<float, float, float, float, float, float, int>> vecOfTuples;
100100
std::vector<std::vector<std::tuple<float, float, float, float,
101-
unsigned char, unsigned char,
101+
unsigned char, unsigned char,
102102
int16_t, int16_t, int8_t, int8_t, int8_t,
103103
int8_t, int8_t, int8_t, float,
104104
uint8_t>>>
105105
vecOfVecOfTuples;
106106
std::vector<std::vector<std::tuple<float, float, float, float,
107-
int*,
108-
int8_t, int8_t, int8_t, // TPC Pos Trk
109-
int8_t, int8_t, int8_t, // TPC Neg Trk
110-
int8_t, int8_t, int8_t, // TPC Bach Trk
111-
int8_t, int8_t, int8_t, // TOF Pos Trk
112-
int8_t, int8_t, int8_t, // TOF Neg Trk
113-
int8_t, int8_t, int8_t, // TOF Bach Trk
114-
float, float, float, float,
115-
float, float, float, float,
116-
float, float, int, float,
117-
float, float, float,
118-
float, float, float>>>
107+
int*,
108+
int8_t, int8_t, int8_t, // TPC Pos Trk
109+
int8_t, int8_t, int8_t, // TPC Neg Trk
110+
int8_t, int8_t, int8_t, // TPC Bach Trk
111+
int8_t, int8_t, int8_t, // TOF Pos Trk
112+
int8_t, int8_t, int8_t, // TOF Neg Trk
113+
int8_t, int8_t, int8_t, // TOF Bach Trk
114+
float, float, float, float,
115+
float, float, float, float,
116+
float, float, int, float,
117+
float, float, float,
118+
float, float, float>>>
119119
vecOfVecOfTuplesCasc;
120120
void processTrackDataDF(aod::ResoCollisions::iterator const& collision, aod::ResoTracks const& tracks)
121121
{
122122

123123
int nCollisions = nDF;
124124
vecOfTuples.push_back(std::make_tuple(collision.posX(), collision.posY(), collision.posZ(), collision.cent(), 0, 0, 0));
125125
std::vector<std::tuple<float, float, float, float,
126-
unsigned char, unsigned char,
126+
unsigned char, unsigned char,
127127
int16_t, int16_t, int8_t, int8_t, int8_t,
128128
int8_t, int8_t, int8_t, float,
129129
uint8_t>>
@@ -170,7 +170,7 @@ struct ResonanceMergeDF {
170170
(int8_t)(track.tpcSignal() * 10),
171171
track.trackFlags()));
172172
}
173-
173+
174174
vecOfVecOfTuples.push_back(innerVector);
175175
innerVector.clear();
176176
df++;
@@ -206,7 +206,6 @@ struct ResonanceMergeDF {
206206
std::get<14>(tuple),
207207
std::get<15>(tuple));
208208
}
209-
210209
}
211210

212211
vecOfTuples.clear();
@@ -227,7 +226,7 @@ struct ResonanceMergeDF {
227226
uint8_t>>
228227
innerVector;
229228
std::vector<std::tuple<float, float, float, float,
230-
int*,
229+
int*,
231230
int8_t, int8_t, int8_t, // TPC Pos Trk
232231
int8_t, int8_t, int8_t, // TPC Neg Trk
233232
int8_t, int8_t, int8_t, // TPC Bach Trk
@@ -236,7 +235,7 @@ struct ResonanceMergeDF {
236235
int8_t, int8_t, int8_t, // TOF Bach Trk
237236
float, float, float, float,
238237
float, float, float, float,
239-
float, float, int, float,
238+
float, float, int, float,
240239
float, float, float,
241240
float, float, float>>
242241
innerVectorCasc;
@@ -283,49 +282,47 @@ struct ResonanceMergeDF {
283282
track.trackFlags()));
284283
}
285284

286-
for (const auto& trackCasc : trackCascs)
287-
{
288-
innerVectorCasc.push_back(std::make_tuple(
289-
trackCasc.pt(),
290-
trackCasc.px(),
291-
trackCasc.py(),
292-
trackCasc.pz(),
293-
const_cast<int*>(trackCasc.cascadeIndices()),
294-
(int8_t)(trackCasc.daughterTPCNSigmaPosPi() * 10),
295-
(int8_t)(trackCasc.daughterTPCNSigmaPosKa() * 10),
296-
(int8_t)(trackCasc.daughterTPCNSigmaPosPr() * 10),
297-
(int8_t)(trackCasc.daughterTPCNSigmaNegPi() * 10),
298-
(int8_t)(trackCasc.daughterTPCNSigmaNegKa() * 10),
299-
(int8_t)(trackCasc.daughterTPCNSigmaNegPr() * 10),
300-
(int8_t)(trackCasc.daughterTPCNSigmaBachPi() * 10),
301-
(int8_t)(trackCasc.daughterTPCNSigmaBachKa() * 10),
302-
(int8_t)(trackCasc.daughterTPCNSigmaBachPr() * 10),
303-
(int8_t)(trackCasc.daughterTOFNSigmaPosPi() * 10),
304-
(int8_t)(trackCasc.daughterTOFNSigmaPosKa() * 10),
305-
(int8_t)(trackCasc.daughterTOFNSigmaPosPr() * 10),
306-
(int8_t)(trackCasc.daughterTOFNSigmaNegPi() * 10),
307-
(int8_t)(trackCasc.daughterTOFNSigmaNegKa() * 10),
308-
(int8_t)(trackCasc.daughterTOFNSigmaNegPr() * 10),
309-
(int8_t)(trackCasc.daughterTOFNSigmaBachPi() * 10),
310-
(int8_t)(trackCasc.daughterTOFNSigmaBachKa() * 10),
311-
(int8_t)(trackCasc.daughterTOFNSigmaBachPr() * 10),
312-
trackCasc.v0CosPA(),
313-
trackCasc.cascCosPA(),
314-
trackCasc.daughDCA(),
315-
trackCasc.cascDaughDCA(),
316-
trackCasc.dcapostopv(),
317-
trackCasc.dcanegtopv(),
318-
trackCasc.dcabachtopv(),
319-
trackCasc.dcav0topv(),
320-
trackCasc.dcaXYCascToPV(),
321-
trackCasc.dcaZCascToPV(),
322-
trackCasc.sign(),
323-
trackCasc.mLambda(),
324-
trackCasc.mXi(),
325-
trackCasc.transRadius(), trackCasc.cascTransRadius(), trackCasc.decayVtxX(), trackCasc.decayVtxY(), trackCasc.decayVtxZ()));
326-
285+
for (const auto& trackCasc : trackCascs) {
286+
innerVectorCasc.push_back(std::make_tuple(
287+
trackCasc.pt(),
288+
trackCasc.px(),
289+
trackCasc.py(),
290+
trackCasc.pz(),
291+
const_cast<int*>(trackCasc.cascadeIndices()),
292+
(int8_t)(trackCasc.daughterTPCNSigmaPosPi() * 10),
293+
(int8_t)(trackCasc.daughterTPCNSigmaPosKa() * 10),
294+
(int8_t)(trackCasc.daughterTPCNSigmaPosPr() * 10),
295+
(int8_t)(trackCasc.daughterTPCNSigmaNegPi() * 10),
296+
(int8_t)(trackCasc.daughterTPCNSigmaNegKa() * 10),
297+
(int8_t)(trackCasc.daughterTPCNSigmaNegPr() * 10),
298+
(int8_t)(trackCasc.daughterTPCNSigmaBachPi() * 10),
299+
(int8_t)(trackCasc.daughterTPCNSigmaBachKa() * 10),
300+
(int8_t)(trackCasc.daughterTPCNSigmaBachPr() * 10),
301+
(int8_t)(trackCasc.daughterTOFNSigmaPosPi() * 10),
302+
(int8_t)(trackCasc.daughterTOFNSigmaPosKa() * 10),
303+
(int8_t)(trackCasc.daughterTOFNSigmaPosPr() * 10),
304+
(int8_t)(trackCasc.daughterTOFNSigmaNegPi() * 10),
305+
(int8_t)(trackCasc.daughterTOFNSigmaNegKa() * 10),
306+
(int8_t)(trackCasc.daughterTOFNSigmaNegPr() * 10),
307+
(int8_t)(trackCasc.daughterTOFNSigmaBachPi() * 10),
308+
(int8_t)(trackCasc.daughterTOFNSigmaBachKa() * 10),
309+
(int8_t)(trackCasc.daughterTOFNSigmaBachPr() * 10),
310+
trackCasc.v0CosPA(),
311+
trackCasc.cascCosPA(),
312+
trackCasc.daughDCA(),
313+
trackCasc.cascDaughDCA(),
314+
trackCasc.dcapostopv(),
315+
trackCasc.dcanegtopv(),
316+
trackCasc.dcabachtopv(),
317+
trackCasc.dcav0topv(),
318+
trackCasc.dcaXYCascToPV(),
319+
trackCasc.dcaZCascToPV(),
320+
trackCasc.sign(),
321+
trackCasc.mLambda(),
322+
trackCasc.mXi(),
323+
trackCasc.transRadius(), trackCasc.cascTransRadius(), trackCasc.decayVtxX(), trackCasc.decayVtxY(), trackCasc.decayVtxZ()));
327324
}
328-
325+
329326
vecOfVecOfTuples.push_back(innerVector);
330327
vecOfVecOfTuplesCasc.push_back(innerVectorCasc);
331328
innerVector.clear();
@@ -363,55 +360,53 @@ struct ResonanceMergeDF {
363360
std::get<12>(tuple),
364361
std::get<13>(tuple),
365362
std::get<14>(tuple),
366-
std::get<15>(tuple)
367-
);
363+
std::get<15>(tuple));
368364
}
369-
370-
for (const auto& tuple : innerVectorCasc){
365+
366+
for (const auto& tuple : innerVectorCasc) {
371367
reso2cascadesdf(resoCollisionsdf.lastIndex(),
372-
std::get<0>(tuple),
373-
std::get<1>(tuple),
374-
std::get<2>(tuple),
375-
std::get<3>(tuple),
376-
std::get<4>(tuple),
377-
std::get<5>(tuple),
378-
std::get<6>(tuple),
379-
std::get<7>(tuple),
380-
std::get<8>(tuple),
381-
std::get<9>(tuple),
382-
std::get<10>(tuple),
383-
std::get<11>(tuple),
384-
std::get<12>(tuple),
385-
std::get<13>(tuple),
386-
std::get<14>(tuple),
387-
std::get<15>(tuple),
388-
std::get<16>(tuple),
389-
std::get<17>(tuple),
390-
std::get<18>(tuple),
391-
std::get<19>(tuple),
392-
std::get<20>(tuple),
393-
std::get<21>(tuple),
394-
std::get<22>(tuple),
395-
std::get<23>(tuple),
396-
std::get<24>(tuple),
397-
std::get<25>(tuple),
398-
std::get<26>(tuple),
399-
std::get<27>(tuple),
400-
std::get<28>(tuple),
401-
std::get<29>(tuple),
402-
std::get<30>(tuple),
403-
std::get<31>(tuple),
404-
std::get<32>(tuple),
405-
std::get<33>(tuple),
406-
std::get<34>(tuple),
407-
std::get<35>(tuple),
408-
std::get<36>(tuple),
409-
std::get<37>(tuple),
410-
std::get<38>(tuple),
411-
std::get<39>(tuple),
412-
std::get<40>(tuple));
368+
std::get<0>(tuple),
369+
std::get<1>(tuple),
370+
std::get<2>(tuple),
371+
std::get<3>(tuple),
372+
std::get<4>(tuple),
373+
std::get<5>(tuple),
374+
std::get<6>(tuple),
375+
std::get<7>(tuple),
376+
std::get<8>(tuple),
377+
std::get<9>(tuple),
378+
std::get<10>(tuple),
379+
std::get<11>(tuple),
380+
std::get<12>(tuple),
381+
std::get<13>(tuple),
382+
std::get<14>(tuple),
383+
std::get<15>(tuple),
384+
std::get<16>(tuple),
385+
std::get<17>(tuple),
386+
std::get<18>(tuple),
387+
std::get<19>(tuple),
388+
std::get<20>(tuple),
389+
std::get<21>(tuple),
390+
std::get<22>(tuple),
391+
std::get<23>(tuple),
392+
std::get<24>(tuple),
393+
std::get<25>(tuple),
394+
std::get<26>(tuple),
395+
std::get<27>(tuple),
396+
std::get<28>(tuple),
397+
std::get<29>(tuple),
398+
std::get<30>(tuple),
399+
std::get<31>(tuple),
400+
std::get<32>(tuple),
401+
std::get<33>(tuple),
402+
std::get<34>(tuple),
403+
std::get<35>(tuple),
404+
std::get<36>(tuple),
405+
std::get<37>(tuple),
406+
std::get<38>(tuple),
407+
std::get<39>(tuple),
408+
std::get<40>(tuple));
413409
}
414-
415410
}
416411

417412
vecOfTuples.clear();

0 commit comments

Comments
 (0)