From cda68df042f9ab99537a653b5c83b5956a515784 Mon Sep 17 00:00:00 2001
From: Markus Frank <Markus.Frank@cern.ch>
Date: Fri, 24 May 2019 19:04:19 +0200
Subject: [PATCH] Allow for dd4hep units in material tables
---
DDG4/src/Geant4Converter.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/DDG4/src/Geant4Converter.cpp b/DDG4/src/Geant4Converter.cpp
index 3ef4234b2..533587406 100644
--- a/DDG4/src/Geant4Converter.cpp
+++ b/DDG4/src/Geant4Converter.cpp
@@ -92,7 +92,7 @@
#include "G4LogicalSkinSurface.hh"
#include "G4LogicalBorderSurface.hh"
#include "G4MaterialPropertiesTable.hh"
-#if G4VERSION_NUMBER>1030
+#if G4VERSION_NUMBER >= 1040
#include "G4MaterialPropertiesIndex.hh"
#endif
#include "CLHEP/Units/SystemOfUnits.h"
@@ -272,7 +272,7 @@ namespace {
pair<double,double> g4PropertyConversion(int index) {
-#if G4VERSION_NUMBER>1030
+#if G4VERSION_NUMBER >= 1040
switch(index) {
case kRINDEX: return make_pair(CLHEP::keV/units::keV, 1.0);
case kREFLECTIVITY: return make_pair(CLHEP::keV/units::keV, 1.0);
@@ -308,7 +308,7 @@ namespace {
}
double g4ConstPropertyConversion(int index) {
-#if G4VERSION_NUMBER>1030
+#if G4VERSION_NUMBER >= 1040
switch(index) {
case kSURFACEROUGHNESS: return 1.0; // ??
case kISOTHERMAL_COMPRESSIBILITY: return 1.0; // ??
--
GitLab