Skip to content

Commit b444b56

Browse files
gianniliverarogianniliveraro
committed
MC assoc fix + data model changes + analysis histos
1 parent bae1326 commit b444b56

File tree

3 files changed

+800
-320
lines changed

3 files changed

+800
-320
lines changed

‎PWGLF/DataModel/LFSigmaTables.h‎

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,11 @@ using std::array;
3535
namespace o2::aod
3636
{
3737

38-
// Indexing
39-
namespace sigma0Core
40-
{
41-
DECLARE_SOA_INDEX_COLUMN_FULL(PhotonV0, photonV0, int, V0Cores, "_PhotonV0"); //!
42-
DECLARE_SOA_INDEX_COLUMN_FULL(LambdaV0, lambdaV0, int, V0Cores, "_LambdaV0"); //!
43-
} // namespace sigma0Core
44-
4538
// for real data
4639
namespace sigma0Core
4740
{
41+
DECLARE_SOA_COLUMN(PhotonV0ID, photonV0ID, int);
42+
DECLARE_SOA_COLUMN(LambdaV0ID, lambdaV0ID, int);
4843
DECLARE_SOA_COLUMN(X, x, float);
4944
DECLARE_SOA_COLUMN(Y, y, float);
5045
DECLARE_SOA_COLUMN(Z, z, float);
@@ -163,6 +158,9 @@ DECLARE_SOA_DYNAMIC_COLUMN(LambdaPhi, lambdaPhi, //! Phi in the range [0, 2pi)
163158
} // namespace sigma0Core
164159

165160
DECLARE_SOA_TABLE(Sigma0Cores, "AOD", "SIGMA0CORES",
161+
// Indices for debug
162+
sigma0Core::PhotonV0ID, sigma0Core::LambdaV0ID,
163+
166164
// Basic properties
167165
sigma0Core::X, sigma0Core::Y, sigma0Core::Z, sigma0Core::DCADaughters,
168166
sigma0Core::PhotonPx, sigma0Core::PhotonPy, sigma0Core::PhotonPz, sigma0Core::PhotonMass,
@@ -510,8 +508,8 @@ namespace sigma0EMPhoton
510508
// REGULAR COLUMNS FOR SIGMA0EMPHOTON
511509
DECLARE_SOA_COLUMN(PhotonID, photonID, int);
512510
DECLARE_SOA_COLUMN(PhotonEnergy, photonEnergy, float);
513-
DECLARE_SOA_COLUMN(PhotonEta, photonEta, float);
514-
DECLARE_SOA_COLUMN(PhotonPhi, photonPhi, float);
511+
DECLARE_SOA_COLUMN(PhotonEMCEta, photonEMCEta, float);
512+
DECLARE_SOA_COLUMN(PhotonEMCPhi, photonEMCPhi, float);
515513
DECLARE_SOA_COLUMN(PhotonM02, photonM02, float);
516514
DECLARE_SOA_COLUMN(PhotonM20, photonM20, float);
517515
DECLARE_SOA_COLUMN(PhotonNCells, photonNCells, int);
@@ -520,22 +518,24 @@ DECLARE_SOA_COLUMN(PhotonIsExotic, photonIsExotic, bool);
520518
DECLARE_SOA_COLUMN(PhotonDistToBad, photonDistToBad, float);
521519
DECLARE_SOA_COLUMN(PhotonNLM, photonNLM, int);
522520
DECLARE_SOA_COLUMN(PhotonDefinition, photonDefinition, int);
521+
DECLARE_SOA_COLUMN(PhotonHasAssocTrk, photonHasAssocTrk, bool);
523522

524523
} // namespace sigma0PhotonExtra
525524

526-
DECLARE_SOA_TABLE(sigma0EMPhotons, "AOD", "SIGMA0EMPHOTON",
525+
DECLARE_SOA_TABLE(Sigma0EMPhotons, "AOD", "SIGMA0EMPHOTON",
527526
sigma0EMPhoton::PhotonID,
528527
sigma0EMPhoton::PhotonEnergy,
529-
sigma0EMPhoton::PhotonEta,
530-
sigma0EMPhoton::PhotonPhi,
528+
sigma0EMPhoton::PhotonEMCEta,
529+
sigma0EMPhoton::PhotonEMCPhi,
531530
sigma0EMPhoton::PhotonM02,
532531
sigma0EMPhoton::PhotonM20,
533532
sigma0EMPhoton::PhotonNCells,
534533
sigma0EMPhoton::PhotonTime,
535534
sigma0EMPhoton::PhotonIsExotic,
536535
sigma0EMPhoton::PhotonDistToBad,
537536
sigma0EMPhoton::PhotonNLM,
538-
sigma0EMPhoton::PhotonDefinition);
537+
sigma0EMPhoton::PhotonDefinition,
538+
sigma0EMPhoton::PhotonHasAssocTrk);
539539

540540

541541
// For Lambda extra info
@@ -603,6 +603,7 @@ DECLARE_SOA_TABLE(Sigma0LambdaExtras, "AOD", "SIGMA0LAMBDA",
603603
// for MC
604604
namespace sigma0MCCore
605605
{
606+
DECLARE_SOA_COLUMN(ParticleIdMC, particleIdMC, int); //! V0 Particle ID
606607
DECLARE_SOA_COLUMN(MCradius, mcradius, float);
607608
DECLARE_SOA_COLUMN(PDGCode, pdgCode, int);
608609
DECLARE_SOA_COLUMN(PDGCodeMother, pdgCodeMother, int);
@@ -612,6 +613,9 @@ DECLARE_SOA_COLUMN(IsProducedByGenerator, isProducedByGenerator, bool);
612613
DECLARE_SOA_COLUMN(PhotonMCPx, photonmcpx, float);
613614
DECLARE_SOA_COLUMN(PhotonMCPy, photonmcpy, float);
614615
DECLARE_SOA_COLUMN(PhotonMCPz, photonmcpz, float);
616+
DECLARE_SOA_COLUMN(PhotonAmplitudeA, photonAmplitudeA, float); // Energy fraction deposited by a particle inside this calo cell.
617+
DECLARE_SOA_COLUMN(PhotonPDGCodePos, photonPDGCodePos, int);
618+
DECLARE_SOA_COLUMN(PhotonPDGCodeNeg, photonPDGCodeNeg, int);
615619
DECLARE_SOA_COLUMN(IsPhotonPrimary, isPhotonPrimary, bool);
616620
DECLARE_SOA_COLUMN(PhotonPDGCode, photonPDGCode, int);
617621
DECLARE_SOA_COLUMN(PhotonPDGCodeMother, photonPDGCodeMother, int);
@@ -621,6 +625,8 @@ DECLARE_SOA_COLUMN(LambdaMCPx, lambdamcpx, float);
621625
DECLARE_SOA_COLUMN(LambdaMCPy, lambdamcpy, float);
622626
DECLARE_SOA_COLUMN(LambdaMCPz, lambdamcpz, float);
623627
DECLARE_SOA_COLUMN(IsLambdaPrimary, isLambdaPrimary, bool);
628+
DECLARE_SOA_COLUMN(LambdaPDGCodePos, lambdaPDGCodePos, int);
629+
DECLARE_SOA_COLUMN(LambdaPDGCodeNeg, lambdaPDGCodeNeg, int);
624630
DECLARE_SOA_COLUMN(LambdaPDGCode, lambdaPDGCode, int);
625631
DECLARE_SOA_COLUMN(LambdaPDGCodeMother, lambdaPDGCodeMother, int);
626632
DECLARE_SOA_COLUMN(LambdaIsCorrectlyAssoc, lambdaIsCorrectlyAssoc, bool);
@@ -727,15 +733,17 @@ DECLARE_SOA_DYNAMIC_COLUMN(LambdaMCPhi, lambdaMCPhi, //! Phi in the range [0, 2p
727733
} // namespace sigma0MCCore
728734

729735
DECLARE_SOA_TABLE(Sigma0MCCores, "AOD", "SIGMA0MCCORES",
736+
// MC particle index for debug
737+
sigma0MCCore::ParticleIdMC,
730738

731739
// Basic properties
732740
sigma0MCCore::MCradius, sigma0MCCore::PDGCode, sigma0MCCore::PDGCodeMother, sigma0MCCore::MCprocess, sigma0MCCore::IsProducedByGenerator,
733741

734-
sigma0MCCore::PhotonMCPx, sigma0MCCore::PhotonMCPy, sigma0MCCore::PhotonMCPz,
735-
sigma0MCCore::IsPhotonPrimary, sigma0MCCore::PhotonPDGCode, sigma0MCCore::PhotonPDGCodeMother, sigma0MCCore::PhotonIsCorrectlyAssoc,
742+
sigma0MCCore::PhotonMCPx, sigma0MCCore::PhotonMCPy, sigma0MCCore::PhotonMCPz, sigma0MCCore::PhotonAmplitudeA,
743+
sigma0MCCore::PhotonPDGCodePos, sigma0MCCore::PhotonPDGCodeNeg, sigma0MCCore::IsPhotonPrimary, sigma0MCCore::PhotonPDGCode, sigma0MCCore::PhotonPDGCodeMother, sigma0MCCore::PhotonIsCorrectlyAssoc,
736744

737745
sigma0MCCore::LambdaMCPx, sigma0MCCore::LambdaMCPy, sigma0MCCore::LambdaMCPz,
738-
sigma0MCCore::IsLambdaPrimary, sigma0MCCore::LambdaPDGCode, sigma0MCCore::LambdaPDGCodeMother, sigma0MCCore::LambdaIsCorrectlyAssoc,
746+
sigma0MCCore::LambdaPDGCodePos, sigma0MCCore::LambdaPDGCodeNeg, sigma0MCCore::IsLambdaPrimary, sigma0MCCore::LambdaPDGCode, sigma0MCCore::LambdaPDGCodeMother, sigma0MCCore::LambdaIsCorrectlyAssoc,
739747

740748
// Dynamic columns
741749
sigma0MCCore::IsSigma0<sigma0MCCore::PDGCode>,
@@ -764,10 +772,6 @@ DECLARE_SOA_TABLE(Sigma0MCCores, "AOD", "SIGMA0MCCORES",
764772
sigma0MCCore::LambdaMCY<sigma0MCCore::LambdaMCPx, sigma0MCCore::LambdaMCPy, sigma0MCCore::LambdaMCPz>,
765773
sigma0MCCore::LambdaMCPhi<sigma0MCCore::LambdaMCPx, sigma0MCCore::LambdaMCPy>);
766774

767-
namespace sigma0MCCore
768-
{
769-
DECLARE_SOA_INDEX_COLUMN(McParticle, mcParticle); //! MC particle for Sigma0
770-
}
771775

772776
// for MC
773777
namespace kstarMCCore
@@ -959,12 +963,6 @@ DECLARE_SOA_TABLE(KStarGens, "AOD", "KSTARGENS",
959963
DECLARE_SOA_TABLE(SigmaCollRef, "AOD", "SIGMACOLLREF", //! optional table to refer back to a collision
960964
o2::soa::Index<>, v0data::StraCollisionId);
961965

962-
DECLARE_SOA_TABLE(SigmaIndices, "AOD", "SIGMAINDEX", //! index table when using AO2Ds
963-
o2::soa::Index<>, sigma0Core::PhotonV0Id, sigma0Core::LambdaV0Id, o2::soa::Marker<1>);
964-
965-
DECLARE_SOA_TABLE(SigmaMCLabels, "AOD", "SIGMAMCLABEL", //! optional table to refer to mcparticles
966-
o2::soa::Index<>, sigma0MCCore::McParticleId);
967-
968966
DECLARE_SOA_TABLE(SigmaGenCollRef, "AOD", "SIGMAGENCOLLREF", //! optional table to refer back to a collision
969967
o2::soa::Index<>, v0data::StraMCCollisionId);
970968

0 commit comments

Comments
 (0)