From e744354ef544b066e4e5a663d695429e8521e50a Mon Sep 17 00:00:00 2001
From: Markus Frank <Markus.Frank@cern.ch>
Date: Mon, 19 Jun 2017 17:16:53 +0200
Subject: [PATCH] Fixes after rebasing
---
DDRec/include/DDRec/CellIDPositionConverter.h | 3 +--
DDRec/include/DDRec/MaterialManager.h | 2 +-
DDRec/include/DDRec/SurfaceManager.h | 2 +-
DDRec/src/SurfaceManager.cpp | 6 +-----
DDRec/src/plugins/createSurfaceManager.cpp | 2 +-
UtilityApps/src/test_surfaces.cpp | 2 +-
6 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/DDRec/include/DDRec/CellIDPositionConverter.h b/DDRec/include/DDRec/CellIDPositionConverter.h
index a5b6eca8e..47cf9f7ce 100644
--- a/DDRec/include/DDRec/CellIDPositionConverter.h
+++ b/DDRec/include/DDRec/CellIDPositionConverter.h
@@ -1,12 +1,11 @@
#ifndef CellIDPositionConverter_H_
#define CellIDPositionConverter_H_
-#include "DD4hep/LCDD.h"
+#include "DD4hep/Detector.h"
#include "DD4hep/Readout.h"
#include "DD4hep/VolumeManager.h"
#include "DDSegmentation/Segmentation.h"
-#include "DDRec/tempdefs.h"
#include <set>
#include <string>
diff --git a/DDRec/include/DDRec/MaterialManager.h b/DDRec/include/DDRec/MaterialManager.h
index 37c5a5442..b21430e6b 100644
--- a/DDRec/include/DDRec/MaterialManager.h
+++ b/DDRec/include/DDRec/MaterialManager.h
@@ -1,7 +1,7 @@
#ifndef rec_MaterialManager_H_
#define rec_MaterialManager_H_
-#include "DD4hep/LCDD.h"
+#include "DD4hep/Detector.h"
#include "DD4hep/Objects.h"
#include "DDRec/Vector3D.h"
#include "DDRec/Material.h"
diff --git a/DDRec/include/DDRec/SurfaceManager.h b/DDRec/include/DDRec/SurfaceManager.h
index 5849c8b49..030eb72e5 100644
--- a/DDRec/include/DDRec/SurfaceManager.h
+++ b/DDRec/include/DDRec/SurfaceManager.h
@@ -2,7 +2,7 @@
#define rec_SurfaceManager_H_
#include "DDRec/ISurface.h"
-#include "DD4hep/LCDD.h"
+#include "DD4hep/Detector.h"
#include <string>
#include <map>
diff --git a/DDRec/src/SurfaceManager.cpp b/DDRec/src/SurfaceManager.cpp
index 47f544039..ee703d227 100644
--- a/DDRec/src/SurfaceManager.cpp
+++ b/DDRec/src/SurfaceManager.cpp
@@ -13,8 +13,6 @@ namespace dd4hep {
namespace rec {
- SurfaceManager::SurfaceManager(){
-
SurfaceManager::SurfaceManager(Detector& theDetector){
// have to make sure the volume manager is populated once in order to have
@@ -42,10 +40,8 @@ namespace dd4hep {
return 0 ;
}
- void SurfaceManager::initialize(Detector& theDetector) {
+ void SurfaceManager::initialize(Detector& description) {
- Detector& description = Detector::getInstance();
-
const std::vector<std::string>& types = description.detectorTypes() ;
for(unsigned i=0,N=types.size();i<N;++i){
diff --git a/DDRec/src/plugins/createSurfaceManager.cpp b/DDRec/src/plugins/createSurfaceManager.cpp
index ea4457c52..03f54a213 100644
--- a/DDRec/src/plugins/createSurfaceManager.cpp
+++ b/DDRec/src/plugins/createSurfaceManager.cpp
@@ -29,7 +29,7 @@ namespace dd4hep{
printout(INFO,"InstallSurfaceManager","**** running plugin InstallSurfaceManager ! " );
- description.addExtension<SurfaceManager>( new SurfaceManager() ) ;
+ description.addExtension<SurfaceManager>( new SurfaceManager(description) ) ;
printout(INFO,"InstallSurfaceManager","%s" , description.extension<SurfaceManager>()->toString().c_str() );
diff --git a/UtilityApps/src/test_surfaces.cpp b/UtilityApps/src/test_surfaces.cpp
index b68a2794f..7476bbc6b 100644
--- a/UtilityApps/src/test_surfaces.cpp
+++ b/UtilityApps/src/test_surfaces.cpp
@@ -1,4 +1,4 @@
-\//==========================================================================
+//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
--
GitLab