Skip to content

Commit fe0adc3

Browse files
ariedel-cernariedel-cern
authored
[PWGCF] Fix code-check errors and warnings in femto framework (#18613)
1 parent f928d62 commit fe0adc3

15 files changed

Lines changed: 80 additions & 67 deletions

‎PWGCF/Femto/Core/collisionTagger.h‎

Lines changed: 41 additions & 41 deletions
Large diffs are not rendered by default.

‎PWGCF/Femto/TableProducer/femtoProducerCollisionTagger.cxx‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ struct FemtoProducerCollisionTagger {
155155

156156
for (auto const& r : roles) {
157157
LOG(info) << " bit " << r.bit << " = " << r.deviceName << " " << r.role;
158-
if (doprocessTrackTrack && r.role == collisiontagger::role::TrackTrackPair && r.deviceName.find(collisiontagger::devicename::FemtoPairTrackTrack) != std::string::npos) {
158+
if (doprocessTrackTrack && r.role == static_cast<char const*>(collisiontagger::role::TrackTrackPair) && r.deviceName.find(collisiontagger::devicename::FemtoPairTrackTrack) != std::string::npos) {
159159
o2::framework::DeviceSpec const& device = findDevice(r.deviceName);
160160
collisiontagger::TrackTrackVariant v;
161161
v.sel1 = collisiontagger::readTrackSelection(device, "TrackSelection1");
@@ -170,13 +170,13 @@ struct FemtoProducerCollisionTagger {
170170
mTrackTrackVariants.push_back(v);
171171
} else if (doprocessTrackV0 && r.deviceName.find(collisiontagger::devicename::FemtoPairTrackV0) != std::string::npos) {
172172
o2::framework::DeviceSpec const& device = findDevice(r.deviceName);
173-
if (r.role == collisiontagger::role::TrackLambdaPair) {
173+
if (r.role == static_cast<char const*>(collisiontagger::role::TrackLambdaPair)) {
174174
collisiontagger::TrackV0Variant v;
175175
v.sel1 = collisiontagger::readTrackSelection(device, "TrackSelection1");
176176
v.sel2 = collisiontagger::readV0Selection(device, "LambdaSelection1");
177177
v.bit = r.bit;
178178
mTrackLambdaVariants.push_back(v);
179-
} else if (r.role == collisiontagger::role::TrackK0shortPair) {
179+
} else if (r.role == static_cast<char const*>(collisiontagger::role::TrackK0shortPair)) {
180180
collisiontagger::TrackV0Variant v;
181181
v.sel1 = collisiontagger::readTrackSelection(device, "TrackSelection1");
182182
v.sel2 = collisiontagger::readV0Selection(device, "K0shortSelection1");
@@ -185,13 +185,13 @@ struct FemtoProducerCollisionTagger {
185185
}
186186
} else if (doprocessTrackCascade && r.deviceName.find(collisiontagger::devicename::FemtoPairTrackCascade) != std::string::npos) {
187187
o2::framework::DeviceSpec const& device = findDevice(r.deviceName);
188-
if (r.role == collisiontagger::role::TrackXiPair) {
188+
if (r.role == static_cast<char const*>(collisiontagger::role::TrackXiPair)) {
189189
collisiontagger::TrackV0Variant v;
190190
v.sel1 = collisiontagger::readTrackSelection(device, "TrackSelection1");
191191
v.sel2 = collisiontagger::readV0Selection(device, "XiSelection");
192192
v.bit = r.bit;
193193
mTrackXiVariants.push_back(v);
194-
} else if (r.role == collisiontagger::role::TrackOmegaPair) {
194+
} else if (r.role == static_cast<char const*>(collisiontagger::role::TrackOmegaPair)) {
195195
collisiontagger::TrackV0Variant v;
196196
v.sel1 = collisiontagger::readTrackSelection(device, "TrackSelection1");
197197
v.sel2 = collisiontagger::readV0Selection(device, "OmegaSelection");
@@ -200,19 +200,19 @@ struct FemtoProducerCollisionTagger {
200200
}
201201
} else if ((doprocessTrackKink || doprocessTrackSigmaPlusPcm) && r.deviceName.find(collisiontagger::devicename::FemtoPairTrackKink) != std::string::npos) {
202202
o2::framework::DeviceSpec const& device = findDevice(r.deviceName);
203-
if (r.role == collisiontagger::role::TrackSigmaPair) {
203+
if (r.role == static_cast<char const*>(collisiontagger::role::TrackSigmaPair)) {
204204
collisiontagger::TrackV0Variant v;
205205
v.sel1 = collisiontagger::readTrackSelection(device, "TrackSelection1");
206206
v.sel2 = collisiontagger::readV0Selection(device, "SigmaSelection1");
207207
v.bit = r.bit;
208208
mTrackSigmaVariants.push_back(v);
209-
} else if (r.role == collisiontagger::role::TrackSigmaPlusPair) {
209+
} else if (r.role == static_cast<char const*>(collisiontagger::role::TrackSigmaPlusPair)) {
210210
collisiontagger::TrackV0Variant v;
211211
v.sel1 = collisiontagger::readTrackSelection(device, "TrackSelection1");
212212
v.sel2 = collisiontagger::readV0Selection(device, "SigmaPlusSelection1");
213213
v.bit = r.bit;
214214
mTrackSigmaPlusVariants.push_back(v);
215-
} else if (r.role == collisiontagger::role::TrackSigmaPlusPcmPair) {
215+
} else if (r.role == static_cast<char const*>(collisiontagger::role::TrackSigmaPlusPcmPair)) {
216216
collisiontagger::TrackKinkPcmVariant v;
217217
v.sel1 = collisiontagger::readTrackSelection(device, "TrackSelection1");
218218
v.sel2 = collisiontagger::readKinkPcmSelection(device, "SigmaPlusPcmSelection1");
@@ -221,13 +221,13 @@ struct FemtoProducerCollisionTagger {
221221
}
222222
} else if ((doprocessTrackD0 || doprocessTrackLc) && r.deviceName.find(collisiontagger::devicename::FemtoPairTrackCharmHadron) != std::string::npos) {
223223
o2::framework::DeviceSpec const& device = findDevice(r.deviceName);
224-
if (r.role == collisiontagger::role::TrackD0Pair) {
224+
if (r.role == static_cast<char const*>(collisiontagger::role::TrackD0Pair)) {
225225
collisiontagger::TrackV0Variant v;
226226
v.sel1 = collisiontagger::readTrackSelection(device, "TrackSelection1");
227227
v.sel2 = collisiontagger::readV0Selection(device, "D0Selection1");
228228
v.bit = r.bit;
229229
mTrackD0Variants.push_back(v);
230-
} else if (r.role == collisiontagger::role::TrackLcPair) {
230+
} else if (r.role == static_cast<char const*>(collisiontagger::role::TrackLcPair)) {
231231
collisiontagger::TrackV0Variant v;
232232
v.sel1 = collisiontagger::readTrackSelection(device, "TrackSelection1");
233233
v.sel2 = collisiontagger::readV0Selection(device, "LcSelection1");
@@ -236,7 +236,7 @@ struct FemtoProducerCollisionTagger {
236236
}
237237
} else if (doprocessV0V0 && r.deviceName.find(collisiontagger::devicename::FemtoPairV0V0) != std::string::npos) {
238238
o2::framework::DeviceSpec const& device = findDevice(r.deviceName);
239-
if (r.role == collisiontagger::role::LambdaLambdaPair) {
239+
if (r.role == static_cast<char const*>(collisiontagger::role::LambdaLambdaPair)) {
240240
collisiontagger::V0V0Variant v;
241241
v.sel1 = collisiontagger::readV0Selection(device, "LambdaSelection1");
242242
v.sameSpecies = collisiontagger::hasEnabledOption(device, "Mixing.sameSpecies");
@@ -246,14 +246,14 @@ struct FemtoProducerCollisionTagger {
246246
v.sel2 = v.sameSpecies ? v.sel1 : collisiontagger::readV0Selection(device, "LambdaSelection2");
247247
v.bit = r.bit;
248248
mLambdaLambdaVariants.push_back(v);
249-
} else if (r.role == collisiontagger::role::K0shortK0shortPair) {
249+
} else if (r.role == static_cast<char const*>(collisiontagger::role::K0shortK0shortPair)) {
250250
collisiontagger::V0V0Variant v;
251251
v.sel1 = collisiontagger::readV0Selection(device, "K0shortSelection1");
252252
v.sameSpecies = collisiontagger::hasEnabledOption(device, "Mixing.sameSpecies");
253253
v.sel2 = v.sameSpecies ? v.sel1 : collisiontagger::readV0Selection(device, "K0shortSelection2");
254254
v.bit = r.bit;
255255
mK0shortK0shortVariants.push_back(v);
256-
} else if (r.role == collisiontagger::role::LambdaK0shortPair) {
256+
} else if (r.role == static_cast<char const*>(collisiontagger::role::LambdaK0shortPair)) {
257257
collisiontagger::V0V0Variant v;
258258
v.sel1 = collisiontagger::readV0Selection(device, "LambdaSelection1");
259259
v.sel2 = collisiontagger::readV0Selection(device, "K0shortSelection2");
@@ -275,19 +275,19 @@ struct FemtoProducerCollisionTagger {
275275
mD0D0Variants.push_back(v);
276276
} else if (doprocessTrackTwoTrackResonance && r.deviceName.find(collisiontagger::devicename::FemtoPairTrackTwoTrackResonance) != std::string::npos) {
277277
o2::framework::DeviceSpec const& device = findDevice(r.deviceName);
278-
if (r.role == collisiontagger::role::TrackPhiPair) {
278+
if (r.role == static_cast<char const*>(collisiontagger::role::TrackPhiPair)) {
279279
collisiontagger::TrackTwoTrackResonanceVariant v;
280280
v.sel1 = collisiontagger::readTrackSelection(device, "TrackSelection1");
281281
v.sel2 = collisiontagger::readTwoTrackResonanceSelection(device, "PhiSelection");
282282
v.bit = r.bit;
283283
mTrackPhiVariants.push_back(v);
284-
} else if (r.role == collisiontagger::role::TrackKstar0Pair) {
284+
} else if (r.role == static_cast<char const*>(collisiontagger::role::TrackKstar0Pair)) {
285285
collisiontagger::TrackKstar0Variant v;
286286
v.sel1 = collisiontagger::readTrackSelection(device, "TrackSelection1");
287287
v.sel2 = collisiontagger::readKstar0Selection(device, "Kstar0Selection");
288288
v.bit = r.bit;
289289
mTrackKstar0Variants.push_back(v);
290-
} else if (r.role == collisiontagger::role::TrackRho0Pair) {
290+
} else if (r.role == static_cast<char const*>(collisiontagger::role::TrackRho0Pair)) {
291291
collisiontagger::TrackTwoTrackResonanceVariant v;
292292
v.sel1 = collisiontagger::readTrackSelection(device, "TrackSelection1");
293293
v.sel2 = collisiontagger::readTwoTrackResonanceSelection(device, "Rho0Selection");
@@ -296,13 +296,13 @@ struct FemtoProducerCollisionTagger {
296296
}
297297
} else if (doprocessTrackTwoPhotonResonance && r.deviceName.find(collisiontagger::devicename::FemtoPairTrackTwoPhotonResonance) != std::string::npos) {
298298
o2::framework::DeviceSpec const& device = findDevice(r.deviceName);
299-
if (r.role == collisiontagger::role::TrackPi0Pair) {
299+
if (r.role == static_cast<char const*>(collisiontagger::role::TrackPi0Pair)) {
300300
collisiontagger::TrackTwoPhotonResonanceVariant v;
301301
v.sel1 = collisiontagger::readTrackSelection(device, "TrackSelection1");
302302
v.sel2 = collisiontagger::readTwoPhotonResonanceSelection(device, "Pi0Selection1");
303303
v.bit = r.bit;
304304
mTrackPi0Variants.push_back(v);
305-
} else if (r.role == collisiontagger::role::TrackEtaPair) {
305+
} else if (r.role == static_cast<char const*>(collisiontagger::role::TrackEtaPair)) {
306306
collisiontagger::TrackTwoPhotonResonanceVariant v;
307307
v.sel1 = collisiontagger::readTrackSelection(device, "TrackSelection1");
308308
v.sel2 = collisiontagger::readTwoPhotonResonanceSelection(device, "EtaSelection1");
@@ -311,37 +311,37 @@ struct FemtoProducerCollisionTagger {
311311
}
312312
} else if (doprocessV0TwoTrackResonance && r.deviceName.find(collisiontagger::devicename::FemtoPairV0TwoTrackResonance) != std::string::npos) {
313313
o2::framework::DeviceSpec const& device = findDevice(r.deviceName);
314-
if (r.role == collisiontagger::role::LambdaPhiPair) {
314+
if (r.role == static_cast<char const*>(collisiontagger::role::LambdaPhiPair)) {
315315
collisiontagger::V0TwoTrackResonanceVariant v;
316316
v.sel1 = collisiontagger::readV0Selection(device, "LambdaSelection1");
317317
v.sel2 = collisiontagger::readTwoTrackResonanceSelection(device, "PhiSelection");
318318
v.bit = r.bit;
319319
mLambdaPhiVariants.push_back(v);
320-
} else if (r.role == collisiontagger::role::LambdaKstar0Pair) {
320+
} else if (r.role == static_cast<char const*>(collisiontagger::role::LambdaKstar0Pair)) {
321321
collisiontagger::V0Kstar0Variant v;
322322
v.sel1 = collisiontagger::readV0Selection(device, "LambdaSelection1");
323323
v.sel2 = collisiontagger::readKstar0Selection(device, "Kstar0Selection");
324324
v.bit = r.bit;
325325
mLambdaKstar0Variants.push_back(v);
326-
} else if (r.role == collisiontagger::role::LambdaRho0Pair) {
326+
} else if (r.role == static_cast<char const*>(collisiontagger::role::LambdaRho0Pair)) {
327327
collisiontagger::V0TwoTrackResonanceVariant v;
328328
v.sel1 = collisiontagger::readV0Selection(device, "LambdaSelection1");
329329
v.sel2 = collisiontagger::readTwoTrackResonanceSelection(device, "Rho0Selection");
330330
v.bit = r.bit;
331331
mLambdaRho0Variants.push_back(v);
332-
} else if (r.role == collisiontagger::role::K0shortPhiPair) {
332+
} else if (r.role == static_cast<char const*>(collisiontagger::role::K0shortPhiPair)) {
333333
collisiontagger::V0TwoTrackResonanceVariant v;
334334
v.sel1 = collisiontagger::readV0Selection(device, "K0shortSelection1");
335335
v.sel2 = collisiontagger::readTwoTrackResonanceSelection(device, "PhiSelection");
336336
v.bit = r.bit;
337337
mK0shortPhiVariants.push_back(v);
338-
} else if (r.role == collisiontagger::role::K0shortKstar0Pair) {
338+
} else if (r.role == static_cast<char const*>(collisiontagger::role::K0shortKstar0Pair)) {
339339
collisiontagger::V0Kstar0Variant v;
340340
v.sel1 = collisiontagger::readV0Selection(device, "K0shortSelection1");
341341
v.sel2 = collisiontagger::readKstar0Selection(device, "Kstar0Selection");
342342
v.bit = r.bit;
343343
mK0shortKstar0Variants.push_back(v);
344-
} else if (r.role == collisiontagger::role::K0shortRho0Pair) {
344+
} else if (r.role == static_cast<char const*>(collisiontagger::role::K0shortRho0Pair)) {
345345
collisiontagger::V0TwoTrackResonanceVariant v;
346346
v.sel1 = collisiontagger::readV0Selection(device, "K0shortSelection1");
347347
v.sel2 = collisiontagger::readTwoTrackResonanceSelection(device, "Rho0Selection");
@@ -380,15 +380,15 @@ struct FemtoProducerCollisionTagger {
380380
collisiontagger::TrackSelectionValues sel2Raw = collisiontagger::readTrackSelection(device, "TrackSelection2");
381381
bool same12 = collisiontagger::hasEnabledOption(device, "Mixing.particle12AreSameSpecies");
382382
collisiontagger::TrackSelectionValues sel2 = same12 ? sel1 : sel2Raw;
383-
if (r.role == collisiontagger::role::TrackTrackXiTriplet) {
383+
if (r.role == static_cast<char const*>(collisiontagger::role::TrackTrackXiTriplet)) {
384384
collisiontagger::TrackTrackV0Variant v;
385385
v.sel1 = sel1;
386386
v.sel2 = sel2;
387387
v.same12 = same12;
388388
v.sel3 = collisiontagger::readV0Selection(device, "XiSelection");
389389
v.bit = r.bit;
390390
mTrackTrackXiVariants.push_back(v);
391-
} else if (r.role == collisiontagger::role::TrackTrackOmegaTriplet) {
391+
} else if (r.role == static_cast<char const*>(collisiontagger::role::TrackTrackOmegaTriplet)) {
392392
collisiontagger::TrackTrackV0Variant v;
393393
v.sel1 = sel1;
394394
v.sel2 = sel2;

‎PWGCF/Femto/Tasks/femtoPairD0D0.cxx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include "PWGCF/Femto/Core/collisionBuilder.h"
2020
#include "PWGCF/Femto/Core/collisionHistManager.h"
2121
#include "PWGCF/Femto/Core/collisionTagger.h"
22+
#include "PWGCF/Femto/Core/dataTypes.h"
2223
#include "PWGCF/Femto/Core/modes.h"
2324
#include "PWGCF/Femto/Core/pairBuilder.h"
2425
#include "PWGCF/Femto/Core/pairCleaner.h"

‎PWGCF/Femto/Tasks/femtoPairTrackCascade.cxx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include "PWGCF/Femto/Core/collisionBuilder.h"
2020
#include "PWGCF/Femto/Core/collisionHistManager.h"
2121
#include "PWGCF/Femto/Core/collisionTagger.h"
22+
#include "PWGCF/Femto/Core/dataTypes.h"
2223
#include "PWGCF/Femto/Core/modes.h"
2324
#include "PWGCF/Femto/Core/pairBuilder.h"
2425
#include "PWGCF/Femto/Core/pairCleaner.h"

‎PWGCF/Femto/Tasks/femtoPairTrackCharmHadron.cxx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include "PWGCF/Femto/Core/collisionBuilder.h"
2020
#include "PWGCF/Femto/Core/collisionHistManager.h"
2121
#include "PWGCF/Femto/Core/collisionTagger.h"
22+
#include "PWGCF/Femto/Core/dataTypes.h"
2223
#include "PWGCF/Femto/Core/modes.h"
2324
#include "PWGCF/Femto/Core/pairBuilder.h"
2425
#include "PWGCF/Femto/Core/pairCleaner.h"

‎PWGCF/Femto/Tasks/femtoPairTrackKink.cxx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include "PWGCF/Femto/Core/collisionBuilder.h"
1919
#include "PWGCF/Femto/Core/collisionHistManager.h"
2020
#include "PWGCF/Femto/Core/collisionTagger.h"
21+
#include "PWGCF/Femto/Core/dataTypes.h"
2122
#include "PWGCF/Femto/Core/kinkBuilder.h"
2223
#include "PWGCF/Femto/Core/kinkHistManager.h"
2324
#include "PWGCF/Femto/Core/modes.h"

‎PWGCF/Femto/Tasks/femtoPairTrackTrack.cxx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "PWGCF/Femto/Core/collisionBuilder.h"
1818
#include "PWGCF/Femto/Core/collisionHistManager.h"
1919
#include "PWGCF/Femto/Core/collisionTagger.h"
20+
#include "PWGCF/Femto/Core/dataTypes.h"
2021
#include "PWGCF/Femto/Core/modes.h"
2122
#include "PWGCF/Femto/Core/pairBuilder.h"
2223
#include "PWGCF/Femto/Core/pairCleaner.h"

‎PWGCF/Femto/Tasks/femtoPairTrackTwoPhotonResonance.cxx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "PWGCF/Femto/Core/collisionBuilder.h"
1818
#include "PWGCF/Femto/Core/collisionHistManager.h"
1919
#include "PWGCF/Femto/Core/collisionTagger.h"
20+
#include "PWGCF/Femto/Core/dataTypes.h"
2021
#include "PWGCF/Femto/Core/modes.h"
2122
#include "PWGCF/Femto/Core/pairBuilder.h"
2223
#include "PWGCF/Femto/Core/pairCleaner.h"

‎PWGCF/Femto/Tasks/femtoPairTrackTwoTrackResonance.cxx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "PWGCF/Femto/Core/collisionBuilder.h"
1818
#include "PWGCF/Femto/Core/collisionHistManager.h"
1919
#include "PWGCF/Femto/Core/collisionTagger.h"
20+
#include "PWGCF/Femto/Core/dataTypes.h"
2021
#include "PWGCF/Femto/Core/modes.h"
2122
#include "PWGCF/Femto/Core/pairBuilder.h"
2223
#include "PWGCF/Femto/Core/pairCleaner.h"

‎PWGCF/Femto/Tasks/femtoPairTrackV0.cxx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "PWGCF/Femto/Core/collisionBuilder.h"
1818
#include "PWGCF/Femto/Core/collisionHistManager.h"
1919
#include "PWGCF/Femto/Core/collisionTagger.h"
20+
#include "PWGCF/Femto/Core/dataTypes.h"
2021
#include "PWGCF/Femto/Core/modes.h"
2122
#include "PWGCF/Femto/Core/pairBuilder.h"
2223
#include "PWGCF/Femto/Core/pairCleaner.h"

0 commit comments

Comments
 (0)