Skip to content

Commit f28583e

Browse files
alibuildalibuild
committed
Please consider the following formatting changes
1 parent ef6632b commit f28583e

File tree

3 files changed

+21
-29
lines changed

3 files changed

+21
-29
lines changed

‎PWGLF/DataModel/LFSigmaTables.h‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
// granted to it by virtue of its status as an Intergovernmental Organization
1010
// or submit itself to any jurisdiction.
1111

12+
#include "PWGLF/DataModel/LFStrangenessTables.h"
13+
1214
#include "Common/Core/RecoDecay.h"
1315
#include "Common/DataModel/Centrality.h"
1416
#include "Common/DataModel/Multiplicity.h"
1517
#include "Common/DataModel/Qvectors.h"
1618

17-
#include "PWGLF/DataModel/LFStrangenessTables.h"
18-
1919
#include "CommonConstants/PhysicsConstants.h"
2020
#include "Framework/ASoAHelpers.h"
2121
#include "Framework/AnalysisDataModel.h"
@@ -376,7 +376,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(MCOPAngle, mcopAngle,
376376
TVector3 v1(photonMCPx, photonMCPy, photonMCPz);
377377
TVector3 v2(lambdaMCPx, lambdaMCPy, lambdaMCPz);
378378
return v1.Angle(v2);
379-
});
379+
});
380380

