Merge branch 'dataHandle.ZDC_GeoM-20181127' into 'master'

ZDC_GeoM: Avoid use of non-bound DataHandle.

See merge request atlas/athena!16291

ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_DetFactory.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "ZDC_DetFactory.h"
@@ -19,7 +19,6 @@
 #include "GeoModelKernel/GeoAlignableTransform.h"  
 #include "GeoModelKernel/GeoSerialTransformer.h"
 #include "StoreGate/StoreGateSvc.h"
-#include "StoreGate/DataHandle.h"
 
 #include "GeoModelInterfaces/StoredMaterialManager.h"
 
@@ -46,7 +45,7 @@ void ZDC_DetFactory::create(GeoPhysVol* world)
 {
   m_detectorManager = new ZDC_DetManager();
 
-  DataHandle<StoredMaterialManager> materialManager;
+  const StoredMaterialManager* materialManager = nullptr;
   if (StatusCode::SUCCESS != m_detectorStore->retrieve(materialManager, std::string("MATERIALS"))) return;
 
   //------------------------------------------------------------------------------------------------------------

ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_DetTool.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "ZDC_DetTool.h"
@@ -36,7 +36,7 @@ StatusCode ZDC_DetTool::create()
   if (msgLevel(MSG::DEBUG)) msg(MSG::DEBUG) << " Building ZDC geometry " << endmsg;
   
   // Locate the top level experiment node  
-  DataHandle<GeoModelExperiment> theExpt; 
+  GeoModelExperiment* theExpt = nullptr;
   
   if (StatusCode::SUCCESS != detStore()->retrieve(theExpt, "ATLAS")) {