@@ -35,16 +35,11 @@ using std::array;
3535namespace 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
4639namespace sigma0Core
4740{
41+ DECLARE_SOA_COLUMN (PhotonV0ID, photonV0ID, int );
42+ DECLARE_SOA_COLUMN (LambdaV0ID, lambdaV0ID, int );
4843DECLARE_SOA_COLUMN (X, x, float );
4944DECLARE_SOA_COLUMN (Y, y, float );
5045DECLARE_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
165160DECLARE_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,
@@ -502,6 +500,42 @@ DECLARE_SOA_TABLE(Sigma0PhotonExtras, "AOD", "SIGMA0PHOTON",
502500 sigma0PhotonExtra::PhotonNegTrackCode,
503501 sigma0PhotonExtra::PhotonV0Type);
504502
503+ // For EMCal Photon extra info
504+ namespace sigma0EMPhoton
505+ {
506+ // ______________________________________________________
507+ // REGULAR COLUMNS FOR SIGMA0EMPHOTON
508+ DECLARE_SOA_COLUMN (PhotonID, photonID, int );
509+ DECLARE_SOA_COLUMN (PhotonEnergy, photonEnergy, float );
510+ DECLARE_SOA_COLUMN (PhotonEMCEta, photonEMCEta, float );
511+ DECLARE_SOA_COLUMN (PhotonEMCPhi, photonEMCPhi, float );
512+ DECLARE_SOA_COLUMN (PhotonM02, photonM02, float );
513+ DECLARE_SOA_COLUMN (PhotonM20, photonM20, float );
514+ DECLARE_SOA_COLUMN (PhotonNCells, photonNCells, int );
515+ DECLARE_SOA_COLUMN (PhotonTime, photonTime, float );
516+ DECLARE_SOA_COLUMN (PhotonIsExotic, photonIsExotic, bool );
517+ DECLARE_SOA_COLUMN (PhotonDistToBad, photonDistToBad, float );
518+ DECLARE_SOA_COLUMN (PhotonNLM, photonNLM, int );
519+ DECLARE_SOA_COLUMN (PhotonDefinition, photonDefinition, int );
520+ DECLARE_SOA_COLUMN (PhotonHasAssocTrk, photonHasAssocTrk, bool );
521+
522+ } // namespace sigma0EMPhoton
523+
524+ DECLARE_SOA_TABLE (Sigma0EMPhotons, " AOD" , " SIGMA0EMPHOTON" ,
525+ sigma0EMPhoton::PhotonID,
526+ sigma0EMPhoton::PhotonEnergy,
527+ sigma0EMPhoton::PhotonEMCEta,
528+ sigma0EMPhoton::PhotonEMCPhi,
529+ sigma0EMPhoton::PhotonM02,
530+ sigma0EMPhoton::PhotonM20,
531+ sigma0EMPhoton::PhotonNCells,
532+ sigma0EMPhoton::PhotonTime,
533+ sigma0EMPhoton::PhotonIsExotic,
534+ sigma0EMPhoton::PhotonDistToBad,
535+ sigma0EMPhoton::PhotonNLM,
536+ sigma0EMPhoton::PhotonDefinition,
537+ sigma0EMPhoton::PhotonHasAssocTrk);
538+
505539// For Lambda extra info
506540namespace sigma0LambdaExtra
507541{
@@ -567,6 +601,7 @@ DECLARE_SOA_TABLE(Sigma0LambdaExtras, "AOD", "SIGMA0LAMBDA",
567601// for MC
568602namespace sigma0MCCore
569603{
604+ DECLARE_SOA_COLUMN (ParticleIdMC, particleIdMC, int ); // ! V0 Particle ID
570605DECLARE_SOA_COLUMN (MCradius, mcradius, float );
571606DECLARE_SOA_COLUMN (PDGCode, pdgCode, int );
572607DECLARE_SOA_COLUMN (PDGCodeMother, pdgCodeMother, int );
@@ -576,6 +611,9 @@ DECLARE_SOA_COLUMN(IsProducedByGenerator, isProducedByGenerator, bool);
576611DECLARE_SOA_COLUMN (PhotonMCPx, photonmcpx, float );
577612DECLARE_SOA_COLUMN (PhotonMCPy, photonmcpy, float );
578613DECLARE_SOA_COLUMN (PhotonMCPz, photonmcpz, float );
614+ DECLARE_SOA_COLUMN (PhotonAmplitudeA, photonAmplitudeA, float ); // Energy fraction deposited by a particle inside this calo cell.
615+ DECLARE_SOA_COLUMN (PhotonPDGCodePos, photonPDGCodePos, int );
616+ DECLARE_SOA_COLUMN (PhotonPDGCodeNeg, photonPDGCodeNeg, int );
579617DECLARE_SOA_COLUMN (IsPhotonPrimary, isPhotonPrimary, bool );
580618DECLARE_SOA_COLUMN (PhotonPDGCode, photonPDGCode, int );
581619DECLARE_SOA_COLUMN (PhotonPDGCodeMother, photonPDGCodeMother, int );
@@ -585,6 +623,8 @@ DECLARE_SOA_COLUMN(LambdaMCPx, lambdamcpx, float);
585623DECLARE_SOA_COLUMN (LambdaMCPy, lambdamcpy, float );
586624DECLARE_SOA_COLUMN (LambdaMCPz, lambdamcpz, float );
587625DECLARE_SOA_COLUMN (IsLambdaPrimary, isLambdaPrimary, bool );
626+ DECLARE_SOA_COLUMN (LambdaPDGCodePos, lambdaPDGCodePos, int );
627+ DECLARE_SOA_COLUMN (LambdaPDGCodeNeg, lambdaPDGCodeNeg, int );
588628DECLARE_SOA_COLUMN (LambdaPDGCode, lambdaPDGCode, int );
589629DECLARE_SOA_COLUMN (LambdaPDGCodeMother, lambdaPDGCodeMother, int );
590630DECLARE_SOA_COLUMN (LambdaIsCorrectlyAssoc, lambdaIsCorrectlyAssoc, bool );
@@ -691,15 +731,17 @@ DECLARE_SOA_DYNAMIC_COLUMN(LambdaMCPhi, lambdaMCPhi, //! Phi in the range [0, 2p
691731} // namespace sigma0MCCore
692732
693733DECLARE_SOA_TABLE (Sigma0MCCores, " AOD" , " SIGMA0MCCORES" ,
734+ // MC particle index for debug
735+ sigma0MCCore::ParticleIdMC,
694736
695737 // Basic properties
696738 sigma0MCCore::MCradius, sigma0MCCore::PDGCode, sigma0MCCore::PDGCodeMother, sigma0MCCore::MCprocess, sigma0MCCore::IsProducedByGenerator,
697739
698- sigma0MCCore::PhotonMCPx, sigma0MCCore::PhotonMCPy, sigma0MCCore::PhotonMCPz,
699- sigma0MCCore::IsPhotonPrimary, sigma0MCCore::PhotonPDGCode, sigma0MCCore::PhotonPDGCodeMother, sigma0MCCore::PhotonIsCorrectlyAssoc,
740+ sigma0MCCore::PhotonMCPx, sigma0MCCore::PhotonMCPy, sigma0MCCore::PhotonMCPz, sigma0MCCore::PhotonAmplitudeA,
741+ sigma0MCCore::PhotonPDGCodePos, sigma0MCCore::PhotonPDGCodeNeg, sigma0MCCore:: IsPhotonPrimary, sigma0MCCore::PhotonPDGCode, sigma0MCCore::PhotonPDGCodeMother, sigma0MCCore::PhotonIsCorrectlyAssoc,
700742
701743 sigma0MCCore::LambdaMCPx, sigma0MCCore::LambdaMCPy, sigma0MCCore::LambdaMCPz,
702- sigma0MCCore::IsLambdaPrimary, sigma0MCCore::LambdaPDGCode, sigma0MCCore::LambdaPDGCodeMother, sigma0MCCore::LambdaIsCorrectlyAssoc,
744+ sigma0MCCore::LambdaPDGCodePos, sigma0MCCore::LambdaPDGCodeNeg, sigma0MCCore:: IsLambdaPrimary, sigma0MCCore::LambdaPDGCode, sigma0MCCore::LambdaPDGCodeMother, sigma0MCCore::LambdaIsCorrectlyAssoc,
703745
704746 // Dynamic columns
705747 sigma0MCCore::IsSigma0<sigma0MCCore::PDGCode>,
@@ -728,11 +770,6 @@ DECLARE_SOA_TABLE(Sigma0MCCores, "AOD", "SIGMA0MCCORES",
728770 sigma0MCCore::LambdaMCY<sigma0MCCore::LambdaMCPx, sigma0MCCore::LambdaMCPy, sigma0MCCore::LambdaMCPz>,
729771 sigma0MCCore::LambdaMCPhi<sigma0MCCore::LambdaMCPx, sigma0MCCore::LambdaMCPy>);
730772
731- namespace sigma0MCCore
732- {
733- DECLARE_SOA_INDEX_COLUMN (McParticle, mcParticle); // ! MC particle for Sigma0
734- }
735-
736773// for MC
737774namespace kstarMCCore
738775{
@@ -923,12 +960,6 @@ DECLARE_SOA_TABLE(KStarGens, "AOD", "KSTARGENS",
923960DECLARE_SOA_TABLE (SigmaCollRef, " AOD" , " SIGMACOLLREF" , // ! optional table to refer back to a collision
924961 o2::soa::Index<>, v0data::StraCollisionId);
925962
926- DECLARE_SOA_TABLE (SigmaIndices, " AOD" , " SIGMAINDEX" , // ! index table when using AO2Ds
927- o2::soa::Index<>, sigma0Core::PhotonV0Id, sigma0Core::LambdaV0Id, o2::soa::Marker<1 >);
928-
929- DECLARE_SOA_TABLE (SigmaMCLabels, " AOD" , " SIGMAMCLABEL" , // ! optional table to refer to mcparticles
930- o2::soa::Index<>, sigma0MCCore::McParticleId);
931-
932963DECLARE_SOA_TABLE (SigmaGenCollRef, " AOD" , " SIGMAGENCOLLREF" , // ! optional table to refer back to a collision
933964 o2::soa::Index<>, v0data::StraMCCollisionId);
934965
0 commit comments