381381
// Photon
382382
DECLARE_SOA_DYNAMIC_COLUMN(PhotonMCPt, photonmcpt, //! Transverse momentum in GeV/c
@@ -425,7 +425,6 @@ DECLARE_SOA_DYNAMIC_COLUMN(LambdaMCY, lambdaMCY, //! Rapidity
425425

426426
DECLARE_SOA_DYNAMIC_COLUMN(LambdaMCPhi, lambdaMCPhi, //! Phi in the range [0, 2pi)
427427
[](float lambdaMCPx, float lambdaMCPy) -> float { return RecoDecay::phi(lambdaMCPx, lambdaMCPy); });
428-
429428

430429
} // namespace sigma0MCCore
431430

@@ -436,9 +435,9 @@ DECLARE_SOA_TABLE(Sigma0MCCores, "AOD", "SIGMA0MCCORES",
436435
sigma0MCCore::PhotonMCPx, sigma0MCCore::PhotonMCPy, sigma0MCCore::PhotonMCPz,
437436
sigma0MCCore::IsPhotonPrimary, sigma0MCCore::PhotonPDGCode, sigma0MCCore::PhotonPDGCodeMother, sigma0MCCore::PhotonIsCorrectlyAssoc,
438437

439-
sigma0MCCore::LambdaMCPx, sigma0MCCore::LambdaMCPy, sigma0MCCore::LambdaMCPz,
438+
sigma0MCCore::LambdaMCPx, sigma0MCCore::LambdaMCPy, sigma0MCCore::LambdaMCPz,
440439
sigma0MCCore::IsLambdaPrimary, sigma0MCCore::LambdaPDGCode, sigma0MCCore::LambdaPDGCodeMother, sigma0MCCore::LambdaIsCorrectlyAssoc,
441-
440+
442441
// Dynamic columns
443442
sigma0MCCore::IsSigma0<sigma0MCCore::PDGCode>,
444443
sigma0MCCore::IsAntiSigma0<sigma0MCCore::PDGCode>,
@@ -451,7 +450,7 @@ DECLARE_SOA_TABLE(Sigma0MCCores, "AOD", "SIGMA0MCCORES",
451450
sigma0MCCore::Sigma0MCMass<sigma0MCCore::PhotonMCPx, sigma0MCCore::PhotonMCPy, sigma0MCCore::PhotonMCPz, sigma0MCCore::LambdaMCPx, sigma0MCCore::LambdaMCPy, sigma0MCCore::LambdaMCPz>,
452451
sigma0MCCore::Sigma0MCY<sigma0MCCore::PhotonMCPx, sigma0MCCore::PhotonMCPy, sigma0MCCore::PhotonMCPz, sigma0MCCore::LambdaMCPx, sigma0MCCore::LambdaMCPy, sigma0MCCore::LambdaMCPz>,
453452
sigma0MCCore::MCPhi<sigma0MCCore::PhotonMCPx, sigma0MCCore::PhotonMCPy, sigma0MCCore::LambdaMCPx, sigma0MCCore::LambdaMCPy>,
454-
sigma0MCCore::MCEta<sigma0MCCore::PhotonMCPx, sigma0MCCore::PhotonMCPy, sigma0MCCore::PhotonMCPz, sigma0MCCore::LambdaMCPx, sigma0MCCore::LambdaMCPy, sigma0MCCore::LambdaMCPz>,
453+
sigma0MCCore::MCEta<sigma0MCCore::PhotonMCPx, sigma0MCCore::PhotonMCPy, sigma0MCCore::PhotonMCPz, sigma0MCCore::LambdaMCPx, sigma0MCCore::LambdaMCPy, sigma0MCCore::LambdaMCPz>,
455454
sigma0MCCore::MCOPAngle<sigma0MCCore::PhotonMCPx, sigma0MCCore::PhotonMCPy, sigma0MCCore::PhotonMCPz, sigma0MCCore::LambdaMCPx, sigma0MCCore::LambdaMCPy, sigma0MCCore::LambdaMCPz>,
456455

457456
sigma0MCCore::PhotonMCPt<sigma0MCCore::PhotonMCPx, sigma0MCCore::PhotonMCPy>,
@@ -464,10 +463,7 @@ DECLARE_SOA_TABLE(Sigma0MCCores, "AOD", "SIGMA0MCCORES",
464463
sigma0MCCore::LambdaMCP<sigma0MCCore::LambdaMCPx, sigma0MCCore::LambdaMCPy, sigma0MCCore::LambdaMCPz>,
465464
sigma0MCCore::LambdaMCEta<sigma0MCCore::LambdaMCPx, sigma0MCCore::LambdaMCPy, sigma0MCCore::LambdaMCPz>,
466465
sigma0MCCore::LambdaMCY<sigma0MCCore::LambdaMCPx, sigma0MCCore::LambdaMCPy, sigma0MCCore::LambdaMCPz>,
467-
sigma0MCCore::LambdaMCPhi<sigma0MCCore::LambdaMCPx, sigma0MCCore::LambdaMCPy>
468-
);
469-
470-
466+
sigma0MCCore::LambdaMCPhi<sigma0MCCore::LambdaMCPx, sigma0MCCore::LambdaMCPy>);
471467

472468
namespace sigma0Gen
473469
{
@@ -703,7 +699,6 @@ DECLARE_SOA_COLUMN(Photon2PDGCode, photon2PDGCode, int);
703699
DECLARE_SOA_COLUMN(Photon2PDGCodeMother, photon2PDGCodeMother, int);
704700
DECLARE_SOA_COLUMN(Photon2IsCorrectlyAssoc, photon2IsCorrectlyAssoc, bool);
705701

706-
707702
DECLARE_SOA_DYNAMIC_COLUMN(IsPi0, isPi0, //! IsPi0
708703
[](int pdgCode) -> bool { return pdgCode == 111; });
709704

@@ -816,7 +811,7 @@ DECLARE_SOA_TABLE(Pi0CoresMC, "AOD", "PI0CORESMC",
816811
// Dynamic columns
817812
Pi0CoreMC::IsPi0<Pi0CoreMC::PDGCode>,
818813
Pi0CoreMC::IsFromXi0<Pi0CoreMC::PDGCodeMother>,
819-
814+
820815
Pi0CoreMC::MCPx<Pi0CoreMC::Photon1MCPx, Pi0CoreMC::Photon2MCPx>,
821816
Pi0CoreMC::MCPy<Pi0CoreMC::Photon1MCPy, Pi0CoreMC::Photon2MCPy>,
822817
Pi0CoreMC::MCPz<Pi0CoreMC::Photon1MCPz, Pi0CoreMC::Photon2MCPz>,
@@ -825,7 +820,7 @@ DECLARE_SOA_TABLE(Pi0CoresMC, "AOD", "PI0CORESMC",
825820
Pi0CoreMC::Pi0MCMass<Pi0CoreMC::Photon1MCPx, Pi0CoreMC::Photon1MCPy, Pi0CoreMC::Photon1MCPz, Pi0CoreMC::Photon2MCPx, Pi0CoreMC::Photon2MCPy, Pi0CoreMC::Photon2MCPz>,
826821
Pi0CoreMC::Pi0MCY<Pi0CoreMC::Photon1MCPx, Pi0CoreMC::Photon1MCPy, Pi0CoreMC::Photon1MCPz, Pi0CoreMC::Photon2MCPx, Pi0CoreMC::Photon2MCPy, Pi0CoreMC::Photon2MCPz>,
827822
Pi0CoreMC::MCPhi<Pi0CoreMC::Photon1MCPx, Pi0CoreMC::Photon1MCPy, Pi0CoreMC::Photon2MCPx, Pi0CoreMC::Photon2MCPy>,
828-
Pi0CoreMC::MCEta<Pi0CoreMC::Photon1MCPx, Pi0CoreMC::Photon1MCPy, Pi0CoreMC::Photon1MCPz, Pi0CoreMC::Photon2MCPx, Pi0CoreMC::Photon2MCPy, Pi0CoreMC::Photon2MCPz>,
823+
Pi0CoreMC::MCEta<Pi0CoreMC::Photon1MCPx, Pi0CoreMC::Photon1MCPy, Pi0CoreMC::Photon1MCPz, Pi0CoreMC::Photon2MCPx, Pi0CoreMC::Photon2MCPy, Pi0CoreMC::Photon2MCPz>,
829824
Pi0CoreMC::MCOPAngle<Pi0CoreMC::Photon1MCPx, Pi0CoreMC::Photon1MCPy, Pi0CoreMC::Photon1MCPz, Pi0CoreMC::Photon2MCPx, Pi0CoreMC::Photon2MCPy, Pi0CoreMC::Photon2MCPz>,
830825

831826
Pi0CoreMC::Photon1MCPt<Pi0CoreMC::Photon1MCPx, Pi0CoreMC::Photon1MCPy>,
@@ -838,8 +833,7 @@ DECLARE_SOA_TABLE(Pi0CoresMC, "AOD", "PI0CORESMC",
838833
Pi0CoreMC::Photon2MCP<Pi0CoreMC::Photon2MCPx, Pi0CoreMC::Photon2MCPy, Pi0CoreMC::Photon2MCPz>,
839834
Pi0CoreMC::Photon2MCEta<Pi0CoreMC::Photon2MCPx, Pi0CoreMC::Photon2MCPy, Pi0CoreMC::Photon2MCPz>,
840835
Pi0CoreMC::Photon2MCY<Pi0CoreMC::Photon2MCPx, Pi0CoreMC::Photon2MCPy, Pi0CoreMC::Photon2MCPz>,
841-
Pi0CoreMC::Photon2MCPhi<Pi0CoreMC::Photon2MCPx, Pi0CoreMC::Photon2MCPy>
842-
);
836+
Pi0CoreMC::Photon2MCPhi<Pi0CoreMC::Photon2MCPx, Pi0CoreMC::Photon2MCPy>);
843837

844838
DECLARE_SOA_TABLE(Pi0CollRef, "AOD", "PI0COLLREF", //! optional table to refer back to a collision
845839
o2::soa::Index<>, v0data::StraCollisionId);

‎PWGLF/TableProducer/Strangeness/sigma0builder.cxx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ struct sigma0builder {
348348
float V02MCpx = -999.f;
349349
float V02MCpy = -999.f;
350350
float V02MCpz = -999.f;
351-
float V0PairMCRadius = -999.f;
351+
float V0PairMCRadius = -999.f;
352352
};
353353

354354
// ______________________________________________________
@@ -434,10 +434,10 @@ struct sigma0builder {
434434
}
435435

436436
MCinfo.V01MCpx = v01MC.pxMC();
437-
MCinfo.V01MCpy = v01MC.pyMC();
437+
MCinfo.V01MCpy = v01MC.pyMC();
438438
MCinfo.V01MCpz = v01MC.pzMC();
439439
MCinfo.V02MCpx = v02MC.pxMC();
440-
MCinfo.V02MCpy = v02MC.pyMC();
440+
MCinfo.V02MCpy = v02MC.pyMC();
441441
MCinfo.V02MCpz = v02MC.pzMC();
442442

443443
// Get corresponding entries in MCParticles table
@@ -459,7 +459,7 @@ struct sigma0builder {
459459
MCinfo.V0PairPDGCode = MCMother_v01.pdgCode();
460460
MCinfo.V0PairMCProcess = MCMother_v01.getProcess();
461461
MCinfo.V0PairMCParticleID = MCMother_v01.globalIndex();
462-
MCinfo.V0PairMCRadius = std::hypot(MCMother_v01.vx(), MCMother_v01.vy()); // production position radius
462+
MCinfo.V0PairMCRadius = std::hypot(MCMother_v01.vx(), MCMother_v01.vy()); // production position radius
463463

464464
auto const& v0pairmothers = MCMother_v01.template mothers_as<aod::McParticles>(); // Get mothers
465465
if (!v0pairmothers.empty()) {

‎PWGLF/Tasks/Strangeness/sigmaanalysis.cxx‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1357,16 +1357,15 @@ struct sigmaanalysis {
13571357
return false;
13581358

13591359
// Sigma0 specific selections
1360-
// Rapidity
1361-
if constexpr (requires { cand.sigma0MCY();}) { // MC
1360+
// Rapidity
1361+
if constexpr (requires { cand.sigma0MCY(); }) { // MC
13621362
if (TMath::Abs(cand.sigma0MCY()) > sigma0Selections.Sigma0MaxRap)
13631363
return false;
1364-
}
1365-
else{ // Real data
1364+
} else { // Real data
13661365
if (TMath::Abs(cand.sigma0Y()) > sigma0Selections.Sigma0MaxRap)
13671366
return false;
13681367
}
1369-
1368+
13701369
// V0Pair Radius
13711370
if (cand.radius() > sigma0Selections.Sigma0MaxRadius)
13721371
return false;
@@ -1489,15 +1488,14 @@ struct sigmaanalysis {
14891488
return false;
14901489

14911490
// Pi0 specific selections
1492-
if constexpr (requires { cand.pi0MCY();}) { // MC
1491+
if constexpr (requires { cand.pi0MCY(); }) { // MC
14931492
if (TMath::Abs(cand.pi0MCY()) > pi0Selections.Pi0MaxRap)
14941493
return false;
1495-
}
1496-
else{ // DATA
1494+
} else { // DATA
14971495
if (TMath::Abs(cand.pi0Y()) > pi0Selections.Pi0MaxRap)
14981496
return false;
14991497
}
1500-
1498+
15011499
// V0Pair Radius
15021500
if (cand.radius() > pi0Selections.Pi0MaxRadius)
15031501
return false;

0 commit comments

Comments
 (0)