Skip to content

Commit

Permalink
Merge pull request #8 from alibuild/alibot-cleanup-4596
Browse files Browse the repository at this point in the history
Please consider the following formatting changes to AliceO2Group#4596
  • Loading branch information
creetz16 authored Feb 5, 2024
2 parents f74072f + 57d7834 commit 4a6a4d4
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 34 deletions.
60 changes: 30 additions & 30 deletions DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,15 @@ struct qaLamMomResolution {
std::array<float, 3> momPionRecErr;
float sigma1PtProtonIU = -1.0f, sigma1PtPionIU = -1.0f;
// daughter DCA
std::array<float, 2> DCAProtonRec; // 0: xy, 1: z
std::array<float, 2> DCAPionRec; // 0: xy, 1: z
std::array<float, 2> DCAProtonRec; // 0: xy, 1: z
std::array<float, 2> DCAPionRec; // 0: xy, 1: z
std::array<float, 2> DCAProtonRecErr; // 0: xy, 1: z
std::array<float, 2> DCAPionRecErr; // 0: xy, 1: z
std::array<float, 2> DCAPionRecErr; // 0: xy, 1: z
// MC info
std::array<float, 3> momProtonGen;
std::array<float, 3> momPionGen;
std::array<float, 2> DCAProtonGen; // 0: xy, 1: z
std::array<float, 2> DCAPionGen; // 0: xy, 1: z
std::array<float, 2> DCAPionGen; // 0: xy, 1: z

void init(InitContext const&)
{
Expand All @@ -88,25 +88,25 @@ struct qaLamMomResolution {
void fillTable(TCollision const& collision)
{
lamdaughters(collision.globalIndex(),
massLambda, radiusLambda, ptLambda,
chargeProton, chargePion,
etaProton, etaPion,
tpcNClsProton, tpcNClsPion,
momProtonRec[0], momProtonRec[1], momProtonRec[2],
momProtonRecErr[0], momProtonRecErr[1], momProtonRecErr[2],
momPionRec[0], momPionRec[1], momPionRec[2],
momPionRecErr[0], momPionRecErr[1], momPionRecErr[2],
momProtonRecIU[0], momProtonRecIU[1], momProtonRecIU[2],
momProtonRecIUErr[0], momProtonRecIUErr[1], momProtonRecIUErr[2],
momPionRecIU[0], momPionRecIU[1], momPionRecIU[2],
momPionRecIUErr[0], momPionRecIUErr[1], momPionRecIUErr[2],
momProtonGen[0], momProtonGen[1], momProtonGen[2],
momPionGen[0], momPionGen[1], momPionGen[2],
sigma1PtProtonIU, sigma1PtPionIU,
DCAProtonRec[0], DCAProtonRec[1],
DCAProtonRecErr[0], DCAProtonRecErr[1],
DCAPionRec[0], DCAPionRec[1],
DCAPionRecErr[0], DCAPionRecErr[1]);
massLambda, radiusLambda, ptLambda,
chargeProton, chargePion,
etaProton, etaPion,
tpcNClsProton, tpcNClsPion,
momProtonRec[0], momProtonRec[1], momProtonRec[2],
momProtonRecErr[0], momProtonRecErr[1], momProtonRecErr[2],
momPionRec[0], momPionRec[1], momPionRec[2],
momPionRecErr[0], momPionRecErr[1], momPionRecErr[2],
momProtonRecIU[0], momProtonRecIU[1], momProtonRecIU[2],
momProtonRecIUErr[0], momProtonRecIUErr[1], momProtonRecIUErr[2],
momPionRecIU[0], momPionRecIU[1], momPionRecIU[2],
momPionRecIUErr[0], momPionRecIUErr[1], momPionRecIUErr[2],
momProtonGen[0], momProtonGen[1], momProtonGen[2],
momPionGen[0], momPionGen[1], momPionGen[2],
sigma1PtProtonIU, sigma1PtPionIU,
DCAProtonRec[0], DCAProtonRec[1],
DCAProtonRecErr[0], DCAProtonRecErr[1],
DCAPionRec[0], DCAPionRec[1],
DCAPionRecErr[0], DCAPionRecErr[1]);
}

template <typename TProton, typename TPion>
Expand Down Expand Up @@ -155,11 +155,11 @@ struct qaLamMomResolution {
tpcNClsPion = pionTrackIU.tpcNClsFound();
}

void processMC(soa::Join<aod::Collisions, aod::EvSels>::iterator const& collision,
V0DatasLabeled const& V0Datas,
aod::McParticles const& mcparticles,
MyTracks const&)
{
void processMC(soa::Join<aod::Collisions, aod::EvSels>::iterator const& collision,
V0DatasLabeled const& V0Datas,
aod::McParticles const& mcparticles,
MyTracks const&)
{

// event selection
if (collSelection && !collision.sel8()) {
Expand Down Expand Up @@ -271,8 +271,8 @@ struct qaLamMomResolution {
}
}
} // end Anti-Lambda
} // end MC
} // end V0 loop
} // end MC
} // end V0 loop
}
PROCESS_SWITCH(qaLamMomResolution, processMC, "Process MC", true);
};
Expand Down
3 changes: 1 addition & 2 deletions DPG/Tasks/AOTTrack/V0Cascades/qaLamMomResolution.h
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,7 @@ DECLARE_SOA_TABLE(LamDaughters, "AOD", "LAMDAUGHTERS",
qaLamMomResolution::DCAxyPion,
qaLamMomResolution::DCAzPion,
qaLamMomResolution::DCAxyPionErr,
qaLamMomResolution::DCAzPionErr
);
qaLamMomResolution::DCAzPionErr);
} // namespace o2::aod

#endif // QALAMMOMRESOLUTION_H_
4 changes: 2 additions & 2 deletions PWGLF/DataModel/LFStrangenessTables.h
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,8 @@ DECLARE_SOA_COLUMN(V0Type, v0Type, uint8_t); //! type of V0. 0: built solely for
// Saved from finding: covariance matrix of parent track (on request)
DECLARE_SOA_COLUMN(PositionCovMat, positionCovMat, float[6]); //! covariance matrix elements
DECLARE_SOA_COLUMN(MomentumCovMat, momentumCovMat, float[6]); //! covariance matrix elements
DECLARE_SOA_COLUMN(CovMatPosDau, covmatposdau, float[21]); //! covariance matrix elements positive daughter track
DECLARE_SOA_COLUMN(CovMatNegDau, covmatnegdau, float[21]); //! covariance matrix elements negative daughter track
DECLARE_SOA_COLUMN(CovMatPosDau, covmatposdau, float[21]); //! covariance matrix elements positive daughter track
DECLARE_SOA_COLUMN(CovMatNegDau, covmatnegdau, float[21]); //! covariance matrix elements negative daughter track

// Saved from KF particle fit for specic table
DECLARE_SOA_COLUMN(KFV0Chi2, kfV0Chi2, float); //!
Expand Down

0 comments on commit 4a6a4d4

Please sign in to comment.