From 5a7fdc02720672587ba716f30b992cd04be7f304 Mon Sep 17 00:00:00 2001
From: Dave Casper <dcasper@uci.edu>
Date: Mon, 18 Nov 2019 09:25:05 -0800
Subject: [PATCH] Conform with ATLAS changes
---
Control/CalypsoCommon/CMakeLists.txt | 1 -
.../FaserGeoModel/python/SCTGMConfig.py | 3 +--
.../GeoModel/GeoModelSvc/CMakeLists.txt | 2 --
.../GeoModel/GeoModelSvc/src/GeoModelSvc.cxx | 3 +--
.../IdDictDetDescrCnv/CMakeLists.txt | 2 --
.../src/FaserIDDetDescrCnv.cxx | 3 +--
.../VetoG4_SD/src/VetoSensorSDTool.cxx | 2 +-
.../ScintG4/VetoG4_SD/src/VetoSensorSDTool.h | 2 +-
.../G4Faser/G4FaserInterfaces/CMakeLists.txt | 23 -------------------
Simulation/G4Utilities/Geo2G4/CMakeLists.txt | 2 +-
.../src/FaserSctSensorSDTool.cxx | 2 +-
.../FaserSCT_G4_SD/src/FaserSctSensorSDTool.h | 2 +-
graphics/VTI12/VTI12Algs/CMakeLists.txt | 1 -
.../VTI12GuideLineSystems/CMakeLists.txt | 2 +-
.../VTI12Utils/src/SbPolyhedrizeAction.cxx | 2 +-
15 files changed, 10 insertions(+), 42 deletions(-)
delete mode 100644 Simulation/G4Faser/G4FaserInterfaces/CMakeLists.txt
diff --git a/Control/CalypsoCommon/CMakeLists.txt b/Control/CalypsoCommon/CMakeLists.txt
index 3b99b49d..52a305d7 100644
--- a/Control/CalypsoCommon/CMakeLists.txt
+++ b/Control/CalypsoCommon/CMakeLists.txt
@@ -13,7 +13,6 @@ atlas_depends_on_subdirs( PRIVATE
find_package( six )
# Install files from the package:
-atlas_install_headers( CalypsoCommon )
atlas_install_python_modules( python/*.py python/Utils )
#atlas_install_joboptions( share/Preparation.py share/Execution.py share/Atlas.UnixStandardJob.py test/*.py
# share/zeroJO.py share/Atlas_Gen.UnixStandardJob.py share/MemTraceInclude.py share/runbatch.py)
diff --git a/DetectorDescription/GeoModel/FaserGeoModel/python/SCTGMConfig.py b/DetectorDescription/GeoModel/FaserGeoModel/python/SCTGMConfig.py
index 81803ece..faae2c0d 100644
--- a/DetectorDescription/GeoModel/FaserGeoModel/python/SCTGMConfig.py
+++ b/DetectorDescription/GeoModel/FaserGeoModel/python/SCTGMConfig.py
@@ -3,16 +3,15 @@
#
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from FaserSCT_GeoModel.FaserSCT_GeoModelConfig import FaserSCT_GeometryCfg
def SctGeometryCfg (flags):
acc = ComponentAccumulator()
- from FaserSCT_GeoModel.FaserSCT_GeoModelConfig import FaserSCT_GeometryCfg
acc.merge(FaserSCT_GeometryCfg( flags ))
return acc
if __name__ == "__main__":
- import os
from AthenaCommon.Logging import log
from AthenaCommon.Constants import DEBUG
from AthenaCommon.Configurable import Configurable
diff --git a/DetectorDescription/GeoModel/GeoModelSvc/CMakeLists.txt b/DetectorDescription/GeoModel/GeoModelSvc/CMakeLists.txt
index 48678911..d4ba92d1 100644
--- a/DetectorDescription/GeoModel/GeoModelSvc/CMakeLists.txt
+++ b/DetectorDescription/GeoModel/GeoModelSvc/CMakeLists.txt
@@ -7,7 +7,6 @@ atlas_subdir( GeoModelSvc )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PRIVATE
- Control/CxxUtils
Control/AthenaBaseComps
Control/AthenaKernel
Control/SGTools
@@ -39,6 +38,5 @@ atlas_add_component( GeoModelSvc
LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${GEOMODEL_LIBRARIES} AthenaBaseComps CxxUtils AthenaKernel SGTools StoreGateLib SGtests GeoModelUtilities GeoModelFaserUtilities GeoModelDBManager GeoWrite EventInfo GaudiKernel )
# Install files from the package:
-atlas_install_headers( GeoModelSvc )
#atlas_install_joboptions( share/*.py )
diff --git a/DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.cxx b/DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.cxx
index 831d20e6..2278e5ab 100644
--- a/DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.cxx
+++ b/DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.cxx
@@ -18,7 +18,6 @@
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/IConversionSvc.h"
#include "GaudiKernel/SystemOfUnits.h"
-#include "CxxUtils/make_unique.h"
#include "RDBAccessSvc/IRDBAccessSvc.h"
#include "RDBAccessSvc/IRDBRecordset.h"
@@ -337,7 +336,7 @@ StatusCode GeoModelSvc::geoInit()
int mem,cpu;
std::unique_ptr<std::ofstream> geoModelStats;
if(m_statisticsToFile) {
- geoModelStats = CxxUtils::make_unique<std::ofstream>("GeoModelStatistics");
+ geoModelStats = std::make_unique<std::ofstream>("GeoModelStatistics");
*geoModelStats << "Detector Configuration flag = " << m_FaserVersion << std::endl;
}
diff --git a/DetectorDescription/IdDictDetDescrCnv/CMakeLists.txt b/DetectorDescription/IdDictDetDescrCnv/CMakeLists.txt
index 460d4194..49e87e4e 100644
--- a/DetectorDescription/IdDictDetDescrCnv/CMakeLists.txt
+++ b/DetectorDescription/IdDictDetDescrCnv/CMakeLists.txt
@@ -8,7 +8,6 @@ atlas_subdir( IdDictDetDescrCnv )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PRIVATE
Control/AthenaBaseComps
- Control/CxxUtils
Control/StoreGate
Control/AthenaKernel
Database/RDBAccessSvc
@@ -33,5 +32,4 @@ atlas_add_component( IdDictDetDescrCnv
LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} AthenaBaseComps CxxUtils AthenaKernel StoreGateLib SGtests FaserDetDescr DetDescrCnvSvcLib GeoModelUtilities GeoModelFaserUtilities IdDictDetDescr IdDictParser Identifier GaudiKernel )
# Install files from the package:
-atlas_install_headers( IdDictDetDescrCnv )
atlas_install_joboptions( share/*.py )
diff --git a/DetectorDescription/IdDictDetDescrCnv/src/FaserIDDetDescrCnv.cxx b/DetectorDescription/IdDictDetDescrCnv/src/FaserIDDetDescrCnv.cxx
index dabb566b..c2468e6b 100644
--- a/DetectorDescription/IdDictDetDescrCnv/src/FaserIDDetDescrCnv.cxx
+++ b/DetectorDescription/IdDictDetDescrCnv/src/FaserIDDetDescrCnv.cxx
@@ -19,7 +19,6 @@
#include "IdDictDetDescr/IdDictManager.h"
#include "FaserDetDescr/FaserDetectorID.h"
-#include "CxxUtils/make_unique.h"
//<<<<<< PRIVATE DEFINES >>>>>>
//<<<<<< PRIVATE CONSTANTS >>>>>>
@@ -132,7 +131,7 @@ FaserIDDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pObj)
// create the helper
- auto faser_id = CxxUtils::make_unique<FaserDetectorID>();
+ auto faser_id = std::make_unique<FaserDetectorID>();
faser_id->setMessageSvc(msgSvc());
if (idDictMgr->initializeHelper(*faser_id)) {
diff --git a/Scintillator/ScintG4/VetoG4_SD/src/VetoSensorSDTool.cxx b/Scintillator/ScintG4/VetoG4_SD/src/VetoSensorSDTool.cxx
index bd19e951..c880dc21 100644
--- a/Scintillator/ScintG4/VetoG4_SD/src/VetoSensorSDTool.cxx
+++ b/Scintillator/ScintG4/VetoG4_SD/src/VetoSensorSDTool.cxx
@@ -24,7 +24,7 @@ VetoSensorSDTool::VetoSensorSDTool(const std::string& type, const std::string& n
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-G4VSensitiveDetector* VetoSensorSDTool::makeSD()
+G4VSensitiveDetector* VetoSensorSDTool::makeSD() const
{
ATH_MSG_DEBUG( "Creating Veto SD: " << name() );
return new VetoSensorSD(name(), m_outputCollectionNames[0]);
diff --git a/Scintillator/ScintG4/VetoG4_SD/src/VetoSensorSDTool.h b/Scintillator/ScintG4/VetoG4_SD/src/VetoSensorSDTool.h
index 33751c0b..8a139205 100644
--- a/Scintillator/ScintG4/VetoG4_SD/src/VetoSensorSDTool.h
+++ b/Scintillator/ScintG4/VetoG4_SD/src/VetoSensorSDTool.h
@@ -30,7 +30,7 @@ class VetoSensorSDTool : public SensitiveDetectorBase
protected:
// Make me an SD!
- G4VSensitiveDetector* makeSD() override final;
+ G4VSensitiveDetector* makeSD() const override final;
};
#endif //VETOG4_SD_VETOSENSORSDTOOL_H
diff --git a/Simulation/G4Faser/G4FaserInterfaces/CMakeLists.txt b/Simulation/G4Faser/G4FaserInterfaces/CMakeLists.txt
deleted file mode 100644
index b2c9cfb4..00000000
--- a/Simulation/G4Faser/G4FaserInterfaces/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-################################################################################
-# Package: G4FaserInterfaces
-################################################################################
-
-# Declare the package name:
-atlas_subdir( G4FaserInterfaces )
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- GaudiKernel )
-
-# External dependencies:
-find_package( CLHEP )
-find_package( Geant4 )
-find_package( XercesC )
-
-# Component(s) in the package:
-atlas_add_library( G4FaserInterfaces
- PUBLIC_HEADERS G4FaserInterfaces
- INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} GaudiKernel )
-
diff --git a/Simulation/G4Utilities/Geo2G4/CMakeLists.txt b/Simulation/G4Utilities/Geo2G4/CMakeLists.txt
index f30e1839..cc72f51f 100644
--- a/Simulation/G4Utilities/Geo2G4/CMakeLists.txt
+++ b/Simulation/G4Utilities/Geo2G4/CMakeLists.txt
@@ -32,7 +32,7 @@ find_package( GeoModel )
# Component(s) in the package:
atlas_add_library( Geo2G4Lib
src/*.cxx
- PUBLIC_HEADERS Geo2G4
+ NO_PUBLIC_HEADERS
INCLUDE_DIRS ${XERCESC_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${GEOMODEL_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
diff --git a/Tracker/TrackerG4/FaserSCT_G4_SD/src/FaserSctSensorSDTool.cxx b/Tracker/TrackerG4/FaserSCT_G4_SD/src/FaserSctSensorSDTool.cxx
index b1b3e9dd..322784b6 100644
--- a/Tracker/TrackerG4/FaserSCT_G4_SD/src/FaserSctSensorSDTool.cxx
+++ b/Tracker/TrackerG4/FaserSCT_G4_SD/src/FaserSctSensorSDTool.cxx
@@ -24,7 +24,7 @@ FaserSctSensorSDTool::FaserSctSensorSDTool(const std::string& type, const std::s
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-G4VSensitiveDetector* FaserSctSensorSDTool::makeSD()
+G4VSensitiveDetector* FaserSctSensorSDTool::makeSD() const
{
ATH_MSG_DEBUG( "Creating FaserSCT SD: " << name() );
return new FaserSctSensorSD(name(), m_outputCollectionNames[0]);
diff --git a/Tracker/TrackerG4/FaserSCT_G4_SD/src/FaserSctSensorSDTool.h b/Tracker/TrackerG4/FaserSCT_G4_SD/src/FaserSctSensorSDTool.h
index 2f53305d..d006d5ef 100644
--- a/Tracker/TrackerG4/FaserSCT_G4_SD/src/FaserSctSensorSDTool.h
+++ b/Tracker/TrackerG4/FaserSCT_G4_SD/src/FaserSctSensorSDTool.h
@@ -30,7 +30,7 @@ class FaserSctSensorSDTool : public SensitiveDetectorBase
protected:
// Make me an SD!
- G4VSensitiveDetector* makeSD() override final;
+ G4VSensitiveDetector* makeSD() const override final;
};
#endif //FASERSCT_G4_SD_FASERSCTSENSORSDTOOL_H
diff --git a/graphics/VTI12/VTI12Algs/CMakeLists.txt b/graphics/VTI12/VTI12Algs/CMakeLists.txt
index 6c233e64..dcfca1d4 100644
--- a/graphics/VTI12/VTI12Algs/CMakeLists.txt
+++ b/graphics/VTI12/VTI12Algs/CMakeLists.txt
@@ -28,7 +28,6 @@ atlas_add_component( VTI12Algs
PRIVATE_LINK_LIBRARIES VTI12Gui VP1UtilsBase )
# Install files from the package:
-atlas_install_headers( VTI12Algs )
atlas_install_python_modules( python/*.py )
atlas_install_joboptions( share/*.py )
atlas_install_scripts( share/vti12 )
diff --git a/graphics/VTI12/VTI12Systems/VTI12GuideLineSystems/CMakeLists.txt b/graphics/VTI12/VTI12Systems/VTI12GuideLineSystems/CMakeLists.txt
index 09c90e47..de63ebf7 100644
--- a/graphics/VTI12/VTI12Systems/VTI12GuideLineSystems/CMakeLists.txt
+++ b/graphics/VTI12/VTI12Systems/VTI12GuideLineSystems/CMakeLists.txt
@@ -27,7 +27,7 @@ set( CMAKE_AUTOMOC TRUE )
# Component(s) in the package:
atlas_add_library( VTI12GuideLineSystems VTI12GuideLineSystems/*.h src/*.cxx
- PUBLIC_HEADERS VP1GuideLineSystems
+ NO_PUBLIC_HEADERS
INCLUDE_DIRS ${COIN3D_INCLUDE_DIRS}
LINK_LIBRARIES ${COIN3D_LIBRARIES} GeoPrimitives VP1Base VTI12Utils
Qt5::Core Qt5::Gui
diff --git a/graphics/VTI12/VTI12Utils/src/SbPolyhedrizeAction.cxx b/graphics/VTI12/VTI12Utils/src/SbPolyhedrizeAction.cxx
index b09115f0..1f4a4f83 100644
--- a/graphics/VTI12/VTI12Utils/src/SbPolyhedrizeAction.cxx
+++ b/graphics/VTI12/VTI12Utils/src/SbPolyhedrizeAction.cxx
@@ -55,7 +55,7 @@ void SbPolyhedrizeAction::handleShift(const GeoShapeShift *shift)
#include <VP1HEPVis/SbRotation.h> //using doubles instead of floats.
HEPVis::SbRotation rot(rotation(0,0),rotation(1,0),rotation(2,0),0,
rotation(0,1),rotation(1,1),rotation(2,1),0,
- rotation(0,2),rotation(1,2),rotation(2.2),0,
+ rotation(0,2),rotation(1,2),rotation(2,2),0,
0,0,0,1);
//---
--
GitLab