Skip to content
Snippets Groups Projects
Commit 171b9c5a authored by Frank Winklmeier's avatar Frank Winklmeier
Browse files

AtlasGeometryCommon: make MaterialManager non-const 

Adapt to interface changes of `StoredMaterialManager`.
parent 4aabaa86
40 merge requests!59674InDetPerformanceMonitoring with LumiBlock selection,!59383cppcheck in trigger code: Prefer prefix ++/-- operators for non-primitive types.,!58990Draft:Fixing bug in FTF config when running with Reco_tf,!58835DataQualityConfigurations: Modify L1Calo config for web display,!58791DataQualityConfigurations: Modify L1Calo config for web display,!58373Modification of V2.3 processing to work well with all clients,!58289New NVSI calibration,!58286New NVSI calibration,!58106Update NVSI example algorithm,!57937Draft: New nighlty test for trigger with a Run 4 single muon RDO,!57841Edits to ZDC signal processing in preparation for analysis of data from LHCf run,!57590Fixing LAr DT dumper,!57584Draft: LAr DB fixes,!57316ATR-26311 and ATR-25754 moving one dimuon and few egamma chains from dev to phys or MC,!57090ATLASRECTS-7305: fixes for large cluster building,!56828Draft: [trigEGam] Integration beteween mongroups and TrigEgammaMonitoring,!56523Draft: Proposal for CA-Based AODFix,!56154tauRecTools: fix conditional decoration in TauIDVarCalculator,!55990MM offline DQ - plit PBC in 2 FEB in occupancy plots,!55989ATR-25904: fixed the RUN3_ROI_OVERFLOW_SHIFT and m_OverflowPerRoIMask to 12,!55609Add Athena TEvent-based file access,!55378Draft: Fix ToF channels,!55330Draft: PixelMonitoring: re-implementation of assessment of mva histograms in the online-post processing,!55327Fix memory leak in eFEX Tau algorithm (ATR-25988),!55308Fill offline MET histograms only if container is valid and non-empty,!55304Move fill of offline MET conditional on container being valid and non-empty,!55301Move fill of offline MET conditional on container being valid and non-empty,!55300Move fill of offline MET conditional on container being valid and non-empty,!55158Update JetInputs DQ web display config to add missing plots,!54932Draft: TrigBtagEmulationTool: Add BJet trigger emulation tool,!54737Draft: HLT_mu3vtx_L12MU8F Trigger Updates,!54628Draft: Added HLT_RoICluster_Composites container to EDM conifg.,!54441Draft: Add new scheme to use only half of rings as input,!54269One-line fix for e/g algorithm issue,!54263Draft: changing sTGC TDO tag,!54132Draft: Initial sTGC raw data monitoring,!54090r22 JetTagging: fix_tow_Run3,!54069StoredMaterialManager: make getMaterial non-const,!52778Draft: Update the collisions HLT egamma han config for Run3,!52702Draft: update of muonSelectionTool for r22 and run3
Hide whitespace changes
Inline Side-by-side
AtlasGeometryCommon/BeamPipeGeoModel/src/BeamPipeDetectorFactory.h
+ 1
− 1
View file @ 171b9c5a
...@@ -70,7 +70,7 @@ class BeamPipeDetectorFactory final : public GeoVDetectorFactory ...@@ -70,7 +70,7 @@ class BeamPipeDetectorFactory final : public GeoVDetectorFactory
// The manager: // The manager:
BeamPipeDetectorManager * m_detectorManager; BeamPipeDetectorManager * m_detectorManager;
const StoredMaterialManager * m_materialManager; StoredMaterialManager * m_materialManager;
StoreGateSvc * m_detectorStore; StoreGateSvc * m_detectorStore;
IRDBAccessSvc * m_access; IRDBAccessSvc * m_access;
......
AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory.cxx
+ 1
− 1
View file @ 171b9c5a
...@@ -43,7 +43,7 @@ void CavernInfraDetectorFactory::create(GeoPhysVol *world) ...@@ -43,7 +43,7 @@ void CavernInfraDetectorFactory::create(GeoPhysVol *world)
{ {
m_detectorManager=new CavernInfraDetectorManager(); m_detectorManager=new CavernInfraDetectorManager();
const StoredMaterialManager* materialManager = nullptr; StoredMaterialManager* materialManager = nullptr;
if (StatusCode::SUCCESS != m_detectorStore->retrieve(materialManager, std::string("MATERIALS"))) { if (StatusCode::SUCCESS != m_detectorStore->retrieve(materialManager, std::string("MATERIALS"))) {
return; return;
} }
......
AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory01.cxx
+ 1
− 1
View file @ 171b9c5a
...@@ -57,7 +57,7 @@ void CavernInfraDetectorFactory01::create(GeoPhysVol *world) ...@@ -57,7 +57,7 @@ void CavernInfraDetectorFactory01::create(GeoPhysVol *world)
{ {
m_detectorManager=new CavernInfraDetectorManager(); m_detectorManager=new CavernInfraDetectorManager();
const StoredMaterialManager* materialManager = nullptr; StoredMaterialManager* materialManager = nullptr;
if (StatusCode::SUCCESS != m_detectorStore->retrieve(materialManager, std::string("MATERIALS"))) { if (StatusCode::SUCCESS != m_detectorStore->retrieve(materialManager, std::string("MATERIALS"))) {
return; return;
} }
......
AtlasGeometryCommon/GeoModelEnvelopes/src/ForDetEnvelopeFactory.h
+ 1
− 1
View file @ 171b9c5a
...@@ -37,7 +37,7 @@ class ForDetEnvelopeFactory final : public GeoVDetectorFactory ...@@ -37,7 +37,7 @@ class ForDetEnvelopeFactory final : public GeoVDetectorFactory
// The manager: // The manager:
ForDetEnvelopeManager* m_detectorManager; ForDetEnvelopeManager* m_detectorManager;
const StoredMaterialManager* m_materialManager; StoredMaterialManager* m_materialManager;
StoreGateSvc* m_detectorStore; StoreGateSvc* m_detectorStore;
}; };
......
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