2828#include " Common/DataModel/TrackSelectionTables.h"
2929
3030#include < CCDB/BasicCCDBManager.h>
31+ #include < CommonConstants/LHCConstants.h>
3132#include < CommonConstants/MathConstants.h>
3233#include < CommonConstants/PhysicsConstants.h>
3334#include < DCAFitter/DCAFitterN.h>
3839#include < Framework/AnalysisHelpers.h>
3940#include < Framework/AnalysisTask.h>
4041#include < Framework/Configurable.h>
42+ #include < Framework/DataTypes.h>
4143#include < Framework/HistogramRegistry.h>
4244#include < Framework/HistogramSpec.h>
4345#include < Framework/InitContext.h>
4446#include < Framework/OutputObjHeader.h>
4547#include < Framework/runDataProcessing.h>
48+ #include < MathUtils/Primitive2D.h>
4649#include < ReconstructionDataFormats/PID.h>
4750#include < ReconstructionDataFormats/Track.h>
4851
52+ #include < TAxis.h>
53+ #include < TH1.h>
54+ #include < TH2.h>
4955#include < TMCProcess.h>
5056#include < TPDGCode.h>
5157
5258#include < algorithm>
5359#include < array>
5460#include < cmath>
61+ #include < cstddef>
5562#include < cstdint>
5663#include < optional>
5764#include < string>
@@ -413,7 +420,7 @@ struct Sigmaplusbuilder {
413420 // MC counter of generated Sigma+ -> p pi0 in acceptance
414421 void fillSigmaCounter (int sigmaId, int step)
415422 {
416- if (mGenSigmaWritten .count (sigmaId) > 0 ) {
423+ if (mGenSigmaWritten .contains (sigmaId)) {
417424 histos.fill (HIST (" MC/hSigmaPlusCounter" ), step);
418425 }
419426 }
@@ -639,7 +646,7 @@ struct Sigmaplusbuilder {
639646 template <typename TTrack>
640647 TrackCand tpcOnlyTrackCand (const TTrack& track, const std::vector<double >& collisionBcNS, const std::vector<double >& collisionTimeNS)
641648 {
642- o2::aod::track::extensions::TPCTimeErrEncoding timeEncoding;
649+ o2::aod::track::extensions::TPCTimeErrEncoding timeEncoding{} ;
643650 timeEncoding.encoding .timeErr = track.trackTimeRes ();
644651 double trackTimeNS = collisionBcNS[track.collisionId ()] + track.trackTime (); // trackTime() is relative to the BC of its collision
645652 double timeMin = trackTimeNS - timeEncoding.getDeltaTBwd () - photonPoolTimeMarginNS;
@@ -653,7 +660,7 @@ struct Sigmaplusbuilder {
653660 }
654661 }
655662 histos.fill (HIST (" Photon/Inclusive/hTpcTimeRangeNColl" ), lastCollIdx - firstCollIdx + 1 );
656- return TrackCand{static_cast <int >(track.globalIndex ()), {firstCollIdx, lastCollIdx}};
663+ return TrackCand{. Idxtr = static_cast <int >(track.globalIndex ()), . collBracket = {firstCollIdx, lastCollIdx}};
657664 }
658665
659666 // electron-positron pairs with |theta+ - theta-| <= photonMaxDeltaTheta that share at least one collision (theta should be similar)
@@ -687,7 +694,7 @@ struct Sigmaplusbuilder {
687694 }
688695 lastPositronPaired[iElectron] = iPositron;
689696 const auto & electron = mElectronPool [iElectron];
690- pairs.push_back (SVCand{electron.Idxtr , positron.Idxtr , electron.collBracket .getOverlap (positron.collBracket )});
697+ pairs.push_back (SVCand{. tr0Idx = electron.Idxtr , . tr1Idx = positron.Idxtr , . collBracket = electron.collBracket .getOverlap (positron.collBracket )});
691698 }
692699 }
693700 }
@@ -1345,7 +1352,7 @@ struct Sigmaplusbuilder {
13451352 std::array<float , 3 > helperAxis = std::abs (nHatOrig[2 ]) < MaxAbsNzForZHelperAxis ? std::array<float , 3 >{0 .f , 0 .f , 1 .f } : std::array<float , 3 >{1 .f , 0 .f , 0 .f };
13461353 std::array<float , 3 > tiltAxisU = normalize3 (cross3 (nHatOrig, helperAxis));
13471354 std::array<float , 3 > tiltAxisV = cross3 (nHatOrig, tiltAxisU);
1348- int nRings = static_cast <int >(candMaxTilt / candTiltStep + 0 . 5f );
1355+ int nRings = static_cast <int >(std::lround ( candMaxTilt / candTiltStep) );
13491356 for (int ring = 1 ; ring <= nRings && discriminant < 0 .f ; ++ring) {
13501357 float tilt = ring * candTiltStep;
13511358 float bestRingDisc = -1 .f ;
@@ -1704,7 +1711,7 @@ struct Sigmaplusbuilder {
17041711 return ;
17051712 }
17061713 mRunNumber = bc.runNumber ();
1707- o2::parameters::GRPMagField * grpmag = ccdb->getForRun <o2::parameters::GRPMagField>(grpmagPath, mRunNumber );
1714+ auto * grpmag = ccdb->getForRun <o2::parameters::GRPMagField>(grpmagPath, mRunNumber );
17081715 o2::base::Propagator::initFieldFromGRP (grpmag);
17091716 mBz = grpmag->getNominalL3Field ();
17101717 fitter.setBz (mBz );
0 commit comments