From fbd021bd35ca72389be0dde08d33b3a43a74c545 Mon Sep 17 00:00:00 2001
From: Andre Sailer <andre.philippe.sailer@cern.ch>
Date: Tue, 17 Mar 2015 12:50:58 +0000
Subject: [PATCH] ClientTests: use environment variable instead of relative
path
---
examples/ClientTests/compact/Assemblies.xml | 4 ++--
examples/ClientTests/compact/BoxTrafos.xml | 4 ++--
examples/ClientTests/compact/FCC_HcalBarrel.xml | 4 ++--
examples/ClientTests/compact/IronCylinder.xml | 4 ++--
examples/ClientTests/compact/LheD_tracker.xml | 4 ++--
examples/ClientTests/compact/MagnetFields.xml | 6 +++---
examples/ClientTests/compact/NestedDetectors.xml | 2 +-
examples/ClientTests/compact/SectorBarrelCalorimeter.xml | 4 ++--
examples/ClientTests/compact/SiliconBlock.xml | 4 ++--
9 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/examples/ClientTests/compact/Assemblies.xml b/examples/ClientTests/compact/Assemblies.xml
index a8d4a5cd0..2b299a522 100644
--- a/examples/ClientTests/compact/Assemblies.xml
+++ b/examples/ClientTests/compact/Assemblies.xml
@@ -12,8 +12,8 @@
</info>
<includes>
- <gdmlFile ref="../../../DDDetectors/compact/elements.xml"/>
- <gdmlFile ref="../../../DDDetectors/compact/materials.xml"/>
+ <gdmlFile ref="${DD4hepINSTALL}/DDDetectors/compact/elements.xml"/>
+ <gdmlFile ref="${DD4hepINSTALL}/DDDetectors/compact/materials.xml"/>
</includes>
<define>
diff --git a/examples/ClientTests/compact/BoxTrafos.xml b/examples/ClientTests/compact/BoxTrafos.xml
index 1131b7115..7d1f97b98 100644
--- a/examples/ClientTests/compact/BoxTrafos.xml
+++ b/examples/ClientTests/compact/BoxTrafos.xml
@@ -12,8 +12,8 @@
</info>
<includes>
- <gdmlFile ref="../../../DDDetectors/compact/elements.xml"/>
- <gdmlFile ref="../../../DDDetectors/compact/materials.xml"/>
+ <gdmlFile ref="${DD4hepINSTALL}/DDDetectors/compact/elements.xml"/>
+ <gdmlFile ref="${DD4hepINSTALL}/DDDetectors/compact/materials.xml"/>
</includes>
<define>
diff --git a/examples/ClientTests/compact/FCC_HcalBarrel.xml b/examples/ClientTests/compact/FCC_HcalBarrel.xml
index 24b3d883a..4ba1d4314 100644
--- a/examples/ClientTests/compact/FCC_HcalBarrel.xml
+++ b/examples/ClientTests/compact/FCC_HcalBarrel.xml
@@ -4,8 +4,8 @@
xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
<includes>
- <gdmlFile ref="../../../DDDetectors/compact/elements.xml"/>
- <gdmlFile ref="../../../DDDetectors/compact/materials.xml"/>
+ <gdmlFile ref="${DD4hepINSTALL}/DDDetectors/compact/elements.xml"/>
+ <gdmlFile ref="${DD4hepINSTALL}/DDDetectors/compact/materials.xml"/>
</includes>
<define>
diff --git a/examples/ClientTests/compact/IronCylinder.xml b/examples/ClientTests/compact/IronCylinder.xml
index 1659db583..36c9b0ab1 100644
--- a/examples/ClientTests/compact/IronCylinder.xml
+++ b/examples/ClientTests/compact/IronCylinder.xml
@@ -4,8 +4,8 @@
xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
<includes>
- <gdmlFile ref="../../../DDDetectors/compact/elements.xml"/>
- <gdmlFile ref="../../../DDDetectors/compact/materials.xml"/>
+ <gdmlFile ref="${DD4hepINSTALL}/DDDetectors/compact/elements.xml"/>
+ <gdmlFile ref="${DD4hepINSTALL}/DDDetectors/compact/materials.xml"/>
</includes>
<define>
diff --git a/examples/ClientTests/compact/LheD_tracker.xml b/examples/ClientTests/compact/LheD_tracker.xml
index b0d0401a0..29377080a 100644
--- a/examples/ClientTests/compact/LheD_tracker.xml
+++ b/examples/ClientTests/compact/LheD_tracker.xml
@@ -12,8 +12,8 @@
</info>
<includes>
- <gdmlFile ref="../../../DDDetectors/compact/elements.xml"/>
- <gdmlFile ref="../../../DDDetectors/compact/materials.xml"/>
+ <gdmlFile ref="${DD4hepINSTALL}/DDDetectors/compact/elements.xml"/>
+ <gdmlFile ref="${DD4hepINSTALL}/DDDetectors/compact/materials.xml"/>
</includes>
<define>
diff --git a/examples/ClientTests/compact/MagnetFields.xml b/examples/ClientTests/compact/MagnetFields.xml
index 05997b2c2..0b7ddf5f5 100644
--- a/examples/ClientTests/compact/MagnetFields.xml
+++ b/examples/ClientTests/compact/MagnetFields.xml
@@ -12,8 +12,8 @@
</info>
<includes>
- <gdmlFile ref="../../../DDDetectors/compact/elements.xml"/>
- <gdmlFile ref="../../../DDDetectors/compact/materials.xml"/>
+ <gdmlFile ref="${DD4hepINSTALL}/DDDetectors/compact/elements.xml"/>
+ <gdmlFile ref="${DD4hepINSTALL}/DDDetectors/compact/materials.xml"/>
</includes>
<define>
@@ -25,7 +25,7 @@
</define>
<detectors>
- <include ref="../../../DDDetectors/compact/SiD.xml"/>
+ <include ref="${DD4hepINSTALL}/DDDetectors/compact/SiD.xml"/>
</detectors>
<fields>
diff --git a/examples/ClientTests/compact/NestedDetectors.xml b/examples/ClientTests/compact/NestedDetectors.xml
index cd3d3e2a4..c4cc55cb1 100644
--- a/examples/ClientTests/compact/NestedDetectors.xml
+++ b/examples/ClientTests/compact/NestedDetectors.xml
@@ -17,7 +17,7 @@
</includes>
<define>
- <constant name="DDDetectors_dir" value="../../../DDDetectors/compact" type="string"/>;
+ <constant name="DDDetectors_dir" value="${DD4hepINSTALL}/DDDetectors/compact" type="string"/>;
<constant name="SiD_dir" value="${DDDetectors_dir}/SiD" type="string"/>;
<constant name="world_side" value="30000*mm"/>
<constant name="world_x" value="world_side"/>
diff --git a/examples/ClientTests/compact/SectorBarrelCalorimeter.xml b/examples/ClientTests/compact/SectorBarrelCalorimeter.xml
index 4e454adef..ab226ec84 100644
--- a/examples/ClientTests/compact/SectorBarrelCalorimeter.xml
+++ b/examples/ClientTests/compact/SectorBarrelCalorimeter.xml
@@ -12,8 +12,8 @@
</info>
<includes>
- <gdmlFile ref="../../../DDDetectors/compact/elements.xml"/>
- <gdmlFile ref="../../../DDDetectors/compact/materials.xml"/>
+ <gdmlFile ref="${DD4hepINSTALL}/DDDetectors/compact/elements.xml"/>
+ <gdmlFile ref="${DD4hepINSTALL}/DDDetectors/compact/materials.xml"/>
</includes>
<materials>
diff --git a/examples/ClientTests/compact/SiliconBlock.xml b/examples/ClientTests/compact/SiliconBlock.xml
index d9edaaa64..0d42d9140 100644
--- a/examples/ClientTests/compact/SiliconBlock.xml
+++ b/examples/ClientTests/compact/SiliconBlock.xml
@@ -13,8 +13,8 @@
</info>
<includes>
- <gdmlFile ref="../../../DDDetectors/compact/elements.xml"/>
- <gdmlFile ref="../../../DDDetectors/compact/materials.xml"/>
+ <gdmlFile ref="${DD4hepINSTALL}/DDDetectors/compact/elements.xml"/>
+ <gdmlFile ref="${DD4hepINSTALL}/DDDetectors/compact/materials.xml"/>
</includes>
<define>
--
GitLab