Merge pull request #26901 from ianna/sim-physics-dependency-cleanup

SimG4: DD Direct Dependency Cleanup
cms-sw · May 27, 2019 · 3405700 · 3405700
2 parents 6ab9424 + eda8452
commit 3405700
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 4 deletions.
diff --git a/SimG4Core/Application/src/RunManager.cc b/SimG4Core/Application/src/RunManager.cc
@@ -14,7 +14,7 @@
 #include "SimG4Core/Geometry/interface/DDDWorld.h"
 #include "SimG4Core/Geometry/interface/G4LogicalVolumeToDDLogicalPartMap.h"
 #include "SimG4Core/Geometry/interface/SensitiveDetectorCatalog.h"
-#include "SimG4Core/Physics/interface/DDG4ProductionCuts.h"
+#include "SimG4Core/Geometry/interface/DDG4ProductionCuts.h"
 
 #include "SimG4Core/SensitiveDetector/interface/AttachSD.h"
 

diff --git a/SimG4Core/Application/src/RunManagerMT.cc b/SimG4Core/Application/src/RunManagerMT.cc
@@ -8,7 +8,7 @@
 
 #include "SimG4Core/Geometry/interface/DDDWorld.h"
 #include "SimG4Core/Geometry/interface/G4LogicalVolumeToDDLogicalPartMap.h"
-#include "SimG4Core/Physics/interface/DDG4ProductionCuts.h"
+#include "SimG4Core/Geometry/interface/DDG4ProductionCuts.h"
 
 #include "SimG4Core/SensitiveDetector/interface/AttachSD.h"
 

diff --git a/SimG4Core/CustomPhysics/BuildFile.xml b/SimG4Core/CustomPhysics/BuildFile.xml
@@ -9,3 +9,4 @@
 <use   name="geant4core"/>
 <use   name="clhep"/>
 <use   name="boost"/>
+<use   name="rootmath"/>
diff --git a/...re/Physics/interface/DDG4ProductionCuts.h → ...e/Geometry/interface/DDG4ProductionCuts.h b/...re/Physics/interface/DDG4ProductionCuts.h → ...e/Geometry/interface/DDG4ProductionCuts.h
diff --git a/SimG4Core/Physics/src/DDG4ProductionCuts.cc → SimG4Core/Geometry/src/DDG4ProductionCuts.cc b/SimG4Core/Physics/src/DDG4ProductionCuts.cc → SimG4Core/Geometry/src/DDG4ProductionCuts.cc
@@ -1,4 +1,4 @@
-#include "SimG4Core/Physics/interface/DDG4ProductionCuts.h"
+#include "SimG4Core/Geometry/interface/DDG4ProductionCuts.h"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Utilities/interface/Exception.h"

diff --git a/SimG4Core/Physics/BuildFile.xml b/SimG4Core/Physics/BuildFile.xml
@@ -1,7 +1,6 @@
 <export>
   <lib   name="1"/>
 </export>
-<use   name="DetectorDescription/Core"/>
 <use   name="FWCore/ParameterSet"/>
 <use   name="geant4core"/>
 <use   name="heppdt"/>