Skip to content
Snippets Groups Projects
Commit a149c3dc authored by Vakhtang Tsulaia's avatar Vakhtang Tsulaia
Browse files

Merge branch 'm_materialEffectsCaches_static_vector' into 'main'

GSF add comments and fix typo in method name

See merge request !66692
parents 7f72866f cd0247d2
No related branches found
No related tags found
1 merge request!66692GSF add comments and fix typo in method name
......@@ -62,17 +62,16 @@ public:
const Layer* m_recallLayer = nullptr;
//!< Tracking volume for recall (not owning)
const TrackingVolume* m_recallTrackingVolume = nullptr;
// Vector of combined material effects
std::vector<GsfMaterial::Combined> m_materialEffectsCaches;
//!< Recycle bin for MultiComponentState objects,keep track of them
std::vector<MultiComponentState> m_mcsRecycleBin;
//Element we point at each step
// Current State at boundary (not owning)
const MultiComponentState* m_stateAtBoundary = nullptr;
// Current Navigation parameters
std::unique_ptr<TrackParameters> m_navigationParameters = nullptr;
// Ptr to current volume (not owning)
const TrackingVolume* m_trackingVolume = nullptr;
//!< keep track of the MultiComponentStates
std::vector<MultiComponentState> m_mcsRecycleBin;
// Vector of combined material effects
std::vector<GsfMaterial::Combined> m_materialEffectsCaches;
Cache() { m_materialEffectsCaches.reserve(12); }
};
......
......@@ -91,7 +91,7 @@ correctWeights(BH::MixtureParameters& mixture, const int numberOfComponents)
}
BH::MixtureParameters
getTranformedMixtureParameters(
getTransformedMixtureParameters(
const std::array<BH::Polynomial, GSFConstants::maxNumberofMatComponents>&
polynomialWeights,
const std::array<BH::Polynomial, GSFConstants::maxNumberofMatComponents>&
......@@ -434,7 +434,7 @@ Trk::ElectronCombinedMaterialEffects::BetheHeitler(
MixtureParameters mixture;
if (pathlengthInX0 > s_xOverRange) {
if (m_BHtransformationCodeHighX0) {
mixture = getTranformedMixtureParameters(m_BHpolynomialWeightsHighX0,
mixture = getTransformedMixtureParameters(m_BHpolynomialWeightsHighX0,
m_BHpolynomialMeansHighX0,
m_BHpolynomialVariancesHighX0,
pathlengthInX0,
......@@ -448,7 +448,7 @@ Trk::ElectronCombinedMaterialEffects::BetheHeitler(
}
} else {
if (m_BHtransformationCode) {
mixture = getTranformedMixtureParameters(m_BHpolynomialWeights,
mixture = getTransformedMixtureParameters(m_BHpolynomialWeights,
m_BHpolynomialMeans,
m_BHpolynomialVariances,
pathlengthInX0,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment