Skip to content

Commit

Permalink
Please consider the following formatting changes (#350)
Browse files Browse the repository at this point in the history
  • Loading branch information
alibuild authored Oct 29, 2024
1 parent cea709b commit 61dd4aa
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
18 changes: 9 additions & 9 deletions PWGLF/DataModel/LFStrangenessTables.h
Original file line number Diff line number Diff line change
Expand Up @@ -1057,7 +1057,7 @@ DECLARE_SOA_COLUMN(KFTrackCovMatV0DauPos, kfTrackCovMatV0DauPos, float[21]); //!
DECLARE_SOA_COLUMN(KFTrackCovMatV0DauNeg, kfTrackCovMatV0DauNeg, float[21]); //! covariance matrix elements for KF method (V0 neg daughter)

// for CascCovs / TraCascCovs, meant to provide consistent interface everywhere
DECLARE_SOA_COLUMN(CovMat, covMat, float[21]); //! covariance matrix elements
DECLARE_SOA_COLUMN(CovMat, covMat, float[21]); //! covariance matrix elements

//______________________________________________________
// REGULAR COLUMNS FOR CASCBBS
Expand Down Expand Up @@ -1429,19 +1429,19 @@ DECLARE_SOA_TABLE(CascBBs, "AOD", "CASCBB", //! bachelor-baryon correlation vari
cascdata::BachBaryonCosPA, cascdata::BachBaryonDCAxyToPV)

DECLARE_SOA_TABLE(CascCovs, "AOD", "CASCCOVS", //!
cascdata::CovMat,
cascdata::PositionCovMat<cascdata::CovMat>,
cascdata::MomentumCovMat<cascdata::CovMat>,
cascdata::CovMat,
cascdata::PositionCovMat<cascdata::CovMat>,
cascdata::MomentumCovMat<cascdata::CovMat>,
o2::soa::Marker<1>);

DECLARE_SOA_TABLE(KFCascCovs, "AOD", "KFCASCCOVS", //!
cascdata::KFTrackCovMat, cascdata::KFTrackCovMatV0, cascdata::KFTrackCovMatV0DauPos, cascdata::KFTrackCovMatV0DauNeg);
cascdata::KFTrackCovMat, cascdata::KFTrackCovMatV0, cascdata::KFTrackCovMatV0DauPos, cascdata::KFTrackCovMatV0DauNeg);

DECLARE_SOA_TABLE(TraCascCovs, "AOD", "TRACASCCOVS", //!
cascdata::CovMat,
cascdata::PositionCovMat<cascdata::CovMat>,
cascdata::MomentumCovMat<cascdata::CovMat>,
o2::soa::Marker<2>);
cascdata::CovMat,
cascdata::PositionCovMat<cascdata::CovMat>,
cascdata::MomentumCovMat<cascdata::CovMat>,
o2::soa::Marker<2>);

// extended table with expression columns that can be used as arguments of dynamic columns
DECLARE_SOA_EXTENDED_TABLE_USER(CascCores, StoredCascCores, "CascDATAEXT", //!
Expand Down
12 changes: 6 additions & 6 deletions PWGLF/TableProducer/Strangeness/cascadebuilder.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ struct cascadeBuilder {
Produces<aod::CascTrackXs> cascTrackXs; // if desired for replaying of position information
Produces<aod::CascBBs> cascbb; // if enabled
Produces<aod::CascCovs> casccovs; // if requested by someone
Produces<aod::TraCascCovs> tracasccovs; // if requested by someone
Produces<aod::TraCascCovs> tracasccovs; // if requested by someone
Produces<aod::KFCascCovs> kfcasccovs; // if requested by someone

// produces calls for machine-learning selections
Expand Down Expand Up @@ -1611,7 +1611,7 @@ struct cascadeBuilder {
covCascade[i] = 0.0f;
}
for (int i = 0; i < 6; i++) {
covCascade[i] = positionCovariance[i];
covCascade[i] = positionCovariance[i];
covCascade[MomInd[i]] = covTv0[MomInd[i]] + covTbachelor[MomInd[i]];
}
casccovs(covCascade);
Expand Down Expand Up @@ -1792,7 +1792,7 @@ struct cascadeBuilder {
covCascade[i] = 0.0f;
}
for (int i = 0; i < 6; i++) {
covCascade[i] = positionCovariance[i];
covCascade[i] = positionCovariance[i];
covCascade[MomInd[i]] = covTv0[MomInd[i]] + covTbachelor[MomInd[i]];
}
casccovs(covCascade);
Expand Down Expand Up @@ -1920,18 +1920,18 @@ struct cascadeBuilder {
cascadecandidate.bachDCAxy, cascadecandidate.cascDCAxy, cascadecandidate.cascDCAz, // <--- stratrack (cascDCAxy/z)
trackedCascade.matchingChi2(), trackedCascade.topologyChi2(), trackedCascade.itsClsSize()); // <--- stratrack fit info

if(createCascCovMats){
if (createCascCovMats) {
// create tracked cascade covariance in exactly the same way as non-tracked
// ensures getter consistency and full compatibility in template functions
// (easy switching between tracked and non-tracked)
std::array<float, 21> traCovMat = {0.};
cascadeTrackPar.getCovXYZPxPyPzGlo(traCovMat);
float traCovMatArray[21];
for(int ii=0; ii<21; ii++){
for (int ii = 0; ii < 21; ii++) {
traCovMatArray[ii] = traCovMat[ii];
}
tracasccovs(traCovMatArray);
}
}
}
}
// En masse filling at end of process call
Expand Down

0 comments on commit 61dd4aa

Please sign in to comment.