From 9bbe12b080ce52615251facc6f6ff5dd58a60e69 Mon Sep 17 00:00:00 2001
From: Markus FRANK <Markus.Frank@cern.ch>
Date: Thu, 15 Apr 2021 15:02:50 +0200
Subject: [PATCH] Prepare for GFlash parametrization. Remove DDG4 legacy stuff.

---
 DDG4/plugins/Geant4ScintillationPhysics.cpp | 1 +
 DDG4/src/Geant4Converter.cpp                | 2 +-
 DDG4/src/Geant4PhysicsConstructor.cpp       | 2 ++
 DDG4/src/Geant4StepHandler.cpp              | 3 +++
 DDG4/src/Geant4UIManager.cpp                | 1 +
 5 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/DDG4/plugins/Geant4ScintillationPhysics.cpp b/DDG4/plugins/Geant4ScintillationPhysics.cpp
index be4db4122..bf37bc0a3 100644
--- a/DDG4/plugins/Geant4ScintillationPhysics.cpp
+++ b/DDG4/plugins/Geant4ScintillationPhysics.cpp
@@ -28,6 +28,7 @@
 #include "DDG4/Geant4PhysicsList.h"
 
 /// Geant4 include files
+#include "G4Version.hh"
 #include "G4ParticleTableIterator.hh"
 #include "G4ParticleDefinition.hh"
 #include "G4LossTableManager.hh"
diff --git a/DDG4/src/Geant4Converter.cpp b/DDG4/src/Geant4Converter.cpp
index d48e1bbda..47536eea6 100644
--- a/DDG4/src/Geant4Converter.cpp
+++ b/DDG4/src/Geant4Converter.cpp
@@ -36,6 +36,7 @@
 #include "TGeoBoolNode.h"
 
 // Geant4 include files
+#include "G4Version.hh"
 #include "G4VisAttributes.hh"
 #include "G4ProductionCuts.hh"
 #include "G4VUserRegionInformation.hh"
@@ -49,7 +50,6 @@
 #include "G4IntersectionSolid.hh"
 #include "G4VSensitiveDetector.hh"
 
-#include "G4Version.hh"
 #include "G4Region.hh"
 #include "G4Element.hh"
 #include "G4Element.hh"
diff --git a/DDG4/src/Geant4PhysicsConstructor.cpp b/DDG4/src/Geant4PhysicsConstructor.cpp
index b5ae6ca7e..bd4967336 100644
--- a/DDG4/src/Geant4PhysicsConstructor.cpp
+++ b/DDG4/src/Geant4PhysicsConstructor.cpp
@@ -15,6 +15,8 @@
 #include "DD4hep/InstanceCount.h"
 #include "DDG4/Geant4PhysicsConstructor.h"
 #include "G4VModularPhysicsList.hh"
+
+// Geant4 include files
 #include "G4Version.hh"
 
 using namespace dd4hep::sim;
diff --git a/DDG4/src/Geant4StepHandler.cpp b/DDG4/src/Geant4StepHandler.cpp
index 58aaad378..35c6ceae3 100644
--- a/DDG4/src/Geant4StepHandler.cpp
+++ b/DDG4/src/Geant4StepHandler.cpp
@@ -17,6 +17,9 @@
 #include "DD4hep/DD4hepUnits.h"
 #include "CLHEP/Units/SystemOfUnits.h"
 
+// Geant4 include files
+#include "G4Version.hh"
+
 namespace units = dd4hep;
 using namespace dd4hep;
 using namespace dd4hep::sim;
diff --git a/DDG4/src/Geant4UIManager.cpp b/DDG4/src/Geant4UIManager.cpp
index 9f6098d5d..07ccc9af3 100644
--- a/DDG4/src/Geant4UIManager.cpp
+++ b/DDG4/src/Geant4UIManager.cpp
@@ -19,6 +19,7 @@
 #include "DD4hep/Printout.h"
 
 // Geant4 include files
+#include "G4Version.hh"
 #include "G4VisExecutive.hh"
 #include "G4UImanager.hh"
 #include "G4UIsession.hh"
-- 
GitLab