Commit fcb8ec64 authored by Edward Moyse's avatar Edward Moyse
Browse files

Merge branch 'master-fix-hgtd-compilation' into 'master'

Fixing HGTD tracking geometry compilation error

See merge request atlas/athena!47462
parents 7518a29d 3e7c16ac
...@@ -246,27 +246,29 @@ std::pair<EventIDRange, const Trk::TrackingGeometry*> HGTDet::HGTD_TrackingGeome ...@@ -246,27 +246,29 @@ std::pair<EventIDRange, const Trk::TrackingGeometry*> HGTDet::HGTD_TrackingGeome
inBufferVolumes.push_back(innerVol); inBufferVolumes.push_back(innerVol);
inBufferVolumes.push_back(positiveInnerGapVolume); inBufferVolumes.push_back(positiveInnerGapVolume);
const Trk::TrackingVolume* inDetEnclosed = Trk::TrackingVolume* inDetEnclosed =
m_trackingVolumeCreator->createContainerTrackingVolume(inBufferVolumes, m_trackingVolumeCreator->createContainerTrackingVolume(inBufferVolumes,
*materialProperties, *materialProperties,
"HGTD::Container::EnclosedInnerDetector"); "HGTD::Container::EnclosedInnerDetector");
// create the tracking volumes // create the tracking volumes
// create the three volumes // create the three volumes
const Trk::TrackingVolume* negativeVolume = m_trackingVolumeCreator->createTrackingVolume(negativeLayers, Trk::TrackingVolume* negativeVolume =
*materialProperties, m_trackingVolumeCreator->createTrackingVolume(negativeLayers,
enclosedInnerRadius,enclosedOuterRadius, *materialProperties,
-maxZ_HGTD, -minZ_HGTD, enclosedInnerRadius, enclosedOuterRadius,
m_layerBuilder->identification()+"::NegativeEndcap", -maxZ_HGTD, -minZ_HGTD,
(Trk::BinningType)m_layerBinningType); m_layerBuilder->identification()+"::NegativeEndcap",
(Trk::BinningType)m_layerBinningType);
const Trk::TrackingVolume* positiveVolume = m_trackingVolumeCreator->createTrackingVolume(positiveLayers,
*materialProperties, Trk::TrackingVolume* positiveVolume =
enclosedInnerRadius,enclosedOuterRadius, m_trackingVolumeCreator->createTrackingVolume(positiveLayers,
minZ_HGTD, maxZ_HGTD, *materialProperties,
m_layerBuilder->identification()+"::PositiveEndcap", enclosedInnerRadius, enclosedOuterRadius,
(Trk::BinningType)m_layerBinningType); minZ_HGTD, maxZ_HGTD,
m_layerBuilder->identification()+"::PositiveEndcap",
(Trk::BinningType)m_layerBinningType);
// the base volumes have been created // the base volumes have been created
ATH_MSG_VERBOSE('\t' << '\t'<< "Volumes have been created, now pack them into a triple."); ATH_MSG_VERBOSE('\t' << '\t'<< "Volumes have been created, now pack them into a triple.");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment