From 6d50562ed86b2b042ecb90335706b66cb88c0084 Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Fri, 30 Sep 2022 12:55:28 +0200
Subject: [PATCH 01/42] Updating materials file

---
 examples/04.MuonScan/setup.gdml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/04.MuonScan/setup.gdml b/examples/04.MuonScan/setup.gdml
index d08ecbfd..23676aef 100644
--- a/examples/04.MuonScan/setup.gdml
+++ b/examples/04.MuonScan/setup.gdml
@@ -3,7 +3,7 @@
 
 <!DOCTYPE gdml [
         <!ENTITY geometry SYSTEM "geometry.gdml">
-        <!ENTITY materials SYSTEM "https://sultan.unizar.es/materials/materials.xml">
+        <!ENTITY gases SYSTEM "https://sultan.unizar.es/materials/gases.xml">
         ]>
 
 <gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -24,7 +24,7 @@
         <variable name="gasPressure" value="1"/> <!-- bar -->
     </define>
 
-    &materials;
+    &gases;
 
     &geometry;
 

From fe6612a0f2b256c7119fc0166254564cb87bc27f Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Fri, 30 Sep 2022 18:36:20 +0200
Subject: [PATCH 02/42] 04.MuonScan/setup.gdml the entity must be named
 materials to be properly read by TRestGeant4Metadata

---
 examples/04.MuonScan/setup.gdml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/04.MuonScan/setup.gdml b/examples/04.MuonScan/setup.gdml
index 23676aef..618c51d0 100644
--- a/examples/04.MuonScan/setup.gdml
+++ b/examples/04.MuonScan/setup.gdml
@@ -3,7 +3,7 @@
 
 <!DOCTYPE gdml [
         <!ENTITY geometry SYSTEM "geometry.gdml">
-        <!ENTITY gases SYSTEM "https://sultan.unizar.es/materials/gases.xml">
+        <!ENTITY materials SYSTEM "https://sultan.unizar.es/materials/gases.xml">
         ]>
 
 <gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -24,7 +24,7 @@
         <variable name="gasPressure" value="1"/> <!-- bar -->
     </define>
 
-    &gases;
+    &materials;
 
     &geometry;
 

From 1aa90000732081198794ae04e026a31e74858b26 Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Fri, 30 Sep 2022 18:36:57 +0200
Subject: [PATCH 03/42] Validate.C validation values updated due to changes in
 Argon composition

---
 examples/04.MuonScan/Validate.C | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/examples/04.MuonScan/Validate.C b/examples/04.MuonScan/Validate.C
index e6358851..05ffb797 100644
--- a/examples/04.MuonScan/Validate.C
+++ b/examples/04.MuonScan/Validate.C
@@ -51,6 +51,12 @@ Int_t Validate(const char* filename) {
         return 7;
     }
 
+    if (geant4Metadata->GetMaterialsReference() != "0.0") {
+        cout << "Materials version was not defined!" << endl;
+        cout << "The parent run number from restG4 generated file should be 0" << endl;
+        return 8;
+    }
+
     TRestGeant4Event* event = run.GetInputEvent<TRestGeant4Event>();
 
     double nEvents = run.GetEntries();
@@ -59,16 +65,16 @@ Int_t Validate(const char* filename) {
     constexpr double averageTotalEnergyRef = 18.074;
 
     double averageSensitiveEnergy = 0;
-    constexpr double averageSensitiveEnergyRef = 8.99048;
+    constexpr double averageSensitiveEnergyRef = 8.96635;
 
     double averageNumberOfTracks = 0;
-    constexpr double averageNumberOfTracksRef = 432.763;
+    constexpr double averageNumberOfTracksRef = 393.195;
 
     double averageNumberOfHitsVolume0 = 0;
-    constexpr double averageNumberOfHitsVolume0Ref = 66.317;
+    constexpr double averageNumberOfHitsVolume0Ref = 66.076;
 
     double averageNumberOfHitsVolume1 = 0;
-    constexpr double averageNumberOfHitsVolume1Ref = 61.555;
+    constexpr double averageNumberOfHitsVolume1Ref = 59.981;
 
     TVector3 averagePosition = {};
     const TVector3 averagePositionRef = {-0.59902, 0.0256995, 300.385};
@@ -97,7 +103,7 @@ Int_t Validate(const char* filename) {
     if (TMath::Abs(averageNumberOfTracks - averageNumberOfTracksRef) / averageNumberOfTracksRef > tolerance) {
         cout << "The average number of tracks does not match the reference value of "
              << averageNumberOfTracksRef << endl;
-        return 8;
+        return 9;
     }
 
     if (TMath::Abs(averageNumberOfHitsVolume0 - averageNumberOfHitsVolume0Ref) /
@@ -105,7 +111,7 @@ Int_t Validate(const char* filename) {
         tolerance) {
         cout << "The average number of hits in volume 0 does not match the reference value of "
              << averageNumberOfHitsVolume0Ref << endl;
-        return 9;
+        return 10;
     }
 
     if (TMath::Abs(averageNumberOfHitsVolume1 - averageNumberOfHitsVolume1Ref) /
@@ -113,27 +119,27 @@ Int_t Validate(const char* filename) {
         tolerance) {
         cout << "The average number of hits in volume 1 does not match the reference value of "
              << averageNumberOfHitsVolume1Ref << endl;
-        return 10;
+        return 11;
     }
 
     if (TMath::Abs(averageSensitiveEnergy - averageSensitiveEnergyRef) / averageSensitiveEnergyRef >
         tolerance) {
         cout << "The average sensitive volume energy does not match the reference value of "
              << averageSensitiveEnergyRef << endl;
-        return 11;
+        return 12;
     }
 
     if (TMath::Abs(averageTotalEnergy - averageTotalEnergyRef) / averageTotalEnergyRef > tolerance) {
         cout << "The average total energy does not match the reference value of " << averageTotalEnergyRef
              << endl;
-        return 12;
+        return 13;
     }
 
     if (TMath::Abs(averagePosition.Mag() - averagePositionRef.Mag()) / averagePositionRef.Mag() > tolerance) {
         cout << "The average position does not match the reference value of "
              << "(" << averagePositionRef.x() << ", " << averagePositionRef.y() << ", "
              << averagePositionRef.z() << ") mm" << endl;
-        return 13;
+        return 14;
     }
 
     return 0;

From 0cf65c6f794f990446108886444280411c666f1a Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Fri, 30 Sep 2022 18:44:45 +0200
Subject: [PATCH 04/42] 04.MuonScan updating geometry name

---
 examples/04.MuonScan/setup.gdml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/04.MuonScan/setup.gdml b/examples/04.MuonScan/setup.gdml
index 618c51d0..2b781588 100644
--- a/examples/04.MuonScan/setup.gdml
+++ b/examples/04.MuonScan/setup.gdml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="no" ?>
-<!-- ##VERSION TREX-DM Basic geometry Version 1.1 (Ar_ISO - 1 bar - Quencher: 0.01 )## -->
+<!-- ##VERSION Cosmic Bench Version 1.1 (Ar_ISO - 1 bar - Quencher: 0.01 )## -->
 
 <!DOCTYPE gdml [
         <!ENTITY geometry SYSTEM "geometry.gdml">

From 3b4afb6b97f9565992aec75485e22f91bd8cece0 Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Fri, 30 Sep 2022 18:55:43 +0200
Subject: [PATCH 05/42] Updating materials file and validation values to
 fulfill with G4_Xe properties

---
 examples/01.NLDBD/Validate.C                    | 10 +++++-----
 examples/01.NLDBD/geometry/mySetupTemplate.gdml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/01.NLDBD/Validate.C b/examples/01.NLDBD/Validate.C
index ec5c0d50..ae09d5c4 100644
--- a/examples/01.NLDBD/Validate.C
+++ b/examples/01.NLDBD/Validate.C
@@ -57,19 +57,19 @@ Int_t Validate(const char* filename) {
     double nEvents = run.GetEntries();
 
     double averageTotalEnergy = 0;
-    const double averageTotalEnergyRef = (!isReferenceGeant4Version) ? 2280.96 : 2221.55;
+    const double averageTotalEnergyRef = (!isReferenceGeant4Version) ? 2321.41 : 2221.55;
 
     double averageSensitiveEnergy = 0;
-    const double averageSensitiveEnergyRef = (!isReferenceGeant4Version) ? 2280.96 : 2221.55;
+    const double averageSensitiveEnergyRef = (!isReferenceGeant4Version) ? 2321.41 : 2221.55;
 
     double averageNumberOfHits = 0;
-    const double averageNumberOfHitsRef = (!isReferenceGeant4Version) ? 5371.17 : 353.2;
+    const double averageNumberOfHitsRef = (!isReferenceGeant4Version) ? 5437.37 : 353.2;
 
     double averageNumberOfTracks = 0;
-    const double averageNumberOfTracksRef = (!isReferenceGeant4Version) ? 2300 : 10.83;
+    const double averageNumberOfTracksRef = (!isReferenceGeant4Version) ? 2309.69 : 10.83;
 
     TVector3 averagePosition = {};
-    const TVector3 averagePositionRef = (!isReferenceGeant4Version) ? TVector3(-38.8987, 27.5536, 91.3969)
+    const TVector3 averagePositionRef = (!isReferenceGeant4Version) ? TVector3(26.7015, -3.27037, -113.293)
                                                                     : TVector3(-17.8046, -32.5019, -31.8353);
 
     const double tolerance = 0.001;
diff --git a/examples/01.NLDBD/geometry/mySetupTemplate.gdml b/examples/01.NLDBD/geometry/mySetupTemplate.gdml
index 67db22f6..db4d25ad 100644
--- a/examples/01.NLDBD/geometry/mySetupTemplate.gdml
+++ b/examples/01.NLDBD/geometry/mySetupTemplate.gdml
@@ -3,7 +3,7 @@
 
 <!DOCTYPE gdml [
         <!ENTITY geometry SYSTEM "myGeometryTemplate.gdml">
-        <!ENTITY materials SYSTEM "https://sultan.unizar.es/materials/materials.xml">
+        <!ENTITY materials SYSTEM "https://sultan.unizar.es/materials/gases.xml">
         ]>
 
 <gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

From e5e95b68e6caf51e15beb729d564a5df6f6727ca Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Fri, 30 Sep 2022 19:06:45 +0200
Subject: [PATCH 06/42] 03.Fluorescence updating materials file

---
 examples/03.Fluorescence/geometry/setup.gdml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/03.Fluorescence/geometry/setup.gdml b/examples/03.Fluorescence/geometry/setup.gdml
index b7f7d36d..f49e38fd 100644
--- a/examples/03.Fluorescence/geometry/setup.gdml
+++ b/examples/03.Fluorescence/geometry/setup.gdml
@@ -3,7 +3,7 @@
 
 <!DOCTYPE gdml [
         <!ENTITY geometry SYSTEM "geometry.gdml">
-        <!ENTITY materials SYSTEM "https://sultan.unizar.es/materials/materials.xml">
+        <!ENTITY materials SYSTEM "https://sultan.unizar.es/materials/gases.xml">
         ]>
 
 <gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

From 3eeb35319597c769b9a0feaf6f7b9522b3cb2855 Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Fri, 30 Sep 2022 19:09:57 +0200
Subject: [PATCH 07/42] 04.MuonScan. Fixing material version validation

---
 examples/04.MuonScan/Validate.C | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/examples/04.MuonScan/Validate.C b/examples/04.MuonScan/Validate.C
index 05ffb797..e1ca7774 100644
--- a/examples/04.MuonScan/Validate.C
+++ b/examples/04.MuonScan/Validate.C
@@ -51,9 +51,8 @@ Int_t Validate(const char* filename) {
         return 7;
     }
 
-    if (geant4Metadata->GetMaterialsReference() != "0.0") {
+    if (geant4Metadata->GetMaterialsReference() == "0.0") {
         cout << "Materials version was not defined!" << endl;
-        cout << "The parent run number from restG4 generated file should be 0" << endl;
         return 8;
     }
 

From 687015f05ba0cec8f4adda115230b1c6ef5b052b Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Fri, 30 Sep 2022 19:21:39 +0200
Subject: [PATCH 08/42] 06.IonRecoils Updating validation values due to gas
 composition update

---
 examples/06.IonRecoils/Validate.C          | 2 +-
 examples/06.IonRecoils/geometry/setup.gdml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/06.IonRecoils/Validate.C b/examples/06.IonRecoils/Validate.C
index a9f25b2b..2f56a951 100644
--- a/examples/06.IonRecoils/Validate.C
+++ b/examples/06.IonRecoils/Validate.C
@@ -16,7 +16,7 @@ Int_t Validate(const char* filename) {
     const bool isReferenceGeant4Version = geant4Metadata->GetGeant4Version() == "10.4.3";
 
     double averageNumberOfHits = 0;
-    const double averageNumberOfHitsRef = (!isReferenceGeant4Version) ? 14413.5 : 11223.0;
+    const double averageNumberOfHitsRef = (!isReferenceGeant4Version) ? 11573.5 : 11223.0;
     const double tolerance = 0.001;
 
     for (int i = 0; i < run.GetEntries(); i++) {
diff --git a/examples/06.IonRecoils/geometry/setup.gdml b/examples/06.IonRecoils/geometry/setup.gdml
index 9cdd9b9c..d769c5bb 100644
--- a/examples/06.IonRecoils/geometry/setup.gdml
+++ b/examples/06.IonRecoils/geometry/setup.gdml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="no" ?>
-<!-- ##VERSION REST Example 01.NLDBD Version 1.0## -->
+<!-- ##VERSION REST Example 06.IonRecoils Version 1.0## -->
 
 <!DOCTYPE gdml [
         <!ENTITY geometry SYSTEM "geometry.gdml">
-        <!ENTITY materials SYSTEM "https://sultan.unizar.es/materials/materials.xml">
+        <!ENTITY materials SYSTEM "https://sultan.unizar.es/materials/gases.xml">
         ]>
 
 <gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

From fc491bd7585eaa6dbe82eb99d40021410fdb4403 Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Sat, 1 Oct 2022 08:13:29 +0200
Subject: [PATCH 09/42] 07.FullChainDecay updating validation

---
 .github/workflows/validation.yml               | 2 +-
 .gitlab-ci.yml                                 | 2 +-
 examples/07.FullChainDecay/geometry/setup.gdml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml
index 81de0c9f..caf598e4 100644
--- a/.github/workflows/validation.yml
+++ b/.github/workflows/validation.yml
@@ -269,7 +269,7 @@ jobs:
           source ${{ env.REST_PATH }}/thisREST.sh
           cd ${{ env.REST_PATH }}/examples/restG4/07.FullChainDecay/
           restG4 fullChain.rml -o Run00001_U238_FullChainDecay.root
-          restRoot -b -q Validate.C'("Run00001_U238_FullChainDecay.root", 17)'
+          restRoot -b -q Validate.C'("Run00001_U238_FullChainDecay.root", 15)'
           restG4 singleDecay.rml -o Run00002_U238_SingleChainDecay.root
           restRoot -b -q Validate.C'("Run00002_U238_SingleChainDecay.root", 1)'
           export REST_ISOTOPE=Be7
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7f412c43..31cdd8c0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -124,7 +124,7 @@ Load REST Libraries:
     - cd ${CI_PROJECT_DIR}/install/examples/restG4/07.FullChainDecay/
     - restG4 fullChain.rml
     - restG4 singleDecay.rml
-    - restRoot -b -q Validate.C'("Run00001_U238_FullChainDecay.root", 17)'
+    - restRoot -b -q Validate.C'("Run00001_U238_FullChainDecay.root", 15)'
     - restRoot -b -q Validate.C'("Run00002_U238_SingleChainDecay.root", 1)'
     - export REST_ISOTOPE="Be7"
     - restG4 singleDecay.rml
diff --git a/examples/07.FullChainDecay/geometry/setup.gdml b/examples/07.FullChainDecay/geometry/setup.gdml
index b7f7d36d..f49e38fd 100644
--- a/examples/07.FullChainDecay/geometry/setup.gdml
+++ b/examples/07.FullChainDecay/geometry/setup.gdml
@@ -3,7 +3,7 @@
 
 <!DOCTYPE gdml [
         <!ENTITY geometry SYSTEM "geometry.gdml">
-        <!ENTITY materials SYSTEM "https://sultan.unizar.es/materials/materials.xml">
+        <!ENTITY materials SYSTEM "https://sultan.unizar.es/materials/gases.xml">
         ]>
 
 <gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

From c88166ef8b9c154dc3c2f11f01918d4a69036724 Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Sat, 1 Oct 2022 08:24:07 +0200
Subject: [PATCH 10/42] 01.NLDBD updating validation value

---
 examples/01.NLDBD/Validate.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/01.NLDBD/Validate.C b/examples/01.NLDBD/Validate.C
index ae09d5c4..9bd210c2 100644
--- a/examples/01.NLDBD/Validate.C
+++ b/examples/01.NLDBD/Validate.C
@@ -63,7 +63,7 @@ Int_t Validate(const char* filename) {
     const double averageSensitiveEnergyRef = (!isReferenceGeant4Version) ? 2321.41 : 2221.55;
 
     double averageNumberOfHits = 0;
-    const double averageNumberOfHitsRef = (!isReferenceGeant4Version) ? 5437.37 : 353.2;
+    const double averageNumberOfHitsRef = (!isReferenceGeant4Version) ? 5281.31 : 353.2;
 
     double averageNumberOfTracks = 0;
     const double averageNumberOfTracksRef = (!isReferenceGeant4Version) ? 2309.69 : 10.83;

From a348d63a487db2869646e64f9ef569ae959267d1 Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Sat, 1 Oct 2022 08:27:06 +0200
Subject: [PATCH 11/42] 01.NLDBD Updating validation values

---
 examples/01.NLDBD/Validate.C | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/01.NLDBD/Validate.C b/examples/01.NLDBD/Validate.C
index 9bd210c2..60552043 100644
--- a/examples/01.NLDBD/Validate.C
+++ b/examples/01.NLDBD/Validate.C
@@ -57,19 +57,19 @@ Int_t Validate(const char* filename) {
     double nEvents = run.GetEntries();
 
     double averageTotalEnergy = 0;
-    const double averageTotalEnergyRef = (!isReferenceGeant4Version) ? 2321.41 : 2221.55;
+    const double averageTotalEnergyRef = (!isReferenceGeant4Version) ? 2237.02 : 2221.55;
 
     double averageSensitiveEnergy = 0;
-    const double averageSensitiveEnergyRef = (!isReferenceGeant4Version) ? 2321.41 : 2221.55;
+    const double averageSensitiveEnergyRef = (!isReferenceGeant4Version) ? 2237.02 : 2221.55;
 
     double averageNumberOfHits = 0;
     const double averageNumberOfHitsRef = (!isReferenceGeant4Version) ? 5281.31 : 353.2;
 
     double averageNumberOfTracks = 0;
-    const double averageNumberOfTracksRef = (!isReferenceGeant4Version) ? 2309.69 : 10.83;
+    const double averageNumberOfTracksRef = (!isReferenceGeant4Version) ? 2277.62 : 10.83;
 
     TVector3 averagePosition = {};
-    const TVector3 averagePositionRef = (!isReferenceGeant4Version) ? TVector3(26.7015, -3.27037, -113.293)
+    const TVector3 averagePositionRef = (!isReferenceGeant4Version) ? TVector3(-17.4834, -15.4111, -31.5935)
                                                                     : TVector3(-17.8046, -32.5019, -31.8353);
 
     const double tolerance = 0.001;

From 1fbf0f882b0103bb28f3e3954c2b0b74fa51dde1 Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Sat, 1 Oct 2022 20:15:32 +0200
Subject: [PATCH 12/42] 04.MuonScan validating values

---
 examples/04.MuonScan/Validate.C | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/04.MuonScan/Validate.C b/examples/04.MuonScan/Validate.C
index e1ca7774..c253f8f7 100644
--- a/examples/04.MuonScan/Validate.C
+++ b/examples/04.MuonScan/Validate.C
@@ -61,22 +61,22 @@ Int_t Validate(const char* filename) {
     double nEvents = run.GetEntries();
 
     double averageTotalEnergy = 0;
-    constexpr double averageTotalEnergyRef = 18.074;
+    constexpr double averageTotalEnergyRef = 18.3461;
 
     double averageSensitiveEnergy = 0;
-    constexpr double averageSensitiveEnergyRef = 8.96635;
+    constexpr double averageSensitiveEnergyRef = 8.59475;
 
     double averageNumberOfTracks = 0;
-    constexpr double averageNumberOfTracksRef = 393.195;
+    constexpr double averageNumberOfTracksRef = 394.381;
 
     double averageNumberOfHitsVolume0 = 0;
-    constexpr double averageNumberOfHitsVolume0Ref = 66.076;
+    constexpr double averageNumberOfHitsVolume0Ref = 69.092;
 
     double averageNumberOfHitsVolume1 = 0;
-    constexpr double averageNumberOfHitsVolume1Ref = 59.981;
+    constexpr double averageNumberOfHitsVolume1Ref = 58.31;
 
     TVector3 averagePosition = {};
-    const TVector3 averagePositionRef = {-0.59902, 0.0256995, 300.385};
+    const TVector3 averagePositionRef = {0.338143, -0.291832, 300.517};
 
     constexpr double tolerance = 0.001;
 

From 1f934b7204e6dae9d22cc6fac5dd8a69455a62ee Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Sat, 1 Oct 2022 20:35:57 +0200
Subject: [PATCH 13/42] 06.IonRecoils fixing validation value

---
 examples/06.IonRecoils/Validate.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/06.IonRecoils/Validate.C b/examples/06.IonRecoils/Validate.C
index 2f56a951..fb92fac6 100644
--- a/examples/06.IonRecoils/Validate.C
+++ b/examples/06.IonRecoils/Validate.C
@@ -16,7 +16,7 @@ Int_t Validate(const char* filename) {
     const bool isReferenceGeant4Version = geant4Metadata->GetGeant4Version() == "10.4.3";
 
     double averageNumberOfHits = 0;
-    const double averageNumberOfHitsRef = (!isReferenceGeant4Version) ? 11573.5 : 11223.0;
+    const double averageNumberOfHitsRef = (!isReferenceGeant4Version) ? 14417.5 : 11223.0;
     const double tolerance = 0.001;
 
     for (int i = 0; i < run.GetEntries(); i++) {

From 15e98900a9b55890d32daeb7f35180ad849724df Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Sat, 1 Oct 2022 20:37:41 +0200
Subject: [PATCH 14/42] 08.Alphas. Changing material to gases.rml

---
 examples/08.Alphas/geometry/setup.gdml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/08.Alphas/geometry/setup.gdml b/examples/08.Alphas/geometry/setup.gdml
index 4d2ea411..13bc8910 100644
--- a/examples/08.Alphas/geometry/setup.gdml
+++ b/examples/08.Alphas/geometry/setup.gdml
@@ -3,7 +3,7 @@
 
 <!DOCTYPE gdml [
         <!ENTITY geometry SYSTEM "geometry.gdml">
-        <!ENTITY materials SYSTEM "https://sultan.unizar.es/materials/materials.xml">
+        <!ENTITY materials SYSTEM "https://sultan.unizar.es/materials/gases.xml">
         ]>
 
 <gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

From 61a26f3d132402d21de07fd5da372205d5135e4e Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Sun, 2 Oct 2022 10:15:51 +0200
Subject: [PATCH 15/42] 08.Alphas. Fixing validation values due to change of
 materials file

---
 examples/08.Alphas/Validate.C | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/examples/08.Alphas/Validate.C b/examples/08.Alphas/Validate.C
index cdddbb15..8001fc0d 100644
--- a/examples/08.Alphas/Validate.C
+++ b/examples/08.Alphas/Validate.C
@@ -24,50 +24,51 @@ Int_t Validate() {
     constexpr Double_t thetaAverageRef = 1.5767;
 
     Double_t phiAverage = analysisTree->GetObservableAverage("g4Ana_phiPrimary");
-    constexpr Double_t phiAverageRef = 0.069711;
+    constexpr Double_t phiAverageRef = 0.0719113;
 
     cout << "entry 100, theta: " << thetaSample << ", phi: " << phiSample << endl;
     cout << "average theta: " << thetaAverage << ", average phi: " << phiAverage << endl;
 
-    if (h1->Integral() != 1989) {
-        cout << "Wrong number of alphas produced at 1MeV_5um!" << endl;
+    if (h1->Integral() != 1984) {
+        cout << "Wrong number of alphas produced at (h1) 1MeV_5um!" << endl;
         cout << "Histogram contains : " << h1->Integral() << endl;
         return 10;
     }
 
-    if (h2->Integral() != 7422) {
-        cout << "Wrong number of alphas produced at 5MeV_5um!" << endl;
+    if (h2->Integral() != 7432) {
+        cout << "Wrong number of alphas produced at (h2) 5MeV_5um!" << endl;
         cout << "Histogram contains : " << h2->Integral() << endl;
         return 20;
     }
 
-    if (h3->Integral() != 9417) {
-        cout << "Wrong number of alphas produced at 5MeV_1um!" << endl;
+    if (h3->Integral() != 9430) {
+        cout << "Wrong number of alphas produced at (h3) 5MeV_1um!" << endl;
         cout << "Histogram contains : " << h3->Integral() << endl;
         return 30;
     }
 
     if (TMath::Abs(thetaSample - thetaSampleRef) / thetaSampleRef >= 0.01) {
         cout << "Wrong theta angle value for entry 100!" << endl;
-        cout << "Theta value is : " << thetaSample << endl;
+        cout << "Theta value is : " << thetaSample << " while it should be : " << thetaSampleRef << endl;
         return 60;
     }
 
     if (TMath::Abs(phiSample - phiSampleRef) / phiSampleRef >= 0.01) {
         cout << "Wrong phi angle value for entry 100!" << endl;
-        cout << "Phi value is : " << phiSample << endl;
+        cout << "Phi value is : " << phiSample << " while it should be : " << phiSampleRef << endl;
         return 60;
     }
 
     if (TMath::Abs(thetaAverage - thetaAverageRef) / thetaAverageRef >= 0.01) {
         cout << "Wrong theta angle average!" << endl;
-        cout << "Theta angle average : " << thetaAverage << " while it should be : " << 1.589 << endl;
+        cout << "Theta angle average : " << thetaAverage << " while it should be : " << thetaAverageRef
+             << endl;
         return 80;
     }
 
     if (TMath::Abs(phiAverage - phiAverageRef) / phiAverageRef >= 0.01) {
         cout << "Wrong phi angle average!" << endl;
-        cout << "Phi angle average : " << phiAverage << " while it should be : " << 0.027 << endl;
+        cout << "Phi angle average : " << phiAverage << " while it should be : " << phiAverageRef << endl;
         return 90;
     }
 

From 6852ce007370d66737c054e685a2093735fc350a Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Sun, 2 Oct 2022 18:13:18 +0200
Subject: [PATCH 16/42] 12.Generators updating materials file

---
 examples/12.Generators/geometry/setup.gdml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/12.Generators/geometry/setup.gdml b/examples/12.Generators/geometry/setup.gdml
index 1285174c..0cc9d20e 100644
--- a/examples/12.Generators/geometry/setup.gdml
+++ b/examples/12.Generators/geometry/setup.gdml
@@ -3,7 +3,7 @@
 
 <!DOCTYPE gdml [
         <!ENTITY geometry SYSTEM "geometry.gdml">
-        <!ENTITY materials SYSTEM "https://sultan.unizar.es/materials/materials.xml">
+        <!ENTITY materials SYSTEM "https://sultan.unizar.es/materials/gases.xml">
         ]>
 
 <gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

From 511f92dafbe8d96f63619c228312a8daf84123ae Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Sun, 2 Oct 2022 18:14:05 +0200
Subject: [PATCH 17/42] test/examples.cxx Updating full chain validation

---
 test/src/examples.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/src/examples.cxx b/test/src/examples.cxx
index 3f39b31b..67c98772 100644
--- a/test/src/examples.cxx
+++ b/test/src/examples.cxx
@@ -276,7 +276,7 @@ TEST(restG4, Example_07_Decay_FullChain) {
     gROOT->ProcessLine(TString::Format(".L %s", macro.Data()));  // Load macro
     int error = 0;
     const int result =
-        gROOT->ProcessLine(TString::Format("Validate(\"%s\", %d)", options.outputFile.c_str(), 17), &error);
+        gROOT->ProcessLine(TString::Format("Validate(\"%s\", %d)", options.outputFile.c_str(), 15), &error);
     EXPECT_EQ(error, 0);
     EXPECT_EQ(result, 0);
 

From 73e7454b9bd020d2d5cab5f05edd9aac602118a0 Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Sun, 2 Oct 2022 18:26:32 +0200
Subject: [PATCH 18/42] 09.Pb210_Shield. Updating materials file

---
 examples/09.Pb210_Shield/geometry/setup.gdml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/09.Pb210_Shield/geometry/setup.gdml b/examples/09.Pb210_Shield/geometry/setup.gdml
index 5f8d4782..9461105e 100644
--- a/examples/09.Pb210_Shield/geometry/setup.gdml
+++ b/examples/09.Pb210_Shield/geometry/setup.gdml
@@ -3,7 +3,7 @@
 
 <!DOCTYPE gdml [
         <!ENTITY geometry SYSTEM "geometry.gdml">
-        <!ENTITY materials SYSTEM "https://sultan.unizar.es/materials/materials.xml">
+        <!ENTITY materials SYSTEM "https://sultan.unizar.es/materials/gases.xml">
         ]>
 
 <gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

From 9bbf90317df1c6e8209732ebcf8048180abecd20 Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Sun, 2 Oct 2022 18:32:00 +0200
Subject: [PATCH 19/42] 11.Xrays Updating materials file

---
 examples/11.Xrays/geometry/setup.gdml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/11.Xrays/geometry/setup.gdml b/examples/11.Xrays/geometry/setup.gdml
index 1285174c..0cc9d20e 100644
--- a/examples/11.Xrays/geometry/setup.gdml
+++ b/examples/11.Xrays/geometry/setup.gdml
@@ -3,7 +3,7 @@
 
 <!DOCTYPE gdml [
         <!ENTITY geometry SYSTEM "geometry.gdml">
-        <!ENTITY materials SYSTEM "https://sultan.unizar.es/materials/materials.xml">
+        <!ENTITY materials SYSTEM "https://sultan.unizar.es/materials/gases.xml">
         ]>
 
 <gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

From 7a86aa2cf6eedc0566062d02148e1d1c65cd33d3 Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Mon, 3 Oct 2022 09:25:17 +0200
Subject: [PATCH 20/42] 01.NLDBD Adding both gases.xml and materials.xml

---
 examples/01.NLDBD/geometry/mySetupTemplate.gdml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/examples/01.NLDBD/geometry/mySetupTemplate.gdml b/examples/01.NLDBD/geometry/mySetupTemplate.gdml
index db4d25ad..9a422cca 100644
--- a/examples/01.NLDBD/geometry/mySetupTemplate.gdml
+++ b/examples/01.NLDBD/geometry/mySetupTemplate.gdml
@@ -3,7 +3,8 @@
 
 <!DOCTYPE gdml [
         <!ENTITY geometry SYSTEM "myGeometryTemplate.gdml">
-        <!ENTITY materials SYSTEM "https://sultan.unizar.es/materials/gases.xml">
+        <!ENTITY gases SYSTEM "https://sultan.unizar.es/materials/gases.xml">
+        <!ENTITY materials SYSTEM "https://sultan.unizar.es/materials/materials.xml">
         ]>
 
 <gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -40,6 +41,7 @@
     </define>
 
     &materials;
+    &gases;
 
     &geometry;
 

From d66252b458252601a3acab2f0ec8b8b587e57772 Mon Sep 17 00:00:00 2001
From: Luis Obis <luis.antonio.obis@gmail.com>
Date: Mon, 3 Oct 2022 10:05:37 +0200
Subject: [PATCH 21/42] using new url for materials

---
 examples/01.NLDBD/geometry/mySetupTemplate.gdml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/examples/01.NLDBD/geometry/mySetupTemplate.gdml b/examples/01.NLDBD/geometry/mySetupTemplate.gdml
index 9a422cca..e461dc39 100644
--- a/examples/01.NLDBD/geometry/mySetupTemplate.gdml
+++ b/examples/01.NLDBD/geometry/mySetupTemplate.gdml
@@ -3,8 +3,7 @@
 
 <!DOCTYPE gdml [
         <!ENTITY geometry SYSTEM "myGeometryTemplate.gdml">
-        <!ENTITY gases SYSTEM "https://sultan.unizar.es/materials/gases.xml">
-        <!ENTITY materials SYSTEM "https://sultan.unizar.es/materials/materials.xml">
+        <!ENTITY materials SYSTEM "https://raw.githubusercontent.com/rest-for-physics/materials/55f13a61ab400f7f0845f06e604a8d1a3974d7a7/output/rest.xml">
         ]>
 
 <gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -41,11 +40,8 @@
     </define>
 
     &materials;
-    &gases;
-
     &geometry;
 
-
     <setup name="Default" version="1.0">
         <world ref="World"/>
     </setup>

From acf7e44945eee354b3a0055bf302d2faa0f35f40 Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Mon, 3 Oct 2022 22:03:49 +0200
Subject: [PATCH 22/42] Updating material geometry to rest.xml

---
 examples/01.NLDBD/geometry/mySetupTemplate.gdml | 4 +---
 examples/03.Fluorescence/geometry/setup.gdml    | 2 +-
 examples/04.MuonScan/setup.gdml                 | 2 +-
 examples/06.IonRecoils/geometry/setup.gdml      | 2 +-
 examples/07.FullChainDecay/geometry/setup.gdml  | 2 +-
 examples/08.Alphas/geometry/setup.gdml          | 2 +-
 examples/09.Pb210_Shield/geometry/setup.gdml    | 2 +-
 examples/11.Xrays/geometry/setup.gdml           | 2 +-
 8 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/examples/01.NLDBD/geometry/mySetupTemplate.gdml b/examples/01.NLDBD/geometry/mySetupTemplate.gdml
index 9a422cca..8d9636dc 100644
--- a/examples/01.NLDBD/geometry/mySetupTemplate.gdml
+++ b/examples/01.NLDBD/geometry/mySetupTemplate.gdml
@@ -3,8 +3,7 @@
 
 <!DOCTYPE gdml [
         <!ENTITY geometry SYSTEM "myGeometryTemplate.gdml">
-        <!ENTITY gases SYSTEM "https://sultan.unizar.es/materials/gases.xml">
-        <!ENTITY materials SYSTEM "https://sultan.unizar.es/materials/materials.xml">
+        <!ENTITY materials SYSTEM "https://rest-for-physics.github.io/materials/rest.xml">
         ]>
 
 <gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -41,7 +40,6 @@
     </define>
 
     &materials;
-    &gases;
 
     &geometry;
 
diff --git a/examples/03.Fluorescence/geometry/setup.gdml b/examples/03.Fluorescence/geometry/setup.gdml
index f49e38fd..1cf13bc5 100644
--- a/examples/03.Fluorescence/geometry/setup.gdml
+++ b/examples/03.Fluorescence/geometry/setup.gdml
@@ -3,7 +3,7 @@
 
 <!DOCTYPE gdml [
         <!ENTITY geometry SYSTEM "geometry.gdml">
-        <!ENTITY materials SYSTEM "https://sultan.unizar.es/materials/gases.xml">
+        <!ENTITY materials SYSTEM "https://rest-for-physics.github.io/materials/rest.xml">
         ]>
 
 <gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/examples/04.MuonScan/setup.gdml b/examples/04.MuonScan/setup.gdml
index 2b781588..005a7d7c 100644
--- a/examples/04.MuonScan/setup.gdml
+++ b/examples/04.MuonScan/setup.gdml
@@ -3,7 +3,7 @@
 
 <!DOCTYPE gdml [
         <!ENTITY geometry SYSTEM "geometry.gdml">
-        <!ENTITY materials SYSTEM "https://sultan.unizar.es/materials/gases.xml">
+        <!ENTITY materials SYSTEM "https://rest-for-physics.github.io/materials/rest.xml">
         ]>
 
 <gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/examples/06.IonRecoils/geometry/setup.gdml b/examples/06.IonRecoils/geometry/setup.gdml
index d769c5bb..5cd108a0 100644
--- a/examples/06.IonRecoils/geometry/setup.gdml
+++ b/examples/06.IonRecoils/geometry/setup.gdml
@@ -3,7 +3,7 @@
 
 <!DOCTYPE gdml [
         <!ENTITY geometry SYSTEM "geometry.gdml">
-        <!ENTITY materials SYSTEM "https://sultan.unizar.es/materials/gases.xml">
+        <!ENTITY materials SYSTEM "https://rest-for-physics.github.io/materials/rest.xml">
         ]>
 
 <gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/examples/07.FullChainDecay/geometry/setup.gdml b/examples/07.FullChainDecay/geometry/setup.gdml
index f49e38fd..1cf13bc5 100644
--- a/examples/07.FullChainDecay/geometry/setup.gdml
+++ b/examples/07.FullChainDecay/geometry/setup.gdml
@@ -3,7 +3,7 @@
 
 <!DOCTYPE gdml [
         <!ENTITY geometry SYSTEM "geometry.gdml">
-        <!ENTITY materials SYSTEM "https://sultan.unizar.es/materials/gases.xml">
+        <!ENTITY materials SYSTEM "https://rest-for-physics.github.io/materials/rest.xml">
         ]>
 
 <gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/examples/08.Alphas/geometry/setup.gdml b/examples/08.Alphas/geometry/setup.gdml
index 13bc8910..ba869571 100644
--- a/examples/08.Alphas/geometry/setup.gdml
+++ b/examples/08.Alphas/geometry/setup.gdml
@@ -3,7 +3,7 @@
 
 <!DOCTYPE gdml [
         <!ENTITY geometry SYSTEM "geometry.gdml">
-        <!ENTITY materials SYSTEM "https://sultan.unizar.es/materials/gases.xml">
+        <!ENTITY materials SYSTEM "https://rest-for-physics.github.io/materials/rest.xml">
         ]>
 
 <gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/examples/09.Pb210_Shield/geometry/setup.gdml b/examples/09.Pb210_Shield/geometry/setup.gdml
index 9461105e..44ee284f 100644
--- a/examples/09.Pb210_Shield/geometry/setup.gdml
+++ b/examples/09.Pb210_Shield/geometry/setup.gdml
@@ -3,7 +3,7 @@
 
 <!DOCTYPE gdml [
         <!ENTITY geometry SYSTEM "geometry.gdml">
-        <!ENTITY materials SYSTEM "https://sultan.unizar.es/materials/gases.xml">
+        <!ENTITY materials SYSTEM "https://rest-for-physics.github.io/materials/rest.xml">
         ]>
 
 <gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/examples/11.Xrays/geometry/setup.gdml b/examples/11.Xrays/geometry/setup.gdml
index 0cc9d20e..a6a55cdc 100644
--- a/examples/11.Xrays/geometry/setup.gdml
+++ b/examples/11.Xrays/geometry/setup.gdml
@@ -3,7 +3,7 @@
 
 <!DOCTYPE gdml [
         <!ENTITY geometry SYSTEM "geometry.gdml">
-        <!ENTITY materials SYSTEM "https://sultan.unizar.es/materials/gases.xml">
+        <!ENTITY materials SYSTEM "https://rest-for-physics.github.io/materials/rest.xml">
         ]>
 
 <gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

From d4ac05fdf0fc064f24dc5df63da5bd7facfaf996 Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Tue, 4 Oct 2022 09:51:11 +0200
Subject: [PATCH 23/42] 01.NLDBD trying to fix reference

---
 .github/workflows/validation.yml                | 3 +++
 examples/01.NLDBD/geometry/mySetupTemplate.gdml | 2 +-
 examples/12.Generators/geometry/setup.gdml      | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml
index caf598e4..0750b31b 100644
--- a/.github/workflows/validation.yml
+++ b/.github/workflows/validation.yml
@@ -158,6 +158,9 @@ jobs:
         run: |
           source ${{ env.REST_PATH }}/thisREST.sh
           cd ${{ env.REST_PATH }}/examples/restG4/01.NLDBD/
+          cd geometry
+          wget https://rest-for-physics.github.io/materials/rest.xml
+          cd ..
           restG4 NLDBD.rml -o Run00001_NLDBD_Test.root
           restRoot -b -q Validate.C'("Run00001_NLDBD_Test.root")'
 
diff --git a/examples/01.NLDBD/geometry/mySetupTemplate.gdml b/examples/01.NLDBD/geometry/mySetupTemplate.gdml
index 66895a6a..7f94c54d 100644
--- a/examples/01.NLDBD/geometry/mySetupTemplate.gdml
+++ b/examples/01.NLDBD/geometry/mySetupTemplate.gdml
@@ -3,7 +3,7 @@
 
 <!DOCTYPE gdml [
         <!ENTITY geometry SYSTEM "myGeometryTemplate.gdml">
-        <!ENTITY materials SYSTEM "https://rest-for-physics.github.io/materials/rest.xml">
+        <!ENTITY materials SYSTEM "rest.xml">
         ]>
 
 <gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/examples/12.Generators/geometry/setup.gdml b/examples/12.Generators/geometry/setup.gdml
index 0cc9d20e..a6a55cdc 100644
--- a/examples/12.Generators/geometry/setup.gdml
+++ b/examples/12.Generators/geometry/setup.gdml
@@ -3,7 +3,7 @@
 
 <!DOCTYPE gdml [
         <!ENTITY geometry SYSTEM "geometry.gdml">
-        <!ENTITY materials SYSTEM "https://sultan.unizar.es/materials/gases.xml">
+        <!ENTITY materials SYSTEM "https://rest-for-physics.github.io/materials/rest.xml">
         ]>
 
 <gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

From 9dd15cd4c741551c1086a28f7fbdc88040cd482f Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Tue, 4 Oct 2022 09:59:25 +0200
Subject: [PATCH 24/42] 01.NLDBD adding an older materials file for reference
 validation

---
 examples/01.NLDBD/geometry/rest.xml | 421 ++++++++++++++++++++++++++++
 1 file changed, 421 insertions(+)
 create mode 100644 examples/01.NLDBD/geometry/rest.xml

diff --git a/examples/01.NLDBD/geometry/rest.xml b/examples/01.NLDBD/geometry/rest.xml
new file mode 100644
index 00000000..07b18ad1
--- /dev/null
+++ b/examples/01.NLDBD/geometry/rest.xml
@@ -0,0 +1,421 @@
+<!-- ##VERSION REST materials 1.4## -->
+<!-- densities in mg/cm3 @ 293.15K -->
+    <materials>
+        <!-- {{{ Elements definition -->
+        <element name="Hydrogen" formula="H" Z="1">
+            <atom value="1.00794" />
+        </element>
+       
+	<element name="Helium" formula="N" Z="2">
+	    <atom value="4.0026" />
+	</element>
+
+        <element name="Carbon" formula="C" Z="6">
+            <atom value="12.0107" />
+        </element>
+        <element name="Nitrogen" formula="N" Z="7">
+            <atom value="14.0067" />
+        </element>
+        <element name="Fluor" formula="F" Z="9">
+            <atom value="18.9984" />
+        </element>
+        <element name="Silicon" formula="Si" Z="14" state="solid">
+            <atom value="28.0855" />
+        </element>
+        <element name="Chromium" formula="Cr" Z="24" state="solid">
+            <atom value="51.996" />
+        </element>
+        <element name="Manganese" formula="Mn" Z="25">
+            <atom value="54.938045" />
+        </element>
+        <element name="Iron" formula="Fe" Z="26" state="solid">
+            <atom value="55.845" />
+        </element>
+        <element name="Nickel" formula="Ni" Z="28" state="solid">
+            <atom value="58.6934" />
+        </element>
+        <element name="Aluminium" formula="Al" Z="13" state="solid">
+            <atom value="26.982" />
+        </element>
+        <element name="Xenon" formula="Xe" Z="54" state="gas">
+            <atom value="131.293" />
+        </element>
+        <element name="Argon" formula="Ar" Z="18" state="gas">
+            <atom value="39.948" />
+        </element>
+        <element name="Neon" formula="Ne" Z="10" state="gas">
+         <atom value="20.1797" />
+        </element>
+        <element name="Zinc" formula="Zn" Z="30">
+	<atom value="65.4094"/>
+        </element>
+	<element name="Magnesium" formula="Mg" Z="12">
+	<atom value="24.3050"/>
+	</element>
+	<element name="Sulfur" formula="S" Z="16">
+	<atom value="32.0655"/>
+	</element>
+          <element name="Chlorine" formula="Cl" Z="17">
+	<atom value="35.4532"/>
+	</element>
+        <element name="Iodide" formula="I" Z="53">
+	<atom value="126.9"/>
+	</element>
+      
+
+        
+       
+        <!-- }}} -->
+
+        <!-- {{{ Quenchers -->
+        <material name="TMA" state="gas">
+            <D unit="mg/cm3" value="quencherDensity" />
+            <T unit="K" value="gasTemperature" />
+            <P unit="bar" value="gasPressure" />
+            <composite n="3" ref="Carbon" />
+            <composite n="9" ref="Hydrogen" />
+            <composite n="1" ref="Nitrogen" />
+        </material>
+
+        <material name="isobutane" state="gas">
+            <D unit="mg/cm3" value="quencherDensity" />
+            <T unit="K" value="gasTemperature" />
+            <P unit="bar" value="gasPressure" />
+            <composite n="4" ref="Carbon" />
+            <composite n="10" ref="Hydrogen" />
+        </material>
+        <!-- }}} -->
+
+        <!-- {{{ Gas mixtures -->
+        <material name="PureHelium" state="gas">
+	    <T unit="K" value="gasTemperature"/>
+	    <P unit="bar" value="gasPressure"/>
+	    <MEE unit="eV" value="188"/>
+            <D unit="mg/cm3" value="targetGasDensity"/>
+	    <fraction n="1" ref="Helium"/>
+	</material>
+
+        <material name="PureXenon" state="gas">
+            <T unit="K" value="gasTemperature"/>
+            <P unit="bar" value="gasPressure"/>
+            <MEE unit="eV" value="482"/>
+            <D unit="mg/cm3" value="targetGasDensity"/>
+            <fraction n="1" ref="Xenon"/>
+        </material>
+
+        <material name="Xenon_TMA" state="gas">
+            <D unit="mg/cm3" value="targetGasDensity+quencherDensity" />
+            <P unit="bar" value="gasPressure" />
+            <T unit="K" value="gasTemperature" />
+            <fraction n="quencherFraction" ref="TMA" />
+            <fraction n="1-quencherFraction" ref="Xenon" />
+        </material>
+
+        <material name="Xenon_ISO" state="gas">
+            <D unit="mg/cm3" value="targetGasDensity+quencherDensity" />
+            <P unit="bar" value="gasPressure" />
+            <T unit="K" value="gasTemperature" />
+            <fraction n="quencherFraction" ref="isobutane" />
+            <fraction n="1-quencherFraction" ref="Xenon" />
+        </material>
+
+        <material name="PureArgon" state="gas">
+            <T unit="K" value="gasTemperature"/>
+            <P unit="bar" value="gasPressure"/>
+            <MEE unit="eV" value="188"/>
+            <D unit="mg/cm3" value="targetGasDensity"/>
+            <fraction n="1" ref="Argon"/>
+        </material>
+
+        <material name="Ar_ISO" state="gas">
+            <D unit="mg/cm3" value="targetGasDensity+quencherDensity" />
+            <P unit="bar" value="gasPressure" />
+            <T unit="K" value="gasTemperature" />
+            <fraction n="quencherFraction" ref="isobutane" />
+            <fraction n="1-quencherFraction" ref="Argon" />
+        </material>
+
+        <material name="Neon_ISO" state="gas">
+            <D unit="mg/cm3" value="targetGasDensity+quencherDensity" />
+            <P unit="bar" value="gasPressure" />
+            <T unit="K" value="gasTemperature" />
+            <fraction n="quencherFraction" ref="isobutane" />
+            <fraction n="1-quencherFraction" ref="Neon" />
+        </material>
+
+        <!-- }}} -->
+
+        <!-- {{{ Copper -->
+        <isotope N="63" Z="29" name="Cu63">
+            <atom unit="g/mole" value="62.9296"/>
+        </isotope>
+        <isotope N="65" Z="29" name="Cu65">
+            <atom unit="g/mole" value="64.9278"/>
+        </isotope>
+        <element name="Cu">
+            <fraction n="0.6917" ref="Cu63"/>
+            <fraction n="0.3083" ref="Cu65"/>
+        </element>
+        <material name="Copper" state="solid">
+            <MEE unit="eV" value="322"/>
+            <D unit="g/cm3" value="8.96"/>
+            <fraction n="1" ref="Cu"/>
+        </material>
+        <!-- }}} -->
+
+      <!-- {{{ Aluminium -->
+        <isotope N="27" Z="13" name="Al27">
+        <atom unit="g/mole" value="26.982"/>
+          </isotope>
+        <element name="Al">
+        <fraction n="1.0000" ref="Al27"/>
+        </element>
+        <material name="Aluminium" state="solid">
+         <MEE unit="eV" value="166"/>
+        <D unit="g/cm3" value="2.70"/>
+        <fraction n="1" ref="Al"/>
+         </material>
+    <!-- }}} -->   
+
+ 	<!-- {{{ Cadmium-->
+        <isotope N="106" Z="48" name="Cd106">
+        <atom unit="g/mole" value="105.91"/>
+          </isotope>
+	<isotope N="108" Z="48" name="Cd108">
+        <atom unit="g/mole" value="107.90"/>
+          </isotope>
+	<isotope N="110" Z="48" name="Cd110">
+        <atom unit="g/mole" value="109.90"/>
+          </isotope>
+	<isotope N="111" Z="48" name="Cd111">
+        <atom unit="g/mole" value="110.90"/>
+          </isotope>
+	<isotope N="112" Z="48" name="Cd112">
+        <atom unit="g/mole" value="111.90"/>
+          </isotope>
+	<isotope N="113" Z="48" name="Cd113">
+        <atom unit="g/mole" value="112.90"/>
+          </isotope>
+	<isotope N="114" Z="48" name="Cd114">
+        <atom unit="g/mole" value="113.90"/>
+          </isotope>
+	<isotope N="116" Z="48" name="Cd116">
+        <atom unit="g/mole" value="115.90"/>
+          </isotope>
+        <element name="Cd">
+        <fraction n="0.0125" ref="Cd106"/>
+	 <fraction n="0.0089" ref="Cd108"/>
+	 <fraction n="0.1249" ref="Cd110"/>
+	 <fraction n="0.1280" ref="Cd111"/>
+	 <fraction n="0.2413" ref="Cd112"/>
+	<fraction n="0.1222" ref="Cd113"/>
+	 <fraction n="0.2873" ref="Cd114"/>
+	 <fraction n="0.0749" ref="Cd116"/>
+        </element>
+        <material name="Cadmium" state="solid">
+         <MEE unit="eV" value="469.0"/>
+        <D unit="g/cm3" value="8.65"/>
+ 	 <fraction n="1" ref="Cd"/>
+         </material>
+   	 <!-- }}} -->   
+
+         <!-- {{{ 6-Lithium -->
+   	 <isotope N="6" Z="3" name="Li6">
+        <atom unit="g/mole" value="6"/>
+    	</isotope>    
+   	 <element name="6Li">
+        <fraction n="1" ref="Li6"/>
+    	</element>
+   	 <material name="6-Lithium" state="solid">
+        <D unit="g/cm3" value="0.463"/>
+        <fraction n="1" ref="6Li"/>
+    	</material>
+          <!-- }}} -->
+        <!-- {{{  Lithium6 iodide -->
+    	<material name="6LiI" formula="6-LiI">
+        <MEE unit="eV" value="485.1"/>
+        <D unit="g/cm3" value="3.494" />
+        <composite n="1" ref="6-Lithium" />
+        <composite n="1" ref="iodide" />
+   	 </material>
+    <!-- }}} -->
+	
+                                      
+        <!-- {{{ Stainlesssteel -->
+        <material name="Stainlesssteel" state="solid">
+            <MEE unit="eV" value="280.927567486627"/>
+            <D unit="g/cm3" value="8.02"/>
+            <fraction n="0.02" ref="Manganese"/>
+            <fraction n="0.01" ref="Silicon"/>
+            <fraction n="0.19" ref="Chromium"/>
+            <fraction n="0.1" ref="Nickel"/>
+            <fraction n="0.68" ref="Iron"/>
+        </material>
+        <!-- }}} -->
+
+        <!-- {{{ Air -->
+        <isotope N="14" Z="7" name="N14">
+            <atom unit="g/mole" value="14.0031"/>
+        </isotope>
+        <isotope N="15" Z="7" name="N15">
+            <atom unit="g/mole" value="15.0001"/>
+        </isotope>
+        <element name="Nitrogen">
+            <fraction n="0.99632" ref="N14"/>
+            <fraction n="0.00368" ref="N15"/>
+        </element>
+
+        <isotope N="16" Z="8" name="O16">
+            <atom unit="g/mole" value="15.9949"/>
+        </isotope>
+        <isotope N="17" Z="8" name="O17">
+            <atom unit="g/mole" value="16.9991"/>
+        </isotope>
+        <isotope N="18" Z="8" name="O18">
+            <atom unit="g/mole" value="17.9992"/>
+        </isotope>
+        <element name="Oxygen">
+            <fraction n="0.99757" ref="O16"/>
+            <fraction n="0.00038" ref="O17"/>
+            <fraction n="0.00205" ref="O18"/>
+        </element>
+        <material name="Air" state="gas">
+            <T unit="K" value="293.13"/>
+            <MEE unit="eV" value="85.7030667332999"/>
+            <D unit="g/cm3" value="0.00129"/>
+            <fraction n="0.7" ref="Nitrogen"/>
+            <fraction n="0.3" ref="Oxygen"/>
+        </material>
+        <!-- }}} -->
+
+        <!-- {{{ Vacuum -->
+        <material name="Vacuum" state="gas">
+            <T unit="K" value="293.13"/>
+            <MEE unit="eV" value="85.7030667332999"/>
+            <D unit="g/cm3" value="1.e-20"/>
+            <fraction n="0.7" ref="Nitrogen"/>
+            <fraction n="0.3" ref="Oxygen"/>
+        </material>
+        <!-- }}} -->
+
+        <!-- {{{ Water -->
+        <element Z="1" formula="H" name="Hydrogen">
+            <atom value="2" />
+        </element>
+
+        <element Z="8" formula="O" name="Oxygen">
+            <atom value="16" />
+        </element>
+
+        <material name="Water" formula="H2O">
+            <D value="1.0" />
+            <composite n="2" ref="Hydrogen" />
+            <composite n="1" ref="Oxygen" />
+        </material>
+        <!-- }}} -->
+
+        <!-- {{{ Lead -->
+        <isotope N="204" Z="82" name="Pb204">
+            <atom unit="g/mole" value="203.973"/>
+        </isotope>
+        <isotope N="206" Z="82" name="Pb206">
+            <atom unit="g/mole" value="205.974"/>
+        </isotope>
+        <isotope N="207" Z="82" name="Pb207">
+            <atom unit="g/mole" value="206.976"/>
+        </isotope>
+        <isotope N="208" Z="82" name="Pb208">
+            <atom unit="g/mole" value="207.977"/>
+        </isotope>
+        <element name="Pb">
+            <fraction n="0.014" ref="Pb204"/>
+            <fraction n="0.241" ref="Pb206"/>
+            <fraction n="0.221" ref="Pb207"/>
+            <fraction n="0.524" ref="Pb208"/>
+        </element>
+        <material name="Lead" state="solid">
+            <MEE unit="eV" value="823"/>
+            <D unit="g/cm3" value="11.34"/>
+            <fraction n="1" ref="Pb"/>
+        </material>
+        <!-- }}} -->
+
+        <!-- {{{ Kapton -->
+        <material name="Kapton" state="solid">
+            <MEE unit="eV" value="79.6"/>
+            <D unit="g/cm3" value="1.42"/>
+            <fraction n="0.026362" ref="Hydrogen"/>
+            <fraction n="0.691133" ref="Carbon"/>
+            <fraction n="0.073270" ref="Nitrogen"/>
+            <fraction n="0.209235" ref="Oxygen"/>
+        </material>
+        <!-- }}} -->
+	<!--  {{{ Rubber-Neoprene -->
+	<material name="Neoprene" state="solid">
+	<D unit="g/cm3" value="1.23"/>
+          <MEE unit="eV" value="93.000000"/>
+	<fraction n="0.542646" ref="Carbon"/>
+	<fraction n="0.056920" ref="Hydrogen"/>
+	<fraction n="0.400434" ref="Chlorine"/>
+	
+	</material>
+	<!--  }}}  -->
+
+        <!-- {{{ Teflon (PTFE) -->
+        <material name="PTFE" state="solid">
+            <MEE unit="eV" value="105.35244885659"/>
+            <D unit="g/cm3" value="2.2"/>
+            <fraction n="0.240151969606079" ref="Carbon"/>
+            <fraction n="0.759848030393921" ref="Fluor"/>
+        </material>
+        <!-- }}} -->
+
+       <!-- {{{ Polyethylene -->
+    	<material name="PE" state="solid">
+            <MEE unit="eV" value="57.4000000"/>
+            <D unit="g/cm3" value="0.940"/>
+            <fraction n="0.143711" ref="Hydrogen"/>
+            <fraction n="0.856289" ref="Carbon"/>
+     	</material>
+    	<!-- }}} -->
+
+        <!-- {{{ Mylar -->
+        <material name="Mylar" state="solid">
+            <MEE unit="eV" value="78.700000"/>
+            <D unit="g/cm3" value="2.2"/>
+            <fraction n="0.041959" ref="Hydrogen"/>
+            <fraction n="0.625017" ref="Fluor"/>
+            <fraction n="0.333025" ref="Oxygen"/>
+        </material>
+        <!-- }}} -->
+
+        <!-- {{{ Plasctic scintillator -->
+        <material name="BC408" state="solid">
+            <MEE unit="eV" value="64.700000"/>
+            <D unit="g/cm3" value="1.03"/>
+            <fraction n="0.085000" ref="Hydrogen"/>
+            <fraction n="0.915000" ref="Carbon"/>
+        </material>
+        <!-- }}} -->
+	
+	<!-- {{{ Acrylic -->
+         <material name="Acrylic" state="solid">
+             <MEE unit="eV" value="0.00000"/><!-- this is not a correct figure -->
+             <D unit="g/cm3" value="1.18"/>
+             <fraction n="0.080000" ref="Hydrogen"/>
+             <fraction n="0.600000" ref="Carbon"/>
+             <fraction n="0.320000" ref="Oxygen"/>
+         </material>
+         <!-- }}} -->
+	<!-- {{{ Silicone (Polydimethylsiloxane) -->
+    	<material name="PDMS" state="solid">
+             <D unit="g/cm3" value="0.965"/>
+             <fraction n="0.081555" ref="Hydrogen"/>
+             <fraction n="0.323940" ref="Carbon"/>
+             <fraction n="0.215759" ref="Oxygen"/>
+             <fraction n="0.378746" ref="Silicon"/>
+     	</material>
+    	<!-- }}} -->
+      
+
+    </materials>

From 6825827c770993b9bbecdd5d4dfe73cf0bcf65e9 Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Tue, 4 Oct 2022 10:20:50 +0200
Subject: [PATCH 25/42] 01.NLDBD/geometry/rest.xml removing Lithium from local
 materials file

---
 examples/01.NLDBD/geometry/rest.xml | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/examples/01.NLDBD/geometry/rest.xml b/examples/01.NLDBD/geometry/rest.xml
index 07b18ad1..cbe95329 100644
--- a/examples/01.NLDBD/geometry/rest.xml
+++ b/examples/01.NLDBD/geometry/rest.xml
@@ -219,28 +219,6 @@
          </material>
    	 <!-- }}} -->   
 
-         <!-- {{{ 6-Lithium -->
-   	 <isotope N="6" Z="3" name="Li6">
-        <atom unit="g/mole" value="6"/>
-    	</isotope>    
-   	 <element name="6Li">
-        <fraction n="1" ref="Li6"/>
-    	</element>
-   	 <material name="6-Lithium" state="solid">
-        <D unit="g/cm3" value="0.463"/>
-        <fraction n="1" ref="6Li"/>
-    	</material>
-          <!-- }}} -->
-        <!-- {{{  Lithium6 iodide -->
-    	<material name="6LiI" formula="6-LiI">
-        <MEE unit="eV" value="485.1"/>
-        <D unit="g/cm3" value="3.494" />
-        <composite n="1" ref="6-Lithium" />
-        <composite n="1" ref="iodide" />
-   	 </material>
-    <!-- }}} -->
-	
-                                      
         <!-- {{{ Stainlesssteel -->
         <material name="Stainlesssteel" state="solid">
             <MEE unit="eV" value="280.927567486627"/>

From a71ea8aa04ff63fd148d38b9d9fabf3dbecb678c Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Tue, 4 Oct 2022 10:27:33 +0200
Subject: [PATCH 26/42] .github/validation.yml 01.NLDBD overwritting rest.xml

---
 .github/workflows/validation.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml
index 0750b31b..3885934f 100644
--- a/.github/workflows/validation.yml
+++ b/.github/workflows/validation.yml
@@ -159,6 +159,7 @@ jobs:
           source ${{ env.REST_PATH }}/thisREST.sh
           cd ${{ env.REST_PATH }}/examples/restG4/01.NLDBD/
           cd geometry
+          rm rest.xml
           wget https://rest-for-physics.github.io/materials/rest.xml
           cd ..
           restG4 NLDBD.rml -o Run00001_NLDBD_Test.root

From c0a57449a5025bd610a6fc0df133ecdf1de46422 Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Tue, 4 Oct 2022 10:47:31 +0200
Subject: [PATCH 27/42] Trying to fix reference examples

---
 .github/workflows/validation.yml              |   8 +
 examples/01.NLDBD/geometry/rest.xml           | 399 ------------------
 .../04.MuonScan/CosmicMuonsFromCircle.rml     |  24 +-
 examples/04.MuonScan/CosmicMuonsFromWall.rml  |  24 +-
 examples/04.MuonScan/Muon.rml                 |   2 +-
 .../04.MuonScan/{ => geometry}/geometry.gdml  |   0
 examples/04.MuonScan/geometry/rest.xml        |   0
 .../04.MuonScan/{ => geometry}/setup.gdml     |   2 +-
 examples/07.FullChainDecay/geometry/rest.xml  |   0
 .../07.FullChainDecay/geometry/setup.gdml     |   2 +-
 10 files changed, 17 insertions(+), 444 deletions(-)
 rename examples/04.MuonScan/{ => geometry}/geometry.gdml (100%)
 create mode 100644 examples/04.MuonScan/geometry/rest.xml
 rename examples/04.MuonScan/{ => geometry}/setup.gdml (93%)
 create mode 100644 examples/07.FullChainDecay/geometry/rest.xml

diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml
index 3885934f..de59bd7a 100644
--- a/.github/workflows/validation.yml
+++ b/.github/workflows/validation.yml
@@ -205,6 +205,10 @@ jobs:
         run: |
           source ${{ env.REST_PATH }}/thisREST.sh
           cd ${{ env.REST_PATH }}/examples/restG4/04.MuonScan/
+          cd geometry
+          rm rest.xml
+          wget https://rest-for-physics.github.io/materials/rest.xml
+          cd ..
           restG4 Muon.rml -o muons_from_point.root
           restRoot -b -q Validate.C'("muons_from_point.root")'
           restG4 CosmicMuonsFromWall.rml -o muons_from_wall.root
@@ -272,6 +276,10 @@ jobs:
         run: |
           source ${{ env.REST_PATH }}/thisREST.sh
           cd ${{ env.REST_PATH }}/examples/restG4/07.FullChainDecay/
+          cd geometry
+          rm rest.xml
+          wget https://rest-for-physics.github.io/materials/rest.xml
+          cd ..
           restG4 fullChain.rml -o Run00001_U238_FullChainDecay.root
           restRoot -b -q Validate.C'("Run00001_U238_FullChainDecay.root", 15)'
           restG4 singleDecay.rml -o Run00002_U238_SingleChainDecay.root
diff --git a/examples/01.NLDBD/geometry/rest.xml b/examples/01.NLDBD/geometry/rest.xml
index cbe95329..e69de29b 100644
--- a/examples/01.NLDBD/geometry/rest.xml
+++ b/examples/01.NLDBD/geometry/rest.xml
@@ -1,399 +0,0 @@
-<!-- ##VERSION REST materials 1.4## -->
-<!-- densities in mg/cm3 @ 293.15K -->
-    <materials>
-        <!-- {{{ Elements definition -->
-        <element name="Hydrogen" formula="H" Z="1">
-            <atom value="1.00794" />
-        </element>
-       
-	<element name="Helium" formula="N" Z="2">
-	    <atom value="4.0026" />
-	</element>
-
-        <element name="Carbon" formula="C" Z="6">
-            <atom value="12.0107" />
-        </element>
-        <element name="Nitrogen" formula="N" Z="7">
-            <atom value="14.0067" />
-        </element>
-        <element name="Fluor" formula="F" Z="9">
-            <atom value="18.9984" />
-        </element>
-        <element name="Silicon" formula="Si" Z="14" state="solid">
-            <atom value="28.0855" />
-        </element>
-        <element name="Chromium" formula="Cr" Z="24" state="solid">
-            <atom value="51.996" />
-        </element>
-        <element name="Manganese" formula="Mn" Z="25">
-            <atom value="54.938045" />
-        </element>
-        <element name="Iron" formula="Fe" Z="26" state="solid">
-            <atom value="55.845" />
-        </element>
-        <element name="Nickel" formula="Ni" Z="28" state="solid">
-            <atom value="58.6934" />
-        </element>
-        <element name="Aluminium" formula="Al" Z="13" state="solid">
-            <atom value="26.982" />
-        </element>
-        <element name="Xenon" formula="Xe" Z="54" state="gas">
-            <atom value="131.293" />
-        </element>
-        <element name="Argon" formula="Ar" Z="18" state="gas">
-            <atom value="39.948" />
-        </element>
-        <element name="Neon" formula="Ne" Z="10" state="gas">
-         <atom value="20.1797" />
-        </element>
-        <element name="Zinc" formula="Zn" Z="30">
-	<atom value="65.4094"/>
-        </element>
-	<element name="Magnesium" formula="Mg" Z="12">
-	<atom value="24.3050"/>
-	</element>
-	<element name="Sulfur" formula="S" Z="16">
-	<atom value="32.0655"/>
-	</element>
-          <element name="Chlorine" formula="Cl" Z="17">
-	<atom value="35.4532"/>
-	</element>
-        <element name="Iodide" formula="I" Z="53">
-	<atom value="126.9"/>
-	</element>
-      
-
-        
-       
-        <!-- }}} -->
-
-        <!-- {{{ Quenchers -->
-        <material name="TMA" state="gas">
-            <D unit="mg/cm3" value="quencherDensity" />
-            <T unit="K" value="gasTemperature" />
-            <P unit="bar" value="gasPressure" />
-            <composite n="3" ref="Carbon" />
-            <composite n="9" ref="Hydrogen" />
-            <composite n="1" ref="Nitrogen" />
-        </material>
-
-        <material name="isobutane" state="gas">
-            <D unit="mg/cm3" value="quencherDensity" />
-            <T unit="K" value="gasTemperature" />
-            <P unit="bar" value="gasPressure" />
-            <composite n="4" ref="Carbon" />
-            <composite n="10" ref="Hydrogen" />
-        </material>
-        <!-- }}} -->
-
-        <!-- {{{ Gas mixtures -->
-        <material name="PureHelium" state="gas">
-	    <T unit="K" value="gasTemperature"/>
-	    <P unit="bar" value="gasPressure"/>
-	    <MEE unit="eV" value="188"/>
-            <D unit="mg/cm3" value="targetGasDensity"/>
-	    <fraction n="1" ref="Helium"/>
-	</material>
-
-        <material name="PureXenon" state="gas">
-            <T unit="K" value="gasTemperature"/>
-            <P unit="bar" value="gasPressure"/>
-            <MEE unit="eV" value="482"/>
-            <D unit="mg/cm3" value="targetGasDensity"/>
-            <fraction n="1" ref="Xenon"/>
-        </material>
-
-        <material name="Xenon_TMA" state="gas">
-            <D unit="mg/cm3" value="targetGasDensity+quencherDensity" />
-            <P unit="bar" value="gasPressure" />
-            <T unit="K" value="gasTemperature" />
-            <fraction n="quencherFraction" ref="TMA" />
-            <fraction n="1-quencherFraction" ref="Xenon" />
-        </material>
-
-        <material name="Xenon_ISO" state="gas">
-            <D unit="mg/cm3" value="targetGasDensity+quencherDensity" />
-            <P unit="bar" value="gasPressure" />
-            <T unit="K" value="gasTemperature" />
-            <fraction n="quencherFraction" ref="isobutane" />
-            <fraction n="1-quencherFraction" ref="Xenon" />
-        </material>
-
-        <material name="PureArgon" state="gas">
-            <T unit="K" value="gasTemperature"/>
-            <P unit="bar" value="gasPressure"/>
-            <MEE unit="eV" value="188"/>
-            <D unit="mg/cm3" value="targetGasDensity"/>
-            <fraction n="1" ref="Argon"/>
-        </material>
-
-        <material name="Ar_ISO" state="gas">
-            <D unit="mg/cm3" value="targetGasDensity+quencherDensity" />
-            <P unit="bar" value="gasPressure" />
-            <T unit="K" value="gasTemperature" />
-            <fraction n="quencherFraction" ref="isobutane" />
-            <fraction n="1-quencherFraction" ref="Argon" />
-        </material>
-
-        <material name="Neon_ISO" state="gas">
-            <D unit="mg/cm3" value="targetGasDensity+quencherDensity" />
-            <P unit="bar" value="gasPressure" />
-            <T unit="K" value="gasTemperature" />
-            <fraction n="quencherFraction" ref="isobutane" />
-            <fraction n="1-quencherFraction" ref="Neon" />
-        </material>
-
-        <!-- }}} -->
-
-        <!-- {{{ Copper -->
-        <isotope N="63" Z="29" name="Cu63">
-            <atom unit="g/mole" value="62.9296"/>
-        </isotope>
-        <isotope N="65" Z="29" name="Cu65">
-            <atom unit="g/mole" value="64.9278"/>
-        </isotope>
-        <element name="Cu">
-            <fraction n="0.6917" ref="Cu63"/>
-            <fraction n="0.3083" ref="Cu65"/>
-        </element>
-        <material name="Copper" state="solid">
-            <MEE unit="eV" value="322"/>
-            <D unit="g/cm3" value="8.96"/>
-            <fraction n="1" ref="Cu"/>
-        </material>
-        <!-- }}} -->
-
-      <!-- {{{ Aluminium -->
-        <isotope N="27" Z="13" name="Al27">
-        <atom unit="g/mole" value="26.982"/>
-          </isotope>
-        <element name="Al">
-        <fraction n="1.0000" ref="Al27"/>
-        </element>
-        <material name="Aluminium" state="solid">
-         <MEE unit="eV" value="166"/>
-        <D unit="g/cm3" value="2.70"/>
-        <fraction n="1" ref="Al"/>
-         </material>
-    <!-- }}} -->   
-
- 	<!-- {{{ Cadmium-->
-        <isotope N="106" Z="48" name="Cd106">
-        <atom unit="g/mole" value="105.91"/>
-          </isotope>
-	<isotope N="108" Z="48" name="Cd108">
-        <atom unit="g/mole" value="107.90"/>
-          </isotope>
-	<isotope N="110" Z="48" name="Cd110">
-        <atom unit="g/mole" value="109.90"/>
-          </isotope>
-	<isotope N="111" Z="48" name="Cd111">
-        <atom unit="g/mole" value="110.90"/>
-          </isotope>
-	<isotope N="112" Z="48" name="Cd112">
-        <atom unit="g/mole" value="111.90"/>
-          </isotope>
-	<isotope N="113" Z="48" name="Cd113">
-        <atom unit="g/mole" value="112.90"/>
-          </isotope>
-	<isotope N="114" Z="48" name="Cd114">
-        <atom unit="g/mole" value="113.90"/>
-          </isotope>
-	<isotope N="116" Z="48" name="Cd116">
-        <atom unit="g/mole" value="115.90"/>
-          </isotope>
-        <element name="Cd">
-        <fraction n="0.0125" ref="Cd106"/>
-	 <fraction n="0.0089" ref="Cd108"/>
-	 <fraction n="0.1249" ref="Cd110"/>
-	 <fraction n="0.1280" ref="Cd111"/>
-	 <fraction n="0.2413" ref="Cd112"/>
-	<fraction n="0.1222" ref="Cd113"/>
-	 <fraction n="0.2873" ref="Cd114"/>
-	 <fraction n="0.0749" ref="Cd116"/>
-        </element>
-        <material name="Cadmium" state="solid">
-         <MEE unit="eV" value="469.0"/>
-        <D unit="g/cm3" value="8.65"/>
- 	 <fraction n="1" ref="Cd"/>
-         </material>
-   	 <!-- }}} -->   
-
-        <!-- {{{ Stainlesssteel -->
-        <material name="Stainlesssteel" state="solid">
-            <MEE unit="eV" value="280.927567486627"/>
-            <D unit="g/cm3" value="8.02"/>
-            <fraction n="0.02" ref="Manganese"/>
-            <fraction n="0.01" ref="Silicon"/>
-            <fraction n="0.19" ref="Chromium"/>
-            <fraction n="0.1" ref="Nickel"/>
-            <fraction n="0.68" ref="Iron"/>
-        </material>
-        <!-- }}} -->
-
-        <!-- {{{ Air -->
-        <isotope N="14" Z="7" name="N14">
-            <atom unit="g/mole" value="14.0031"/>
-        </isotope>
-        <isotope N="15" Z="7" name="N15">
-            <atom unit="g/mole" value="15.0001"/>
-        </isotope>
-        <element name="Nitrogen">
-            <fraction n="0.99632" ref="N14"/>
-            <fraction n="0.00368" ref="N15"/>
-        </element>
-
-        <isotope N="16" Z="8" name="O16">
-            <atom unit="g/mole" value="15.9949"/>
-        </isotope>
-        <isotope N="17" Z="8" name="O17">
-            <atom unit="g/mole" value="16.9991"/>
-        </isotope>
-        <isotope N="18" Z="8" name="O18">
-            <atom unit="g/mole" value="17.9992"/>
-        </isotope>
-        <element name="Oxygen">
-            <fraction n="0.99757" ref="O16"/>
-            <fraction n="0.00038" ref="O17"/>
-            <fraction n="0.00205" ref="O18"/>
-        </element>
-        <material name="Air" state="gas">
-            <T unit="K" value="293.13"/>
-            <MEE unit="eV" value="85.7030667332999"/>
-            <D unit="g/cm3" value="0.00129"/>
-            <fraction n="0.7" ref="Nitrogen"/>
-            <fraction n="0.3" ref="Oxygen"/>
-        </material>
-        <!-- }}} -->
-
-        <!-- {{{ Vacuum -->
-        <material name="Vacuum" state="gas">
-            <T unit="K" value="293.13"/>
-            <MEE unit="eV" value="85.7030667332999"/>
-            <D unit="g/cm3" value="1.e-20"/>
-            <fraction n="0.7" ref="Nitrogen"/>
-            <fraction n="0.3" ref="Oxygen"/>
-        </material>
-        <!-- }}} -->
-
-        <!-- {{{ Water -->
-        <element Z="1" formula="H" name="Hydrogen">
-            <atom value="2" />
-        </element>
-
-        <element Z="8" formula="O" name="Oxygen">
-            <atom value="16" />
-        </element>
-
-        <material name="Water" formula="H2O">
-            <D value="1.0" />
-            <composite n="2" ref="Hydrogen" />
-            <composite n="1" ref="Oxygen" />
-        </material>
-        <!-- }}} -->
-
-        <!-- {{{ Lead -->
-        <isotope N="204" Z="82" name="Pb204">
-            <atom unit="g/mole" value="203.973"/>
-        </isotope>
-        <isotope N="206" Z="82" name="Pb206">
-            <atom unit="g/mole" value="205.974"/>
-        </isotope>
-        <isotope N="207" Z="82" name="Pb207">
-            <atom unit="g/mole" value="206.976"/>
-        </isotope>
-        <isotope N="208" Z="82" name="Pb208">
-            <atom unit="g/mole" value="207.977"/>
-        </isotope>
-        <element name="Pb">
-            <fraction n="0.014" ref="Pb204"/>
-            <fraction n="0.241" ref="Pb206"/>
-            <fraction n="0.221" ref="Pb207"/>
-            <fraction n="0.524" ref="Pb208"/>
-        </element>
-        <material name="Lead" state="solid">
-            <MEE unit="eV" value="823"/>
-            <D unit="g/cm3" value="11.34"/>
-            <fraction n="1" ref="Pb"/>
-        </material>
-        <!-- }}} -->
-
-        <!-- {{{ Kapton -->
-        <material name="Kapton" state="solid">
-            <MEE unit="eV" value="79.6"/>
-            <D unit="g/cm3" value="1.42"/>
-            <fraction n="0.026362" ref="Hydrogen"/>
-            <fraction n="0.691133" ref="Carbon"/>
-            <fraction n="0.073270" ref="Nitrogen"/>
-            <fraction n="0.209235" ref="Oxygen"/>
-        </material>
-        <!-- }}} -->
-	<!--  {{{ Rubber-Neoprene -->
-	<material name="Neoprene" state="solid">
-	<D unit="g/cm3" value="1.23"/>
-          <MEE unit="eV" value="93.000000"/>
-	<fraction n="0.542646" ref="Carbon"/>
-	<fraction n="0.056920" ref="Hydrogen"/>
-	<fraction n="0.400434" ref="Chlorine"/>
-	
-	</material>
-	<!--  }}}  -->
-
-        <!-- {{{ Teflon (PTFE) -->
-        <material name="PTFE" state="solid">
-            <MEE unit="eV" value="105.35244885659"/>
-            <D unit="g/cm3" value="2.2"/>
-            <fraction n="0.240151969606079" ref="Carbon"/>
-            <fraction n="0.759848030393921" ref="Fluor"/>
-        </material>
-        <!-- }}} -->
-
-       <!-- {{{ Polyethylene -->
-    	<material name="PE" state="solid">
-            <MEE unit="eV" value="57.4000000"/>
-            <D unit="g/cm3" value="0.940"/>
-            <fraction n="0.143711" ref="Hydrogen"/>
-            <fraction n="0.856289" ref="Carbon"/>
-     	</material>
-    	<!-- }}} -->
-
-        <!-- {{{ Mylar -->
-        <material name="Mylar" state="solid">
-            <MEE unit="eV" value="78.700000"/>
-            <D unit="g/cm3" value="2.2"/>
-            <fraction n="0.041959" ref="Hydrogen"/>
-            <fraction n="0.625017" ref="Fluor"/>
-            <fraction n="0.333025" ref="Oxygen"/>
-        </material>
-        <!-- }}} -->
-
-        <!-- {{{ Plasctic scintillator -->
-        <material name="BC408" state="solid">
-            <MEE unit="eV" value="64.700000"/>
-            <D unit="g/cm3" value="1.03"/>
-            <fraction n="0.085000" ref="Hydrogen"/>
-            <fraction n="0.915000" ref="Carbon"/>
-        </material>
-        <!-- }}} -->
-	
-	<!-- {{{ Acrylic -->
-         <material name="Acrylic" state="solid">
-             <MEE unit="eV" value="0.00000"/><!-- this is not a correct figure -->
-             <D unit="g/cm3" value="1.18"/>
-             <fraction n="0.080000" ref="Hydrogen"/>
-             <fraction n="0.600000" ref="Carbon"/>
-             <fraction n="0.320000" ref="Oxygen"/>
-         </material>
-         <!-- }}} -->
-	<!-- {{{ Silicone (Polydimethylsiloxane) -->
-    	<material name="PDMS" state="solid">
-             <D unit="g/cm3" value="0.965"/>
-             <fraction n="0.081555" ref="Hydrogen"/>
-             <fraction n="0.323940" ref="Carbon"/>
-             <fraction n="0.215759" ref="Oxygen"/>
-             <fraction n="0.378746" ref="Silicon"/>
-     	</material>
-    	<!-- }}} -->
-      
-
-    </materials>
diff --git a/examples/04.MuonScan/CosmicMuonsFromCircle.rml b/examples/04.MuonScan/CosmicMuonsFromCircle.rml
index b17919bf..bb620401 100644
--- a/examples/04.MuonScan/CosmicMuonsFromCircle.rml
+++ b/examples/04.MuonScan/CosmicMuonsFromCircle.rml
@@ -1,7 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <restG4>
-
     <TRestRun name="CosmicMuonRun" title="A basic muon test with 2 active volumes">
         <parameter name="experimentName" value="CosmicMuonScan"/>
         <parameter name="readOnly" value="false"/>
@@ -12,51 +10,38 @@
         <parameter name="overwrite" value="off"/>
         <parameter name="outputFileName" value="Run[fRunNumber]_[fRunType]_[fRunTag]_[fRunUser].root"/>
     </TRestRun>
-
     <TRestGeant4Metadata name="restG4 run" title="MuonsFromCircle">
-
-        <parameter name="gdmlFile" value="setup.gdml"/>
+        <parameter name="gdmlFile" value="geometry/setup.gdml"/>
         <parameter name="subEventTimeDelay" value="100us"/>
-
         <parameter name="nEvents" value="10000"/>
-
         <parameter name="seed" value="1702198"/>
         <parameter name="saveAllEvents" value="false"/>
         <parameter name="printProgress" value="true"/>
-
         <!-- From planar surface above detector (cosmic rays) -->
-        <generator type="surface" shape="circle"
-                   position="(0,100,0)mm" size="(400,0,0)mm"
-                   rotationAngle="90deg" rotationAxis="(1,0,0)">
+        <generator type="surface" shape="circle" position="(0,100,0)mm" size="(400,0,0)mm" rotationAngle="90deg" rotationAxis="(1,0,0)">
             <source particle="mu-" excitedLevel="0.0" fullChain="on">
                 <energy type="TH1D" file="Muons.root" name="cosmicmuon"/>
                 <angular type="formula" name="Cos2" direction="(0,-1,0)"/>
             </source>
         </generator>
-
         <detector>
             <parameter name="energyRange" value="(0,10)" units="GeV"/>
             <volume name="det_dw_01" sensitive="true" maxStepSize="1mm"/>
             <volume name="det_up_01" maxStepSize="1mm"/>
         </detector>
-
     </TRestGeant4Metadata>
-
     <TRestGeant4PhysicsLists name="default" title="First physics list implementation." verboseLevel="warning">
         <parameter name="cutForGamma" value="1" units="um"/>
         <parameter name="cutForElectron" value="1" units="um"/>
         <parameter name="cutForPositron" value="1" units="um"/>
-
         <parameter name="cutForMuon" value="1" units="mm"/>
         <parameter name="cutForNeutron" value="1" units="mm"/>
         <parameter name="minEnergyRangeProductionCuts" value="1" units="keV"/>
         <parameter name="maxEnergyRangeProductionCuts" value="1" units="GeV"/>
-
         <!-- EM Physics lists -->
         <physicsList name="G4EmLivermorePhysics"/>
         <!-- <physicsList name="G4EmPenelopePhysics"> </physicsList> -->
         <!-- <physicsList name="G4EmStandardPhysics_option3"> </physicsList> -->
-
         <!-- Decay physics lists -->
         <physicsList name="G4DecayPhysics"/>
         <physicsList name="G4RadioactiveDecayPhysics"/>
@@ -64,13 +49,10 @@
             <option name="ICM" value="true"/>
             <option name="ARM" value="true"/>
         </physicsList>
-
         <!-- Hadron physics lists -->
         <physicsList name="G4HadronElasticPhysicsHP"/>
         <physicsList name="G4IonBinaryCascadePhysics"/>
         <physicsList name="G4HadronPhysicsQGSP_BIC_HP"/>
         <physicsList name="G4EmExtraPhysics"/>
-
     </TRestGeant4PhysicsLists>
-
 </restG4>
diff --git a/examples/04.MuonScan/CosmicMuonsFromWall.rml b/examples/04.MuonScan/CosmicMuonsFromWall.rml
index dd178577..027e19a0 100644
--- a/examples/04.MuonScan/CosmicMuonsFromWall.rml
+++ b/examples/04.MuonScan/CosmicMuonsFromWall.rml
@@ -1,10 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
 First concept author G. Luzón (16-11-2020) -->
-
 <restG4>
-
     <TRestRun name="CosmicMuonRun" title="A basic muon test with 2 active volumes">
         <parameter name="experimentName" value="CosmicMuonScan"/>
         <parameter name="readOnly" value="false"/>
@@ -15,49 +12,37 @@ First concept author G. Luzón (16-11-2020) -->
         <parameter name="overwrite" value="off"/>
         <parameter name="outputFileName" value="Run[fRunNumber]_[fRunType]_[fRunTag]_[fRunUser].root"/>
     </TRestRun>
-
     <TRestGeant4Metadata name="restG4 run" title="MuonsFromWall">
-
-        <parameter name="gdmlFile" value="setup.gdml"/>
+        <parameter name="gdmlFile" value="geometry/setup.gdml"/>
         <parameter name="subEventTimeDelay" value="100us"/>
-
         <parameter name="nEvents" value="1000"/>
         <parameter name="seed" value="17021981"/>
-
         <parameter name="saveAllEvents" value="false"/>
         <parameter name="printProgress" value="true"/>
-
-        <generator type="surface" shape="wall" position="(0,0,50)cm" size="(30,30,0)cm" rotationAngle="0"
-                   rotationAxis="(1,0,0)">
+        <generator type="surface" shape="wall" position="(0,0,50)cm" size="(30,30,0)cm" rotationAngle="0" rotationAxis="(1,0,0)">
             <source particle="mu-" excitedLevel="0.0" fullChain="on">
                 <energy type="TH1D" file="Muons.root" name="cosmicmuon"/>
                 <angular type="formula" name="Cos2" direction="(0,0,-1)"/>
             </source>
         </generator>
-
         <detector>
             <parameter name="energyRange" value="(0,10)" units="GeV"/>
             <volume name="det_dw_01" sensitive="true" maxStepSize="1mm"/>
             <volume name="det_up_01" maxStepSize="1mm"/>
         </detector>
-
     </TRestGeant4Metadata>
-
     <TRestGeant4PhysicsLists name="default" title="First physics list implementation." verboseLevel="warning">
         <parameter name="cutForGamma" value="1" units="um"/>
         <parameter name="cutForElectron" value="1" units="um"/>
         <parameter name="cutForPositron" value="1" units="um"/>
-
         <parameter name="cutForMuon" value="1" units="mm"/>
         <parameter name="cutForNeutron" value="1" units="mm"/>
         <parameter name="minEnergyRangeProductionCuts" value="1" units="keV"/>
         <parameter name="maxEnergyRangeProductionCuts" value="1" units="GeV"/>
-
         <!-- EM Physics lists -->
         <physicsList name="G4EmLivermorePhysics"/>
         <!-- <physicsList name="G4EmPenelopePhysics"> </physicsList> -->
         <!-- <physicsList name="G4EmStandardPhysics_option3"> </physicsList> -->
-
         <!-- Decay physics lists -->
         <physicsList name="G4DecayPhysics"/>
         <physicsList name="G4RadioactiveDecayPhysics"/>
@@ -65,13 +50,10 @@ First concept author G. Luzón (16-11-2020) -->
             <option name="ICM" value="true"/>
             <option name="ARM" value="true"/>
         </physicsList>
-
         <!-- Hadron physics lists -->
         <physicsList name="G4HadronElasticPhysicsHP"/>
         <physicsList name="G4IonBinaryCascadePhysics"/>
         <physicsList name="G4HadronPhysicsQGSP_BIC_HP"/>
         <physicsList name="G4EmExtraPhysics"/>
-
     </TRestGeant4PhysicsLists>
-
 </restG4>
diff --git a/examples/04.MuonScan/Muon.rml b/examples/04.MuonScan/Muon.rml
index 70fa44a1..9528488a 100644
--- a/examples/04.MuonScan/Muon.rml
+++ b/examples/04.MuonScan/Muon.rml
@@ -11,7 +11,7 @@
         <parameter name="outputFileName" value="Run[fRunNumber]_[fRunType]_[fRunTag]_[fRunUser].root"/>
     </TRestRun>
     <TRestGeant4Metadata name="restG4 run" title="MuonsFromPoint" verboseLevel="info">
-        <parameter name="gdmlFile" value="setup.gdml"/>
+        <parameter name="gdmlFile" value="geometry/setup.gdml"/>
         <parameter name="subEventTimeDelay" value="100us"/>
         <parameter name="nEvents" value="1000"/>
         <parameter name="saveAllEvents" value="off"/>
diff --git a/examples/04.MuonScan/geometry.gdml b/examples/04.MuonScan/geometry/geometry.gdml
similarity index 100%
rename from examples/04.MuonScan/geometry.gdml
rename to examples/04.MuonScan/geometry/geometry.gdml
diff --git a/examples/04.MuonScan/geometry/rest.xml b/examples/04.MuonScan/geometry/rest.xml
new file mode 100644
index 00000000..e69de29b
diff --git a/examples/04.MuonScan/setup.gdml b/examples/04.MuonScan/geometry/setup.gdml
similarity index 93%
rename from examples/04.MuonScan/setup.gdml
rename to examples/04.MuonScan/geometry/setup.gdml
index 005a7d7c..ac094a12 100644
--- a/examples/04.MuonScan/setup.gdml
+++ b/examples/04.MuonScan/geometry/setup.gdml
@@ -3,7 +3,7 @@
 
 <!DOCTYPE gdml [
         <!ENTITY geometry SYSTEM "geometry.gdml">
-        <!ENTITY materials SYSTEM "https://rest-for-physics.github.io/materials/rest.xml">
+        <!ENTITY materials SYSTEM "rest.xml">
         ]>
 
 <gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/examples/07.FullChainDecay/geometry/rest.xml b/examples/07.FullChainDecay/geometry/rest.xml
new file mode 100644
index 00000000..e69de29b
diff --git a/examples/07.FullChainDecay/geometry/setup.gdml b/examples/07.FullChainDecay/geometry/setup.gdml
index 1cf13bc5..13a299d4 100644
--- a/examples/07.FullChainDecay/geometry/setup.gdml
+++ b/examples/07.FullChainDecay/geometry/setup.gdml
@@ -3,7 +3,7 @@
 
 <!DOCTYPE gdml [
         <!ENTITY geometry SYSTEM "geometry.gdml">
-        <!ENTITY materials SYSTEM "https://rest-for-physics.github.io/materials/rest.xml">
+        <!ENTITY materials SYSTEM "rest.xml">
         ]>
 
 <gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

From fa9a088b4867874a64d63e69e688ef7d59bcf293 Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Tue, 4 Oct 2022 10:57:28 +0200
Subject: [PATCH 28/42] Moving local rest.xml from 06 example to 04.

---
 .github/workflows/validation.yml           | 8 ++++----
 examples/04.MuonScan/geometry/setup.gdml   | 2 +-
 examples/06.IonRecoils/geometry/rest.xml   | 0
 examples/06.IonRecoils/geometry/setup.gdml | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
 create mode 100644 examples/06.IonRecoils/geometry/rest.xml

diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml
index de59bd7a..e76fa79e 100644
--- a/.github/workflows/validation.yml
+++ b/.github/workflows/validation.yml
@@ -205,10 +205,6 @@ jobs:
         run: |
           source ${{ env.REST_PATH }}/thisREST.sh
           cd ${{ env.REST_PATH }}/examples/restG4/04.MuonScan/
-          cd geometry
-          rm rest.xml
-          wget https://rest-for-physics.github.io/materials/rest.xml
-          cd ..
           restG4 Muon.rml -o muons_from_point.root
           restRoot -b -q Validate.C'("muons_from_point.root")'
           restG4 CosmicMuonsFromWall.rml -o muons_from_wall.root
@@ -255,6 +251,10 @@ jobs:
         run: |
           source ${{ env.REST_PATH }}/thisREST.sh
           cd ${{ env.REST_PATH }}/examples/restG4/06.IonRecoils/
+          cd geometry
+          rm rest.xml
+          wget https://rest-for-physics.github.io/materials/rest.xml
+          cd ..
           restG4 recoils.rml -o Run00001_F20_Recoils.root
           restRoot -b -q Validate.C'("Run00001_F20_Recoils.root")'
 
diff --git a/examples/04.MuonScan/geometry/setup.gdml b/examples/04.MuonScan/geometry/setup.gdml
index ac094a12..005a7d7c 100644
--- a/examples/04.MuonScan/geometry/setup.gdml
+++ b/examples/04.MuonScan/geometry/setup.gdml
@@ -3,7 +3,7 @@
 
 <!DOCTYPE gdml [
         <!ENTITY geometry SYSTEM "geometry.gdml">
-        <!ENTITY materials SYSTEM "rest.xml">
+        <!ENTITY materials SYSTEM "https://rest-for-physics.github.io/materials/rest.xml">
         ]>
 
 <gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/examples/06.IonRecoils/geometry/rest.xml b/examples/06.IonRecoils/geometry/rest.xml
new file mode 100644
index 00000000..e69de29b
diff --git a/examples/06.IonRecoils/geometry/setup.gdml b/examples/06.IonRecoils/geometry/setup.gdml
index 5cd108a0..c20ad4d5 100644
--- a/examples/06.IonRecoils/geometry/setup.gdml
+++ b/examples/06.IonRecoils/geometry/setup.gdml
@@ -3,7 +3,7 @@
 
 <!DOCTYPE gdml [
         <!ENTITY geometry SYSTEM "geometry.gdml">
-        <!ENTITY materials SYSTEM "https://rest-for-physics.github.io/materials/rest.xml">
+        <!ENTITY materials SYSTEM "rest.xml">
         ]>
 
 <gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

From 2b9bb44b776d368a0065f3b119f191ddf3292366 Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Tue, 4 Oct 2022 11:02:40 +0200
Subject: [PATCH 29/42] Removing empty rest.xml

---
 examples/04.MuonScan/geometry/rest.xml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 examples/04.MuonScan/geometry/rest.xml

diff --git a/examples/04.MuonScan/geometry/rest.xml b/examples/04.MuonScan/geometry/rest.xml
deleted file mode 100644
index e69de29b..00000000

From 2091f4e63454de6b1bb8f4fb60f8772561342ab1 Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Tue, 4 Oct 2022 11:19:45 +0200
Subject: [PATCH 30/42] Updating corrupt local materials file

---
 examples/01.NLDBD/geometry/rest.xml          | 421 +++++++++++++++++++
 examples/06.IonRecoils/geometry/rest.xml     | 421 +++++++++++++++++++
 examples/07.FullChainDecay/geometry/rest.xml | 421 +++++++++++++++++++
 3 files changed, 1263 insertions(+)

diff --git a/examples/01.NLDBD/geometry/rest.xml b/examples/01.NLDBD/geometry/rest.xml
index e69de29b..07b18ad1 100644
--- a/examples/01.NLDBD/geometry/rest.xml
+++ b/examples/01.NLDBD/geometry/rest.xml
@@ -0,0 +1,421 @@
+<!-- ##VERSION REST materials 1.4## -->
+<!-- densities in mg/cm3 @ 293.15K -->
+    <materials>
+        <!-- {{{ Elements definition -->
+        <element name="Hydrogen" formula="H" Z="1">
+            <atom value="1.00794" />
+        </element>
+       
+	<element name="Helium" formula="N" Z="2">
+	    <atom value="4.0026" />
+	</element>
+
+        <element name="Carbon" formula="C" Z="6">
+            <atom value="12.0107" />
+        </element>
+        <element name="Nitrogen" formula="N" Z="7">
+            <atom value="14.0067" />
+        </element>
+        <element name="Fluor" formula="F" Z="9">
+            <atom value="18.9984" />
+        </element>
+        <element name="Silicon" formula="Si" Z="14" state="solid">
+            <atom value="28.0855" />
+        </element>
+        <element name="Chromium" formula="Cr" Z="24" state="solid">
+            <atom value="51.996" />
+        </element>
+        <element name="Manganese" formula="Mn" Z="25">
+            <atom value="54.938045" />
+        </element>
+        <element name="Iron" formula="Fe" Z="26" state="solid">
+            <atom value="55.845" />
+        </element>
+        <element name="Nickel" formula="Ni" Z="28" state="solid">
+            <atom value="58.6934" />
+        </element>
+        <element name="Aluminium" formula="Al" Z="13" state="solid">
+            <atom value="26.982" />
+        </element>
+        <element name="Xenon" formula="Xe" Z="54" state="gas">
+            <atom value="131.293" />
+        </element>
+        <element name="Argon" formula="Ar" Z="18" state="gas">
+            <atom value="39.948" />
+        </element>
+        <element name="Neon" formula="Ne" Z="10" state="gas">
+         <atom value="20.1797" />
+        </element>
+        <element name="Zinc" formula="Zn" Z="30">
+	<atom value="65.4094"/>
+        </element>
+	<element name="Magnesium" formula="Mg" Z="12">
+	<atom value="24.3050"/>
+	</element>
+	<element name="Sulfur" formula="S" Z="16">
+	<atom value="32.0655"/>
+	</element>
+          <element name="Chlorine" formula="Cl" Z="17">
+	<atom value="35.4532"/>
+	</element>
+        <element name="Iodide" formula="I" Z="53">
+	<atom value="126.9"/>
+	</element>
+      
+
+        
+       
+        <!-- }}} -->
+
+        <!-- {{{ Quenchers -->
+        <material name="TMA" state="gas">
+            <D unit="mg/cm3" value="quencherDensity" />
+            <T unit="K" value="gasTemperature" />
+            <P unit="bar" value="gasPressure" />
+            <composite n="3" ref="Carbon" />
+            <composite n="9" ref="Hydrogen" />
+            <composite n="1" ref="Nitrogen" />
+        </material>
+
+        <material name="isobutane" state="gas">
+            <D unit="mg/cm3" value="quencherDensity" />
+            <T unit="K" value="gasTemperature" />
+            <P unit="bar" value="gasPressure" />
+            <composite n="4" ref="Carbon" />
+            <composite n="10" ref="Hydrogen" />
+        </material>
+        <!-- }}} -->
+
+        <!-- {{{ Gas mixtures -->
+        <material name="PureHelium" state="gas">
+	    <T unit="K" value="gasTemperature"/>
+	    <P unit="bar" value="gasPressure"/>
+	    <MEE unit="eV" value="188"/>
+            <D unit="mg/cm3" value="targetGasDensity"/>
+	    <fraction n="1" ref="Helium"/>
+	</material>
+
+        <material name="PureXenon" state="gas">
+            <T unit="K" value="gasTemperature"/>
+            <P unit="bar" value="gasPressure"/>
+            <MEE unit="eV" value="482"/>
+            <D unit="mg/cm3" value="targetGasDensity"/>
+            <fraction n="1" ref="Xenon"/>
+        </material>
+
+        <material name="Xenon_TMA" state="gas">
+            <D unit="mg/cm3" value="targetGasDensity+quencherDensity" />
+            <P unit="bar" value="gasPressure" />
+            <T unit="K" value="gasTemperature" />
+            <fraction n="quencherFraction" ref="TMA" />
+            <fraction n="1-quencherFraction" ref="Xenon" />
+        </material>
+
+        <material name="Xenon_ISO" state="gas">
+            <D unit="mg/cm3" value="targetGasDensity+quencherDensity" />
+            <P unit="bar" value="gasPressure" />
+            <T unit="K" value="gasTemperature" />
+            <fraction n="quencherFraction" ref="isobutane" />
+            <fraction n="1-quencherFraction" ref="Xenon" />
+        </material>
+
+        <material name="PureArgon" state="gas">
+            <T unit="K" value="gasTemperature"/>
+            <P unit="bar" value="gasPressure"/>
+            <MEE unit="eV" value="188"/>
+            <D unit="mg/cm3" value="targetGasDensity"/>
+            <fraction n="1" ref="Argon"/>
+        </material>
+
+        <material name="Ar_ISO" state="gas">
+            <D unit="mg/cm3" value="targetGasDensity+quencherDensity" />
+            <P unit="bar" value="gasPressure" />
+            <T unit="K" value="gasTemperature" />
+            <fraction n="quencherFraction" ref="isobutane" />
+            <fraction n="1-quencherFraction" ref="Argon" />
+        </material>
+
+        <material name="Neon_ISO" state="gas">
+            <D unit="mg/cm3" value="targetGasDensity+quencherDensity" />
+            <P unit="bar" value="gasPressure" />
+            <T unit="K" value="gasTemperature" />
+            <fraction n="quencherFraction" ref="isobutane" />
+            <fraction n="1-quencherFraction" ref="Neon" />
+        </material>
+
+        <!-- }}} -->
+
+        <!-- {{{ Copper -->
+        <isotope N="63" Z="29" name="Cu63">
+            <atom unit="g/mole" value="62.9296"/>
+        </isotope>
+        <isotope N="65" Z="29" name="Cu65">
+            <atom unit="g/mole" value="64.9278"/>
+        </isotope>
+        <element name="Cu">
+            <fraction n="0.6917" ref="Cu63"/>
+            <fraction n="0.3083" ref="Cu65"/>
+        </element>
+        <material name="Copper" state="solid">
+            <MEE unit="eV" value="322"/>
+            <D unit="g/cm3" value="8.96"/>
+            <fraction n="1" ref="Cu"/>
+        </material>
+        <!-- }}} -->
+
+      <!-- {{{ Aluminium -->
+        <isotope N="27" Z="13" name="Al27">
+        <atom unit="g/mole" value="26.982"/>
+          </isotope>
+        <element name="Al">
+        <fraction n="1.0000" ref="Al27"/>
+        </element>
+        <material name="Aluminium" state="solid">
+         <MEE unit="eV" value="166"/>
+        <D unit="g/cm3" value="2.70"/>
+        <fraction n="1" ref="Al"/>
+         </material>
+    <!-- }}} -->   
+
+ 	<!-- {{{ Cadmium-->
+        <isotope N="106" Z="48" name="Cd106">
+        <atom unit="g/mole" value="105.91"/>
+          </isotope>
+	<isotope N="108" Z="48" name="Cd108">
+        <atom unit="g/mole" value="107.90"/>
+          </isotope>
+	<isotope N="110" Z="48" name="Cd110">
+        <atom unit="g/mole" value="109.90"/>
+          </isotope>
+	<isotope N="111" Z="48" name="Cd111">
+        <atom unit="g/mole" value="110.90"/>
+          </isotope>
+	<isotope N="112" Z="48" name="Cd112">
+        <atom unit="g/mole" value="111.90"/>
+          </isotope>
+	<isotope N="113" Z="48" name="Cd113">
+        <atom unit="g/mole" value="112.90"/>
+          </isotope>
+	<isotope N="114" Z="48" name="Cd114">
+        <atom unit="g/mole" value="113.90"/>
+          </isotope>
+	<isotope N="116" Z="48" name="Cd116">
+        <atom unit="g/mole" value="115.90"/>
+          </isotope>
+        <element name="Cd">
+        <fraction n="0.0125" ref="Cd106"/>
+	 <fraction n="0.0089" ref="Cd108"/>
+	 <fraction n="0.1249" ref="Cd110"/>
+	 <fraction n="0.1280" ref="Cd111"/>
+	 <fraction n="0.2413" ref="Cd112"/>
+	<fraction n="0.1222" ref="Cd113"/>
+	 <fraction n="0.2873" ref="Cd114"/>
+	 <fraction n="0.0749" ref="Cd116"/>
+        </element>
+        <material name="Cadmium" state="solid">
+         <MEE unit="eV" value="469.0"/>
+        <D unit="g/cm3" value="8.65"/>
+ 	 <fraction n="1" ref="Cd"/>
+         </material>
+   	 <!-- }}} -->   
+
+         <!-- {{{ 6-Lithium -->
+   	 <isotope N="6" Z="3" name="Li6">
+        <atom unit="g/mole" value="6"/>
+    	</isotope>    
+   	 <element name="6Li">
+        <fraction n="1" ref="Li6"/>
+    	</element>
+   	 <material name="6-Lithium" state="solid">
+        <D unit="g/cm3" value="0.463"/>
+        <fraction n="1" ref="6Li"/>
+    	</material>
+          <!-- }}} -->
+        <!-- {{{  Lithium6 iodide -->
+    	<material name="6LiI" formula="6-LiI">
+        <MEE unit="eV" value="485.1"/>
+        <D unit="g/cm3" value="3.494" />
+        <composite n="1" ref="6-Lithium" />
+        <composite n="1" ref="iodide" />
+   	 </material>
+    <!-- }}} -->
+	
+                                      
+        <!-- {{{ Stainlesssteel -->
+        <material name="Stainlesssteel" state="solid">
+            <MEE unit="eV" value="280.927567486627"/>
+            <D unit="g/cm3" value="8.02"/>
+            <fraction n="0.02" ref="Manganese"/>
+            <fraction n="0.01" ref="Silicon"/>
+            <fraction n="0.19" ref="Chromium"/>
+            <fraction n="0.1" ref="Nickel"/>
+            <fraction n="0.68" ref="Iron"/>
+        </material>
+        <!-- }}} -->
+
+        <!-- {{{ Air -->
+        <isotope N="14" Z="7" name="N14">
+            <atom unit="g/mole" value="14.0031"/>
+        </isotope>
+        <isotope N="15" Z="7" name="N15">
+            <atom unit="g/mole" value="15.0001"/>
+        </isotope>
+        <element name="Nitrogen">
+            <fraction n="0.99632" ref="N14"/>
+            <fraction n="0.00368" ref="N15"/>
+        </element>
+
+        <isotope N="16" Z="8" name="O16">
+            <atom unit="g/mole" value="15.9949"/>
+        </isotope>
+        <isotope N="17" Z="8" name="O17">
+            <atom unit="g/mole" value="16.9991"/>
+        </isotope>
+        <isotope N="18" Z="8" name="O18">
+            <atom unit="g/mole" value="17.9992"/>
+        </isotope>
+        <element name="Oxygen">
+            <fraction n="0.99757" ref="O16"/>
+            <fraction n="0.00038" ref="O17"/>
+            <fraction n="0.00205" ref="O18"/>
+        </element>
+        <material name="Air" state="gas">
+            <T unit="K" value="293.13"/>
+            <MEE unit="eV" value="85.7030667332999"/>
+            <D unit="g/cm3" value="0.00129"/>
+            <fraction n="0.7" ref="Nitrogen"/>
+            <fraction n="0.3" ref="Oxygen"/>
+        </material>
+        <!-- }}} -->
+
+        <!-- {{{ Vacuum -->
+        <material name="Vacuum" state="gas">
+            <T unit="K" value="293.13"/>
+            <MEE unit="eV" value="85.7030667332999"/>
+            <D unit="g/cm3" value="1.e-20"/>
+            <fraction n="0.7" ref="Nitrogen"/>
+            <fraction n="0.3" ref="Oxygen"/>
+        </material>
+        <!-- }}} -->
+
+        <!-- {{{ Water -->
+        <element Z="1" formula="H" name="Hydrogen">
+            <atom value="2" />
+        </element>
+
+        <element Z="8" formula="O" name="Oxygen">
+            <atom value="16" />
+        </element>
+
+        <material name="Water" formula="H2O">
+            <D value="1.0" />
+            <composite n="2" ref="Hydrogen" />
+            <composite n="1" ref="Oxygen" />
+        </material>
+        <!-- }}} -->
+
+        <!-- {{{ Lead -->
+        <isotope N="204" Z="82" name="Pb204">
+            <atom unit="g/mole" value="203.973"/>
+        </isotope>
+        <isotope N="206" Z="82" name="Pb206">
+            <atom unit="g/mole" value="205.974"/>
+        </isotope>
+        <isotope N="207" Z="82" name="Pb207">
+            <atom unit="g/mole" value="206.976"/>
+        </isotope>
+        <isotope N="208" Z="82" name="Pb208">
+            <atom unit="g/mole" value="207.977"/>
+        </isotope>
+        <element name="Pb">
+            <fraction n="0.014" ref="Pb204"/>
+            <fraction n="0.241" ref="Pb206"/>
+            <fraction n="0.221" ref="Pb207"/>
+            <fraction n="0.524" ref="Pb208"/>
+        </element>
+        <material name="Lead" state="solid">
+            <MEE unit="eV" value="823"/>
+            <D unit="g/cm3" value="11.34"/>
+            <fraction n="1" ref="Pb"/>
+        </material>
+        <!-- }}} -->
+
+        <!-- {{{ Kapton -->
+        <material name="Kapton" state="solid">
+            <MEE unit="eV" value="79.6"/>
+            <D unit="g/cm3" value="1.42"/>
+            <fraction n="0.026362" ref="Hydrogen"/>
+            <fraction n="0.691133" ref="Carbon"/>
+            <fraction n="0.073270" ref="Nitrogen"/>
+            <fraction n="0.209235" ref="Oxygen"/>
+        </material>
+        <!-- }}} -->
+	<!--  {{{ Rubber-Neoprene -->
+	<material name="Neoprene" state="solid">
+	<D unit="g/cm3" value="1.23"/>
+          <MEE unit="eV" value="93.000000"/>
+	<fraction n="0.542646" ref="Carbon"/>
+	<fraction n="0.056920" ref="Hydrogen"/>
+	<fraction n="0.400434" ref="Chlorine"/>
+	
+	</material>
+	<!--  }}}  -->
+
+        <!-- {{{ Teflon (PTFE) -->
+        <material name="PTFE" state="solid">
+            <MEE unit="eV" value="105.35244885659"/>
+            <D unit="g/cm3" value="2.2"/>
+            <fraction n="0.240151969606079" ref="Carbon"/>
+            <fraction n="0.759848030393921" ref="Fluor"/>
+        </material>
+        <!-- }}} -->
+
+       <!-- {{{ Polyethylene -->
+    	<material name="PE" state="solid">
+            <MEE unit="eV" value="57.4000000"/>
+            <D unit="g/cm3" value="0.940"/>
+            <fraction n="0.143711" ref="Hydrogen"/>
+            <fraction n="0.856289" ref="Carbon"/>
+     	</material>
+    	<!-- }}} -->
+
+        <!-- {{{ Mylar -->
+        <material name="Mylar" state="solid">
+            <MEE unit="eV" value="78.700000"/>
+            <D unit="g/cm3" value="2.2"/>
+            <fraction n="0.041959" ref="Hydrogen"/>
+            <fraction n="0.625017" ref="Fluor"/>
+            <fraction n="0.333025" ref="Oxygen"/>
+        </material>
+        <!-- }}} -->
+
+        <!-- {{{ Plasctic scintillator -->
+        <material name="BC408" state="solid">
+            <MEE unit="eV" value="64.700000"/>
+            <D unit="g/cm3" value="1.03"/>
+            <fraction n="0.085000" ref="Hydrogen"/>
+            <fraction n="0.915000" ref="Carbon"/>
+        </material>
+        <!-- }}} -->
+	
+	<!-- {{{ Acrylic -->
+         <material name="Acrylic" state="solid">
+             <MEE unit="eV" value="0.00000"/><!-- this is not a correct figure -->
+             <D unit="g/cm3" value="1.18"/>
+             <fraction n="0.080000" ref="Hydrogen"/>
+             <fraction n="0.600000" ref="Carbon"/>
+             <fraction n="0.320000" ref="Oxygen"/>
+         </material>
+         <!-- }}} -->
+	<!-- {{{ Silicone (Polydimethylsiloxane) -->
+    	<material name="PDMS" state="solid">
+             <D unit="g/cm3" value="0.965"/>
+             <fraction n="0.081555" ref="Hydrogen"/>
+             <fraction n="0.323940" ref="Carbon"/>
+             <fraction n="0.215759" ref="Oxygen"/>
+             <fraction n="0.378746" ref="Silicon"/>
+     	</material>
+    	<!-- }}} -->
+      
+
+    </materials>
diff --git a/examples/06.IonRecoils/geometry/rest.xml b/examples/06.IonRecoils/geometry/rest.xml
index e69de29b..07b18ad1 100644
--- a/examples/06.IonRecoils/geometry/rest.xml
+++ b/examples/06.IonRecoils/geometry/rest.xml
@@ -0,0 +1,421 @@
+<!-- ##VERSION REST materials 1.4## -->
+<!-- densities in mg/cm3 @ 293.15K -->
+    <materials>
+        <!-- {{{ Elements definition -->
+        <element name="Hydrogen" formula="H" Z="1">
+            <atom value="1.00794" />
+        </element>
+       
+	<element name="Helium" formula="N" Z="2">
+	    <atom value="4.0026" />
+	</element>
+
+        <element name="Carbon" formula="C" Z="6">
+            <atom value="12.0107" />
+        </element>
+        <element name="Nitrogen" formula="N" Z="7">
+            <atom value="14.0067" />
+        </element>
+        <element name="Fluor" formula="F" Z="9">
+            <atom value="18.9984" />
+        </element>
+        <element name="Silicon" formula="Si" Z="14" state="solid">
+            <atom value="28.0855" />
+        </element>
+        <element name="Chromium" formula="Cr" Z="24" state="solid">
+            <atom value="51.996" />
+        </element>
+        <element name="Manganese" formula="Mn" Z="25">
+            <atom value="54.938045" />
+        </element>
+        <element name="Iron" formula="Fe" Z="26" state="solid">
+            <atom value="55.845" />
+        </element>
+        <element name="Nickel" formula="Ni" Z="28" state="solid">
+            <atom value="58.6934" />
+        </element>
+        <element name="Aluminium" formula="Al" Z="13" state="solid">
+            <atom value="26.982" />
+        </element>
+        <element name="Xenon" formula="Xe" Z="54" state="gas">
+            <atom value="131.293" />
+        </element>
+        <element name="Argon" formula="Ar" Z="18" state="gas">
+            <atom value="39.948" />
+        </element>
+        <element name="Neon" formula="Ne" Z="10" state="gas">
+         <atom value="20.1797" />
+        </element>
+        <element name="Zinc" formula="Zn" Z="30">
+	<atom value="65.4094"/>
+        </element>
+	<element name="Magnesium" formula="Mg" Z="12">
+	<atom value="24.3050"/>
+	</element>
+	<element name="Sulfur" formula="S" Z="16">
+	<atom value="32.0655"/>
+	</element>
+          <element name="Chlorine" formula="Cl" Z="17">
+	<atom value="35.4532"/>
+	</element>
+        <element name="Iodide" formula="I" Z="53">
+	<atom value="126.9"/>
+	</element>
+      
+
+        
+       
+        <!-- }}} -->
+
+        <!-- {{{ Quenchers -->
+        <material name="TMA" state="gas">
+            <D unit="mg/cm3" value="quencherDensity" />
+            <T unit="K" value="gasTemperature" />
+            <P unit="bar" value="gasPressure" />
+            <composite n="3" ref="Carbon" />
+            <composite n="9" ref="Hydrogen" />
+            <composite n="1" ref="Nitrogen" />
+        </material>
+
+        <material name="isobutane" state="gas">
+            <D unit="mg/cm3" value="quencherDensity" />
+            <T unit="K" value="gasTemperature" />
+            <P unit="bar" value="gasPressure" />
+            <composite n="4" ref="Carbon" />
+            <composite n="10" ref="Hydrogen" />
+        </material>
+        <!-- }}} -->
+
+        <!-- {{{ Gas mixtures -->
+        <material name="PureHelium" state="gas">
+	    <T unit="K" value="gasTemperature"/>
+	    <P unit="bar" value="gasPressure"/>
+	    <MEE unit="eV" value="188"/>
+            <D unit="mg/cm3" value="targetGasDensity"/>
+	    <fraction n="1" ref="Helium"/>
+	</material>
+
+        <material name="PureXenon" state="gas">
+            <T unit="K" value="gasTemperature"/>
+            <P unit="bar" value="gasPressure"/>
+            <MEE unit="eV" value="482"/>
+            <D unit="mg/cm3" value="targetGasDensity"/>
+            <fraction n="1" ref="Xenon"/>
+        </material>
+
+        <material name="Xenon_TMA" state="gas">
+            <D unit="mg/cm3" value="targetGasDensity+quencherDensity" />
+            <P unit="bar" value="gasPressure" />
+            <T unit="K" value="gasTemperature" />
+            <fraction n="quencherFraction" ref="TMA" />
+            <fraction n="1-quencherFraction" ref="Xenon" />
+        </material>
+
+        <material name="Xenon_ISO" state="gas">
+            <D unit="mg/cm3" value="targetGasDensity+quencherDensity" />
+            <P unit="bar" value="gasPressure" />
+            <T unit="K" value="gasTemperature" />
+            <fraction n="quencherFraction" ref="isobutane" />
+            <fraction n="1-quencherFraction" ref="Xenon" />
+        </material>
+
+        <material name="PureArgon" state="gas">
+            <T unit="K" value="gasTemperature"/>
+            <P unit="bar" value="gasPressure"/>
+            <MEE unit="eV" value="188"/>
+            <D unit="mg/cm3" value="targetGasDensity"/>
+            <fraction n="1" ref="Argon"/>
+        </material>
+
+        <material name="Ar_ISO" state="gas">
+            <D unit="mg/cm3" value="targetGasDensity+quencherDensity" />
+            <P unit="bar" value="gasPressure" />
+            <T unit="K" value="gasTemperature" />
+            <fraction n="quencherFraction" ref="isobutane" />
+            <fraction n="1-quencherFraction" ref="Argon" />
+        </material>
+
+        <material name="Neon_ISO" state="gas">
+            <D unit="mg/cm3" value="targetGasDensity+quencherDensity" />
+            <P unit="bar" value="gasPressure" />
+            <T unit="K" value="gasTemperature" />
+            <fraction n="quencherFraction" ref="isobutane" />
+            <fraction n="1-quencherFraction" ref="Neon" />
+        </material>
+
+        <!-- }}} -->
+
+        <!-- {{{ Copper -->
+        <isotope N="63" Z="29" name="Cu63">
+            <atom unit="g/mole" value="62.9296"/>
+        </isotope>
+        <isotope N="65" Z="29" name="Cu65">
+            <atom unit="g/mole" value="64.9278"/>
+        </isotope>
+        <element name="Cu">
+            <fraction n="0.6917" ref="Cu63"/>
+            <fraction n="0.3083" ref="Cu65"/>
+        </element>
+        <material name="Copper" state="solid">
+            <MEE unit="eV" value="322"/>
+            <D unit="g/cm3" value="8.96"/>
+            <fraction n="1" ref="Cu"/>
+        </material>
+        <!-- }}} -->
+
+      <!-- {{{ Aluminium -->
+        <isotope N="27" Z="13" name="Al27">
+        <atom unit="g/mole" value="26.982"/>
+          </isotope>
+        <element name="Al">
+        <fraction n="1.0000" ref="Al27"/>
+        </element>
+        <material name="Aluminium" state="solid">
+         <MEE unit="eV" value="166"/>
+        <D unit="g/cm3" value="2.70"/>
+        <fraction n="1" ref="Al"/>
+         </material>
+    <!-- }}} -->   
+
+ 	<!-- {{{ Cadmium-->
+        <isotope N="106" Z="48" name="Cd106">
+        <atom unit="g/mole" value="105.91"/>
+          </isotope>
+	<isotope N="108" Z="48" name="Cd108">
+        <atom unit="g/mole" value="107.90"/>
+          </isotope>
+	<isotope N="110" Z="48" name="Cd110">
+        <atom unit="g/mole" value="109.90"/>
+          </isotope>
+	<isotope N="111" Z="48" name="Cd111">
+        <atom unit="g/mole" value="110.90"/>
+          </isotope>
+	<isotope N="112" Z="48" name="Cd112">
+        <atom unit="g/mole" value="111.90"/>
+          </isotope>
+	<isotope N="113" Z="48" name="Cd113">
+        <atom unit="g/mole" value="112.90"/>
+          </isotope>
+	<isotope N="114" Z="48" name="Cd114">
+        <atom unit="g/mole" value="113.90"/>
+          </isotope>
+	<isotope N="116" Z="48" name="Cd116">
+        <atom unit="g/mole" value="115.90"/>
+          </isotope>
+        <element name="Cd">
+        <fraction n="0.0125" ref="Cd106"/>
+	 <fraction n="0.0089" ref="Cd108"/>
+	 <fraction n="0.1249" ref="Cd110"/>
+	 <fraction n="0.1280" ref="Cd111"/>
+	 <fraction n="0.2413" ref="Cd112"/>
+	<fraction n="0.1222" ref="Cd113"/>
+	 <fraction n="0.2873" ref="Cd114"/>
+	 <fraction n="0.0749" ref="Cd116"/>
+        </element>
+        <material name="Cadmium" state="solid">
+         <MEE unit="eV" value="469.0"/>
+        <D unit="g/cm3" value="8.65"/>
+ 	 <fraction n="1" ref="Cd"/>
+         </material>
+   	 <!-- }}} -->   
+
+         <!-- {{{ 6-Lithium -->
+   	 <isotope N="6" Z="3" name="Li6">
+        <atom unit="g/mole" value="6"/>
+    	</isotope>    
+   	 <element name="6Li">
+        <fraction n="1" ref="Li6"/>
+    	</element>
+   	 <material name="6-Lithium" state="solid">
+        <D unit="g/cm3" value="0.463"/>
+        <fraction n="1" ref="6Li"/>
+    	</material>
+          <!-- }}} -->
+        <!-- {{{  Lithium6 iodide -->
+    	<material name="6LiI" formula="6-LiI">
+        <MEE unit="eV" value="485.1"/>
+        <D unit="g/cm3" value="3.494" />
+        <composite n="1" ref="6-Lithium" />
+        <composite n="1" ref="iodide" />
+   	 </material>
+    <!-- }}} -->
+	
+                                      
+        <!-- {{{ Stainlesssteel -->
+        <material name="Stainlesssteel" state="solid">
+            <MEE unit="eV" value="280.927567486627"/>
+            <D unit="g/cm3" value="8.02"/>
+            <fraction n="0.02" ref="Manganese"/>
+            <fraction n="0.01" ref="Silicon"/>
+            <fraction n="0.19" ref="Chromium"/>
+            <fraction n="0.1" ref="Nickel"/>
+            <fraction n="0.68" ref="Iron"/>
+        </material>
+        <!-- }}} -->
+
+        <!-- {{{ Air -->
+        <isotope N="14" Z="7" name="N14">
+            <atom unit="g/mole" value="14.0031"/>
+        </isotope>
+        <isotope N="15" Z="7" name="N15">
+            <atom unit="g/mole" value="15.0001"/>
+        </isotope>
+        <element name="Nitrogen">
+            <fraction n="0.99632" ref="N14"/>
+            <fraction n="0.00368" ref="N15"/>
+        </element>
+
+        <isotope N="16" Z="8" name="O16">
+            <atom unit="g/mole" value="15.9949"/>
+        </isotope>
+        <isotope N="17" Z="8" name="O17">
+            <atom unit="g/mole" value="16.9991"/>
+        </isotope>
+        <isotope N="18" Z="8" name="O18">
+            <atom unit="g/mole" value="17.9992"/>
+        </isotope>
+        <element name="Oxygen">
+            <fraction n="0.99757" ref="O16"/>
+            <fraction n="0.00038" ref="O17"/>
+            <fraction n="0.00205" ref="O18"/>
+        </element>
+        <material name="Air" state="gas">
+            <T unit="K" value="293.13"/>
+            <MEE unit="eV" value="85.7030667332999"/>
+            <D unit="g/cm3" value="0.00129"/>
+            <fraction n="0.7" ref="Nitrogen"/>
+            <fraction n="0.3" ref="Oxygen"/>
+        </material>
+        <!-- }}} -->
+
+        <!-- {{{ Vacuum -->
+        <material name="Vacuum" state="gas">
+            <T unit="K" value="293.13"/>
+            <MEE unit="eV" value="85.7030667332999"/>
+            <D unit="g/cm3" value="1.e-20"/>
+            <fraction n="0.7" ref="Nitrogen"/>
+            <fraction n="0.3" ref="Oxygen"/>
+        </material>
+        <!-- }}} -->
+
+        <!-- {{{ Water -->
+        <element Z="1" formula="H" name="Hydrogen">
+            <atom value="2" />
+        </element>
+
+        <element Z="8" formula="O" name="Oxygen">
+            <atom value="16" />
+        </element>
+
+        <material name="Water" formula="H2O">
+            <D value="1.0" />
+            <composite n="2" ref="Hydrogen" />
+            <composite n="1" ref="Oxygen" />
+        </material>
+        <!-- }}} -->
+
+        <!-- {{{ Lead -->
+        <isotope N="204" Z="82" name="Pb204">
+            <atom unit="g/mole" value="203.973"/>
+        </isotope>
+        <isotope N="206" Z="82" name="Pb206">
+            <atom unit="g/mole" value="205.974"/>
+        </isotope>
+        <isotope N="207" Z="82" name="Pb207">
+            <atom unit="g/mole" value="206.976"/>
+        </isotope>
+        <isotope N="208" Z="82" name="Pb208">
+            <atom unit="g/mole" value="207.977"/>
+        </isotope>
+        <element name="Pb">
+            <fraction n="0.014" ref="Pb204"/>
+            <fraction n="0.241" ref="Pb206"/>
+            <fraction n="0.221" ref="Pb207"/>
+            <fraction n="0.524" ref="Pb208"/>
+        </element>
+        <material name="Lead" state="solid">
+            <MEE unit="eV" value="823"/>
+            <D unit="g/cm3" value="11.34"/>
+            <fraction n="1" ref="Pb"/>
+        </material>
+        <!-- }}} -->
+
+        <!-- {{{ Kapton -->
+        <material name="Kapton" state="solid">
+            <MEE unit="eV" value="79.6"/>
+            <D unit="g/cm3" value="1.42"/>
+            <fraction n="0.026362" ref="Hydrogen"/>
+            <fraction n="0.691133" ref="Carbon"/>
+            <fraction n="0.073270" ref="Nitrogen"/>
+            <fraction n="0.209235" ref="Oxygen"/>
+        </material>
+        <!-- }}} -->
+	<!--  {{{ Rubber-Neoprene -->
+	<material name="Neoprene" state="solid">
+	<D unit="g/cm3" value="1.23"/>
+          <MEE unit="eV" value="93.000000"/>
+	<fraction n="0.542646" ref="Carbon"/>
+	<fraction n="0.056920" ref="Hydrogen"/>
+	<fraction n="0.400434" ref="Chlorine"/>
+	
+	</material>
+	<!--  }}}  -->
+
+        <!-- {{{ Teflon (PTFE) -->
+        <material name="PTFE" state="solid">
+            <MEE unit="eV" value="105.35244885659"/>
+            <D unit="g/cm3" value="2.2"/>
+            <fraction n="0.240151969606079" ref="Carbon"/>
+            <fraction n="0.759848030393921" ref="Fluor"/>
+        </material>
+        <!-- }}} -->
+
+       <!-- {{{ Polyethylene -->
+    	<material name="PE" state="solid">
+            <MEE unit="eV" value="57.4000000"/>
+            <D unit="g/cm3" value="0.940"/>
+            <fraction n="0.143711" ref="Hydrogen"/>
+            <fraction n="0.856289" ref="Carbon"/>
+     	</material>
+    	<!-- }}} -->
+
+        <!-- {{{ Mylar -->
+        <material name="Mylar" state="solid">
+            <MEE unit="eV" value="78.700000"/>
+            <D unit="g/cm3" value="2.2"/>
+            <fraction n="0.041959" ref="Hydrogen"/>
+            <fraction n="0.625017" ref="Fluor"/>
+            <fraction n="0.333025" ref="Oxygen"/>
+        </material>
+        <!-- }}} -->
+
+        <!-- {{{ Plasctic scintillator -->
+        <material name="BC408" state="solid">
+            <MEE unit="eV" value="64.700000"/>
+            <D unit="g/cm3" value="1.03"/>
+            <fraction n="0.085000" ref="Hydrogen"/>
+            <fraction n="0.915000" ref="Carbon"/>
+        </material>
+        <!-- }}} -->
+	
+	<!-- {{{ Acrylic -->
+         <material name="Acrylic" state="solid">
+             <MEE unit="eV" value="0.00000"/><!-- this is not a correct figure -->
+             <D unit="g/cm3" value="1.18"/>
+             <fraction n="0.080000" ref="Hydrogen"/>
+             <fraction n="0.600000" ref="Carbon"/>
+             <fraction n="0.320000" ref="Oxygen"/>
+         </material>
+         <!-- }}} -->
+	<!-- {{{ Silicone (Polydimethylsiloxane) -->
+    	<material name="PDMS" state="solid">
+             <D unit="g/cm3" value="0.965"/>
+             <fraction n="0.081555" ref="Hydrogen"/>
+             <fraction n="0.323940" ref="Carbon"/>
+             <fraction n="0.215759" ref="Oxygen"/>
+             <fraction n="0.378746" ref="Silicon"/>
+     	</material>
+    	<!-- }}} -->
+      
+
+    </materials>
diff --git a/examples/07.FullChainDecay/geometry/rest.xml b/examples/07.FullChainDecay/geometry/rest.xml
index e69de29b..07b18ad1 100644
--- a/examples/07.FullChainDecay/geometry/rest.xml
+++ b/examples/07.FullChainDecay/geometry/rest.xml
@@ -0,0 +1,421 @@
+<!-- ##VERSION REST materials 1.4## -->
+<!-- densities in mg/cm3 @ 293.15K -->
+    <materials>
+        <!-- {{{ Elements definition -->
+        <element name="Hydrogen" formula="H" Z="1">
+            <atom value="1.00794" />
+        </element>
+       
+	<element name="Helium" formula="N" Z="2">
+	    <atom value="4.0026" />
+	</element>
+
+        <element name="Carbon" formula="C" Z="6">
+            <atom value="12.0107" />
+        </element>
+        <element name="Nitrogen" formula="N" Z="7">
+            <atom value="14.0067" />
+        </element>
+        <element name="Fluor" formula="F" Z="9">
+            <atom value="18.9984" />
+        </element>
+        <element name="Silicon" formula="Si" Z="14" state="solid">
+            <atom value="28.0855" />
+        </element>
+        <element name="Chromium" formula="Cr" Z="24" state="solid">
+            <atom value="51.996" />
+        </element>
+        <element name="Manganese" formula="Mn" Z="25">
+            <atom value="54.938045" />
+        </element>
+        <element name="Iron" formula="Fe" Z="26" state="solid">
+            <atom value="55.845" />
+        </element>
+        <element name="Nickel" formula="Ni" Z="28" state="solid">
+            <atom value="58.6934" />
+        </element>
+        <element name="Aluminium" formula="Al" Z="13" state="solid">
+            <atom value="26.982" />
+        </element>
+        <element name="Xenon" formula="Xe" Z="54" state="gas">
+            <atom value="131.293" />
+        </element>
+        <element name="Argon" formula="Ar" Z="18" state="gas">
+            <atom value="39.948" />
+        </element>
+        <element name="Neon" formula="Ne" Z="10" state="gas">
+         <atom value="20.1797" />
+        </element>
+        <element name="Zinc" formula="Zn" Z="30">
+	<atom value="65.4094"/>
+        </element>
+	<element name="Magnesium" formula="Mg" Z="12">
+	<atom value="24.3050"/>
+	</element>
+	<element name="Sulfur" formula="S" Z="16">
+	<atom value="32.0655"/>
+	</element>
+          <element name="Chlorine" formula="Cl" Z="17">
+	<atom value="35.4532"/>
+	</element>
+        <element name="Iodide" formula="I" Z="53">
+	<atom value="126.9"/>
+	</element>
+      
+
+        
+       
+        <!-- }}} -->
+
+        <!-- {{{ Quenchers -->
+        <material name="TMA" state="gas">
+            <D unit="mg/cm3" value="quencherDensity" />
+            <T unit="K" value="gasTemperature" />
+            <P unit="bar" value="gasPressure" />
+            <composite n="3" ref="Carbon" />
+            <composite n="9" ref="Hydrogen" />
+            <composite n="1" ref="Nitrogen" />
+        </material>
+
+        <material name="isobutane" state="gas">
+            <D unit="mg/cm3" value="quencherDensity" />
+            <T unit="K" value="gasTemperature" />
+            <P unit="bar" value="gasPressure" />
+            <composite n="4" ref="Carbon" />
+            <composite n="10" ref="Hydrogen" />
+        </material>
+        <!-- }}} -->
+
+        <!-- {{{ Gas mixtures -->
+        <material name="PureHelium" state="gas">
+	    <T unit="K" value="gasTemperature"/>
+	    <P unit="bar" value="gasPressure"/>
+	    <MEE unit="eV" value="188"/>
+            <D unit="mg/cm3" value="targetGasDensity"/>
+	    <fraction n="1" ref="Helium"/>
+	</material>
+
+        <material name="PureXenon" state="gas">
+            <T unit="K" value="gasTemperature"/>
+            <P unit="bar" value="gasPressure"/>
+            <MEE unit="eV" value="482"/>
+            <D unit="mg/cm3" value="targetGasDensity"/>
+            <fraction n="1" ref="Xenon"/>
+        </material>
+
+        <material name="Xenon_TMA" state="gas">
+            <D unit="mg/cm3" value="targetGasDensity+quencherDensity" />
+            <P unit="bar" value="gasPressure" />
+            <T unit="K" value="gasTemperature" />
+            <fraction n="quencherFraction" ref="TMA" />
+            <fraction n="1-quencherFraction" ref="Xenon" />
+        </material>
+
+        <material name="Xenon_ISO" state="gas">
+            <D unit="mg/cm3" value="targetGasDensity+quencherDensity" />
+            <P unit="bar" value="gasPressure" />
+            <T unit="K" value="gasTemperature" />
+            <fraction n="quencherFraction" ref="isobutane" />
+            <fraction n="1-quencherFraction" ref="Xenon" />
+        </material>
+
+        <material name="PureArgon" state="gas">
+            <T unit="K" value="gasTemperature"/>
+            <P unit="bar" value="gasPressure"/>
+            <MEE unit="eV" value="188"/>
+            <D unit="mg/cm3" value="targetGasDensity"/>
+            <fraction n="1" ref="Argon"/>
+        </material>
+
+        <material name="Ar_ISO" state="gas">
+            <D unit="mg/cm3" value="targetGasDensity+quencherDensity" />
+            <P unit="bar" value="gasPressure" />
+            <T unit="K" value="gasTemperature" />
+            <fraction n="quencherFraction" ref="isobutane" />
+            <fraction n="1-quencherFraction" ref="Argon" />
+        </material>
+
+        <material name="Neon_ISO" state="gas">
+            <D unit="mg/cm3" value="targetGasDensity+quencherDensity" />
+            <P unit="bar" value="gasPressure" />
+            <T unit="K" value="gasTemperature" />
+            <fraction n="quencherFraction" ref="isobutane" />
+            <fraction n="1-quencherFraction" ref="Neon" />
+        </material>
+
+        <!-- }}} -->
+
+        <!-- {{{ Copper -->
+        <isotope N="63" Z="29" name="Cu63">
+            <atom unit="g/mole" value="62.9296"/>
+        </isotope>
+        <isotope N="65" Z="29" name="Cu65">
+            <atom unit="g/mole" value="64.9278"/>
+        </isotope>
+        <element name="Cu">
+            <fraction n="0.6917" ref="Cu63"/>
+            <fraction n="0.3083" ref="Cu65"/>
+        </element>
+        <material name="Copper" state="solid">
+            <MEE unit="eV" value="322"/>
+            <D unit="g/cm3" value="8.96"/>
+            <fraction n="1" ref="Cu"/>
+        </material>
+        <!-- }}} -->
+
+      <!-- {{{ Aluminium -->
+        <isotope N="27" Z="13" name="Al27">
+        <atom unit="g/mole" value="26.982"/>
+          </isotope>
+        <element name="Al">
+        <fraction n="1.0000" ref="Al27"/>
+        </element>
+        <material name="Aluminium" state="solid">
+         <MEE unit="eV" value="166"/>
+        <D unit="g/cm3" value="2.70"/>
+        <fraction n="1" ref="Al"/>
+         </material>
+    <!-- }}} -->   
+
+ 	<!-- {{{ Cadmium-->
+        <isotope N="106" Z="48" name="Cd106">
+        <atom unit="g/mole" value="105.91"/>
+          </isotope>
+	<isotope N="108" Z="48" name="Cd108">
+        <atom unit="g/mole" value="107.90"/>
+          </isotope>
+	<isotope N="110" Z="48" name="Cd110">
+        <atom unit="g/mole" value="109.90"/>
+          </isotope>
+	<isotope N="111" Z="48" name="Cd111">
+        <atom unit="g/mole" value="110.90"/>
+          </isotope>
+	<isotope N="112" Z="48" name="Cd112">
+        <atom unit="g/mole" value="111.90"/>
+          </isotope>
+	<isotope N="113" Z="48" name="Cd113">
+        <atom unit="g/mole" value="112.90"/>
+          </isotope>
+	<isotope N="114" Z="48" name="Cd114">
+        <atom unit="g/mole" value="113.90"/>
+          </isotope>
+	<isotope N="116" Z="48" name="Cd116">
+        <atom unit="g/mole" value="115.90"/>
+          </isotope>
+        <element name="Cd">
+        <fraction n="0.0125" ref="Cd106"/>
+	 <fraction n="0.0089" ref="Cd108"/>
+	 <fraction n="0.1249" ref="Cd110"/>
+	 <fraction n="0.1280" ref="Cd111"/>
+	 <fraction n="0.2413" ref="Cd112"/>
+	<fraction n="0.1222" ref="Cd113"/>
+	 <fraction n="0.2873" ref="Cd114"/>
+	 <fraction n="0.0749" ref="Cd116"/>
+        </element>
+        <material name="Cadmium" state="solid">
+         <MEE unit="eV" value="469.0"/>
+        <D unit="g/cm3" value="8.65"/>
+ 	 <fraction n="1" ref="Cd"/>
+         </material>
+   	 <!-- }}} -->   
+
+         <!-- {{{ 6-Lithium -->
+   	 <isotope N="6" Z="3" name="Li6">
+        <atom unit="g/mole" value="6"/>
+    	</isotope>    
+   	 <element name="6Li">
+        <fraction n="1" ref="Li6"/>
+    	</element>
+   	 <material name="6-Lithium" state="solid">
+        <D unit="g/cm3" value="0.463"/>
+        <fraction n="1" ref="6Li"/>
+    	</material>
+          <!-- }}} -->
+        <!-- {{{  Lithium6 iodide -->
+    	<material name="6LiI" formula="6-LiI">
+        <MEE unit="eV" value="485.1"/>
+        <D unit="g/cm3" value="3.494" />
+        <composite n="1" ref="6-Lithium" />
+        <composite n="1" ref="iodide" />
+   	 </material>
+    <!-- }}} -->
+	
+                                      
+        <!-- {{{ Stainlesssteel -->
+        <material name="Stainlesssteel" state="solid">
+            <MEE unit="eV" value="280.927567486627"/>
+            <D unit="g/cm3" value="8.02"/>
+            <fraction n="0.02" ref="Manganese"/>
+            <fraction n="0.01" ref="Silicon"/>
+            <fraction n="0.19" ref="Chromium"/>
+            <fraction n="0.1" ref="Nickel"/>
+            <fraction n="0.68" ref="Iron"/>
+        </material>
+        <!-- }}} -->
+
+        <!-- {{{ Air -->
+        <isotope N="14" Z="7" name="N14">
+            <atom unit="g/mole" value="14.0031"/>
+        </isotope>
+        <isotope N="15" Z="7" name="N15">
+            <atom unit="g/mole" value="15.0001"/>
+        </isotope>
+        <element name="Nitrogen">
+            <fraction n="0.99632" ref="N14"/>
+            <fraction n="0.00368" ref="N15"/>
+        </element>
+
+        <isotope N="16" Z="8" name="O16">
+            <atom unit="g/mole" value="15.9949"/>
+        </isotope>
+        <isotope N="17" Z="8" name="O17">
+            <atom unit="g/mole" value="16.9991"/>
+        </isotope>
+        <isotope N="18" Z="8" name="O18">
+            <atom unit="g/mole" value="17.9992"/>
+        </isotope>
+        <element name="Oxygen">
+            <fraction n="0.99757" ref="O16"/>
+            <fraction n="0.00038" ref="O17"/>
+            <fraction n="0.00205" ref="O18"/>
+        </element>
+        <material name="Air" state="gas">
+            <T unit="K" value="293.13"/>
+            <MEE unit="eV" value="85.7030667332999"/>
+            <D unit="g/cm3" value="0.00129"/>
+            <fraction n="0.7" ref="Nitrogen"/>
+            <fraction n="0.3" ref="Oxygen"/>
+        </material>
+        <!-- }}} -->
+
+        <!-- {{{ Vacuum -->
+        <material name="Vacuum" state="gas">
+            <T unit="K" value="293.13"/>
+            <MEE unit="eV" value="85.7030667332999"/>
+            <D unit="g/cm3" value="1.e-20"/>
+            <fraction n="0.7" ref="Nitrogen"/>
+            <fraction n="0.3" ref="Oxygen"/>
+        </material>
+        <!-- }}} -->
+
+        <!-- {{{ Water -->
+        <element Z="1" formula="H" name="Hydrogen">
+            <atom value="2" />
+        </element>
+
+        <element Z="8" formula="O" name="Oxygen">
+            <atom value="16" />
+        </element>
+
+        <material name="Water" formula="H2O">
+            <D value="1.0" />
+            <composite n="2" ref="Hydrogen" />
+            <composite n="1" ref="Oxygen" />
+        </material>
+        <!-- }}} -->
+
+        <!-- {{{ Lead -->
+        <isotope N="204" Z="82" name="Pb204">
+            <atom unit="g/mole" value="203.973"/>
+        </isotope>
+        <isotope N="206" Z="82" name="Pb206">
+            <atom unit="g/mole" value="205.974"/>
+        </isotope>
+        <isotope N="207" Z="82" name="Pb207">
+            <atom unit="g/mole" value="206.976"/>
+        </isotope>
+        <isotope N="208" Z="82" name="Pb208">
+            <atom unit="g/mole" value="207.977"/>
+        </isotope>
+        <element name="Pb">
+            <fraction n="0.014" ref="Pb204"/>
+            <fraction n="0.241" ref="Pb206"/>
+            <fraction n="0.221" ref="Pb207"/>
+            <fraction n="0.524" ref="Pb208"/>
+        </element>
+        <material name="Lead" state="solid">
+            <MEE unit="eV" value="823"/>
+            <D unit="g/cm3" value="11.34"/>
+            <fraction n="1" ref="Pb"/>
+        </material>
+        <!-- }}} -->
+
+        <!-- {{{ Kapton -->
+        <material name="Kapton" state="solid">
+            <MEE unit="eV" value="79.6"/>
+            <D unit="g/cm3" value="1.42"/>
+            <fraction n="0.026362" ref="Hydrogen"/>
+            <fraction n="0.691133" ref="Carbon"/>
+            <fraction n="0.073270" ref="Nitrogen"/>
+            <fraction n="0.209235" ref="Oxygen"/>
+        </material>
+        <!-- }}} -->
+	<!--  {{{ Rubber-Neoprene -->
+	<material name="Neoprene" state="solid">
+	<D unit="g/cm3" value="1.23"/>
+          <MEE unit="eV" value="93.000000"/>
+	<fraction n="0.542646" ref="Carbon"/>
+	<fraction n="0.056920" ref="Hydrogen"/>
+	<fraction n="0.400434" ref="Chlorine"/>
+	
+	</material>
+	<!--  }}}  -->
+
+        <!-- {{{ Teflon (PTFE) -->
+        <material name="PTFE" state="solid">
+            <MEE unit="eV" value="105.35244885659"/>
+            <D unit="g/cm3" value="2.2"/>
+            <fraction n="0.240151969606079" ref="Carbon"/>
+            <fraction n="0.759848030393921" ref="Fluor"/>
+        </material>
+        <!-- }}} -->
+
+       <!-- {{{ Polyethylene -->
+    	<material name="PE" state="solid">
+            <MEE unit="eV" value="57.4000000"/>
+            <D unit="g/cm3" value="0.940"/>
+            <fraction n="0.143711" ref="Hydrogen"/>
+            <fraction n="0.856289" ref="Carbon"/>
+     	</material>
+    	<!-- }}} -->
+
+        <!-- {{{ Mylar -->
+        <material name="Mylar" state="solid">
+            <MEE unit="eV" value="78.700000"/>
+            <D unit="g/cm3" value="2.2"/>
+            <fraction n="0.041959" ref="Hydrogen"/>
+            <fraction n="0.625017" ref="Fluor"/>
+            <fraction n="0.333025" ref="Oxygen"/>
+        </material>
+        <!-- }}} -->
+
+        <!-- {{{ Plasctic scintillator -->
+        <material name="BC408" state="solid">
+            <MEE unit="eV" value="64.700000"/>
+            <D unit="g/cm3" value="1.03"/>
+            <fraction n="0.085000" ref="Hydrogen"/>
+            <fraction n="0.915000" ref="Carbon"/>
+        </material>
+        <!-- }}} -->
+	
+	<!-- {{{ Acrylic -->
+         <material name="Acrylic" state="solid">
+             <MEE unit="eV" value="0.00000"/><!-- this is not a correct figure -->
+             <D unit="g/cm3" value="1.18"/>
+             <fraction n="0.080000" ref="Hydrogen"/>
+             <fraction n="0.600000" ref="Carbon"/>
+             <fraction n="0.320000" ref="Oxygen"/>
+         </material>
+         <!-- }}} -->
+	<!-- {{{ Silicone (Polydimethylsiloxane) -->
+    	<material name="PDMS" state="solid">
+             <D unit="g/cm3" value="0.965"/>
+             <fraction n="0.081555" ref="Hydrogen"/>
+             <fraction n="0.323940" ref="Carbon"/>
+             <fraction n="0.215759" ref="Oxygen"/>
+             <fraction n="0.378746" ref="Silicon"/>
+     	</material>
+    	<!-- }}} -->
+      
+
+    </materials>

From 52d6157e5cf39dd23c9bca67cd4b41ca408c855b Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Tue, 4 Oct 2022 11:43:04 +0200
Subject: [PATCH 31/42] Removing malformed Lithium from local materials file

---
 examples/01.NLDBD/geometry/rest.xml          | 21 -------------------
 examples/06.IonRecoils/geometry/rest.xml     | 21 -------------------
 examples/07.FullChainDecay/geometry/rest.xml | 22 --------------------
 3 files changed, 64 deletions(-)

diff --git a/examples/01.NLDBD/geometry/rest.xml b/examples/01.NLDBD/geometry/rest.xml
index 07b18ad1..40a41977 100644
--- a/examples/01.NLDBD/geometry/rest.xml
+++ b/examples/01.NLDBD/geometry/rest.xml
@@ -219,27 +219,6 @@
          </material>
    	 <!-- }}} -->   
 
-         <!-- {{{ 6-Lithium -->
-   	 <isotope N="6" Z="3" name="Li6">
-        <atom unit="g/mole" value="6"/>
-    	</isotope>    
-   	 <element name="6Li">
-        <fraction n="1" ref="Li6"/>
-    	</element>
-   	 <material name="6-Lithium" state="solid">
-        <D unit="g/cm3" value="0.463"/>
-        <fraction n="1" ref="6Li"/>
-    	</material>
-          <!-- }}} -->
-        <!-- {{{  Lithium6 iodide -->
-    	<material name="6LiI" formula="6-LiI">
-        <MEE unit="eV" value="485.1"/>
-        <D unit="g/cm3" value="3.494" />
-        <composite n="1" ref="6-Lithium" />
-        <composite n="1" ref="iodide" />
-   	 </material>
-    <!-- }}} -->
-	
                                       
         <!-- {{{ Stainlesssteel -->
         <material name="Stainlesssteel" state="solid">
diff --git a/examples/06.IonRecoils/geometry/rest.xml b/examples/06.IonRecoils/geometry/rest.xml
index 07b18ad1..40a41977 100644
--- a/examples/06.IonRecoils/geometry/rest.xml
+++ b/examples/06.IonRecoils/geometry/rest.xml
@@ -219,27 +219,6 @@
          </material>
    	 <!-- }}} -->   
 
-         <!-- {{{ 6-Lithium -->
-   	 <isotope N="6" Z="3" name="Li6">
-        <atom unit="g/mole" value="6"/>
-    	</isotope>    
-   	 <element name="6Li">
-        <fraction n="1" ref="Li6"/>
-    	</element>
-   	 <material name="6-Lithium" state="solid">
-        <D unit="g/cm3" value="0.463"/>
-        <fraction n="1" ref="6Li"/>
-    	</material>
-          <!-- }}} -->
-        <!-- {{{  Lithium6 iodide -->
-    	<material name="6LiI" formula="6-LiI">
-        <MEE unit="eV" value="485.1"/>
-        <D unit="g/cm3" value="3.494" />
-        <composite n="1" ref="6-Lithium" />
-        <composite n="1" ref="iodide" />
-   	 </material>
-    <!-- }}} -->
-	
                                       
         <!-- {{{ Stainlesssteel -->
         <material name="Stainlesssteel" state="solid">
diff --git a/examples/07.FullChainDecay/geometry/rest.xml b/examples/07.FullChainDecay/geometry/rest.xml
index 07b18ad1..cbe95329 100644
--- a/examples/07.FullChainDecay/geometry/rest.xml
+++ b/examples/07.FullChainDecay/geometry/rest.xml
@@ -219,28 +219,6 @@
          </material>
    	 <!-- }}} -->   
 
-         <!-- {{{ 6-Lithium -->
-   	 <isotope N="6" Z="3" name="Li6">
-        <atom unit="g/mole" value="6"/>
-    	</isotope>    
-   	 <element name="6Li">
-        <fraction n="1" ref="Li6"/>
-    	</element>
-   	 <material name="6-Lithium" state="solid">
-        <D unit="g/cm3" value="0.463"/>
-        <fraction n="1" ref="6Li"/>
-    	</material>
-          <!-- }}} -->
-        <!-- {{{  Lithium6 iodide -->
-    	<material name="6LiI" formula="6-LiI">
-        <MEE unit="eV" value="485.1"/>
-        <D unit="g/cm3" value="3.494" />
-        <composite n="1" ref="6-Lithium" />
-        <composite n="1" ref="iodide" />
-   	 </material>
-    <!-- }}} -->
-	
-                                      
         <!-- {{{ Stainlesssteel -->
         <material name="Stainlesssteel" state="solid">
             <MEE unit="eV" value="280.927567486627"/>

From b3951758be67b1128012cf340823e6ccb313957b Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Tue, 4 Oct 2022 12:23:35 +0200
Subject: [PATCH 32/42] Fixing ctests 01.NLDBD example

---
 examples/01.NLDBD/NLDBD2.rml                  | 80 +++++++++++++++++++
 examples/01.NLDBD/README.md                   |  2 +
 .../01.NLDBD/geometry/mySetupTemplate2.gdml   | 50 ++++++++++++
 test/src/examples.cxx                         |  4 +-
 4 files changed, 134 insertions(+), 2 deletions(-)
 create mode 100644 examples/01.NLDBD/NLDBD2.rml
 create mode 100644 examples/01.NLDBD/geometry/mySetupTemplate2.gdml

diff --git a/examples/01.NLDBD/NLDBD2.rml b/examples/01.NLDBD/NLDBD2.rml
new file mode 100644
index 00000000..abaedc3a
--- /dev/null
+++ b/examples/01.NLDBD/NLDBD2.rml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Constructing XML-like REST metadata input file
+     File : config.rml
+     First concept author J. Galan (26-Apr-2015)
+ -->
+<!-- 
+By default REST units are mm, keV and degrees
+-->
+<restG4>
+    <globals>
+        <parameter name="mainDataPath" value=""/>
+        <parameter name="verboseLevel" value="essential"/>
+    </globals>
+    <TRestRun name="Run metadata" title="REST Metadata run info (template)"><parameter name="experimentName" value="Test"/><parameter name="runType" value="simulation"/>
+
+        // Value "auto" can add simulation run into database ???
+        <parameter name="runNumber" value="1"/>
+
+        // If no runTag is given in a restG4 simulation. The title of TRestGeant4Metadata will be used
+        <parameter name="runTag" value="NLDBD"/>
+
+        // The output filename can be built using any member from TRestRun, fRunNumber, fRunTag, ..., etc.
+        <parameter name="outputFile" value="Run[fRunNumber]_[fRunTag]_[fExperimentName].root"/>
+
+        <parameter name="runDescription" value="We launch just 100 events to check everything is ok."/>
+        <parameter name="user" value="${USER}"/>
+        <parameter name="verboseLevel" value="3"/>
+        <parameter name="overwrite" value="off"/>
+        <parameter name="readOnly" value="false"/>
+    </TRestRun>
+    <TRestGeant4Metadata name="DBDsimulation" title="NLDBD"><parameter name="gdmlFile" value="geometry/mySetupTemplate2.gdml"/><parameter name="subEventTimeDelay" value="100" units="us"/><parameter name="seed" value="17021981"/><!-- The number of events to be simulated is now defined in TRestGeant4Metadata --><parameter name="nEvents" value="100"/>
+
+        ///three types of source definition supported:
+        <generator type="volume" from="gas">
+            ///1. generator file
+            <source use="Xe136bb0n.dat"/>
+
+            ///2. decay0 package
+            <!--<source use="decay0" particle="Xe136" decayMode="0vbb" daughterLevel="3" />-->
+
+            ///3. geant4 internal
+            <!--<source use="geant4" particle="Na22" excitedLevel="0.0" fullChain="on">
+              <angular type="isotropic" />
+              <energy type="mono" energy="0.0" units="MeV" />
+            </source>-->
+        </generator>
+
+        <biasing value="off" type="virtualBox"><biasingVolume size="2850mm" position="(0,0,0)mm" factor="2" energyRange="(0,5)MeV"/><biasingVolume size="2450mm" position="(0,0,0)mm" factor="2" energyRange="(0,5)MeV"/><biasingVolume size="2050mm" position="(0,0,0)mm" factor="2" energyRange="(0,5)MeV"/></biasing>
+
+        <detector><parameter name="energyRange" value="(0,5)" units="MeV"/><parameter name="activateAllVolumes" value="false"/><volume name="gas" sensitive="true" maxStepSize="1mm"/></detector>
+
+    </TRestGeant4Metadata>
+    <TRestGeant4PhysicsLists name="default" title="First physics list implementation.">
+        <parameter name="cutForGamma" value="1" units="mm"/>
+        <parameter name="cutForElectron" value="2" units="mm"/>
+        <parameter name="cutForPositron" value="1" units="mm"/>
+        <parameter name="cutForMuon" value="1" units="mm"/>
+        <parameter name="cutForNeutron" value="1" units="mm"/>
+        <parameter name="minEnergyRangeProductionCuts" value="1" units="keV"/>
+        <parameter name="maxEnergyRangeProductionCuts" value="1" units="GeV"/>
+        <!-- EM Physics lists -->
+        <physicsList name="G4EmLivermorePhysics">
+            <!-- "G4EmPenelopePhysics", "G4EmStandardPhysics_option3" -->
+            <option name="pixe" value="true"/>
+        </physicsList>
+        <!-- Decay physics lists -->
+        <physicsList name="G4DecayPhysics"/>
+        <physicsList name="G4RadioactiveDecayPhysics"/>
+        <physicsList name="G4RadioactiveDecay">
+            <option name="ICM" value="true"/>
+            <option name="ARM" value="true"/>
+        </physicsList>
+        <!-- Hadron physics lists -->
+        <physicsList name="G4HadronElasticPhysicsHP"/>
+        <physicsList name="G4IonBinaryCascadePhysics"/>
+        <physicsList name="G4HadronPhysicsQGSP_BIC_HP"/>
+        <physicsList name="G4NeutronTrackingCut"/>
+        <physicsList name="G4EmExtraPhysics"/>
+    </TRestGeant4PhysicsLists>
+</restG4>
diff --git a/examples/01.NLDBD/README.md b/examples/01.NLDBD/README.md
index 876d0b02..648dc919 100644
--- a/examples/01.NLDBD/README.md
+++ b/examples/01.NLDBD/README.md
@@ -5,3 +5,5 @@ Date : 19/July/2019
 **Event generator** : The event generator will launch neutrinoless double beta decays from the gas volume.
 
 **Command** : restG4 NLDBD.rml
+
+**Remark** : The second version of NLDBD.rml is used in order to force loading the remote materials file. Inside the GitHub workflow the remote materials file is downloaded and overwritten (except for the reference pipeline that still needs the old materials file).
diff --git a/examples/01.NLDBD/geometry/mySetupTemplate2.gdml b/examples/01.NLDBD/geometry/mySetupTemplate2.gdml
new file mode 100644
index 00000000..1fca8637
--- /dev/null
+++ b/examples/01.NLDBD/geometry/mySetupTemplate2.gdml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<!-- ##VERSION REST Example 01.NLDBD Version 1.0## -->
+
+<!DOCTYPE gdml [
+        <!ENTITY geometry SYSTEM "myGeometryTemplate.gdml">
+		<!ENTITY materials SYSTEM "https://rest-for-physics.github.io/materials/rest.xml">
+        ]>
+
+<gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:noNamespaceSchemaLocation="http://service-spi.web.cern.ch/service-spi/app/releases/GDML/schema/gdml.xsd">
+
+    <!-- Just an example of main geometry file : myGeometryTemplate.gdml 
+         This file just defines de parameters of the geometry.
+         The geometry it is defined in geometry/myGeometryDefinition.gdml
+         The materials are defined in geometry/materials.xml
+         Author :   J. Galan    Date : 09-Jul-2015
+    -->
+
+    <!-- All values should be in mm -->
+
+    <define>
+        <constant name="world_size" value="20000"/>
+
+        <!-- The TPC gas target -->
+        <constant name="gasRadius" value="750"/>
+        <constant name="gasLength" value="2000"/>
+
+        <variable name="targetGasDensity"
+                  value="56.5884"/> <!-- mg/cm3 (This density corresponds to 200Kg in vessel volume) -->
+        <variable name="quencherDensity" value="0.254"/> <!-- mg/cm3 (Corresponds to 1% TMA) -->
+        <variable name="quencherFraction" value="0.01"/>
+        <variable name="gasTemperature" value="300"/> <!-- K -->
+        <variable name="gasPressure" value="10"/> <!-- bar -->
+
+        <!-- The vessel definitions -->
+        <constant name="vesselThickness" value="50"/>
+
+        <!-- The water tank -->
+        <constant name="waterTankSize" value="8000"/>
+    </define>
+
+    &materials;
+
+    &geometry;
+
+    <setup name="Default" version="1.0">
+        <world ref="World"/>
+    </setup>
+
+</gdml>
diff --git a/test/src/examples.cxx b/test/src/examples.cxx
index 67c98772..2aa2077e 100644
--- a/test/src/examples.cxx
+++ b/test/src/examples.cxx
@@ -28,7 +28,7 @@ TEST(restG4, Example_01_NLDBD) {
     fs::current_path(thisExamplePath);
 
     CommandLineOptions::Options options;
-    options.rmlFile = "NLDBD.rml";
+    options.rmlFile = "NLDBD2.rml";
     options.outputFile = thisExamplePath / "NLDBD_simulation.root";  // TODO: fix not working with local path
 
     {  // Run simulation
@@ -276,7 +276,7 @@ TEST(restG4, Example_07_Decay_FullChain) {
     gROOT->ProcessLine(TString::Format(".L %s", macro.Data()));  // Load macro
     int error = 0;
     const int result =
-        gROOT->ProcessLine(TString::Format("Validate(\"%s\", %d)", options.outputFile.c_str(), 15), &error);
+        gROOT->ProcessLine(TString::Format("Validate(\"%s\", %d)", options.outputFile.c_str(), 17), &error);
     EXPECT_EQ(error, 0);
     EXPECT_EQ(result, 0);
 

From e08abc8d510705ca5c49831ab063132ae3a016db Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Tue, 4 Oct 2022 14:07:41 +0200
Subject: [PATCH 33/42] Fixing Gitlab pipeline

---
 .gitlab-ci.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 31cdd8c0..60ae2a57 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -74,6 +74,10 @@ Load REST Libraries:
   script:
     - source ${CI_PROJECT_DIR}/install/thisREST.sh
     - cd ${CI_PROJECT_DIR}/install/examples/restG4/01.NLDBD/
+    - cd geometry
+    - rm rest.xml
+    - wget https://rest-for-physics.github.io/materials/rest.xml
+    - cd ..
     - restG4 NLDBD.rml
     - geant4-config --version
     - restRoot -b -q Validate.C'("Run00001_NLDBD_Test.root")'
@@ -122,6 +126,10 @@ Load REST Libraries:
   script:
     - source ${CI_PROJECT_DIR}/install/thisREST.sh
     - cd ${CI_PROJECT_DIR}/install/examples/restG4/07.FullChainDecay/
+    - cd geometry
+    - rm rest.xml
+    - wget https://rest-for-physics.github.io/materials/rest.xml
+    - cd ..
     - restG4 fullChain.rml
     - restG4 singleDecay.rml
     - restRoot -b -q Validate.C'("Run00001_U238_FullChainDecay.root", 15)'

From 21b6f8fd9146b77a8f2e562e13663c00918004ce Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Tue, 4 Oct 2022 14:27:46 +0200
Subject: [PATCH 34/42] Updating 01.NLDBD/README.md

---
 examples/01.NLDBD/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/01.NLDBD/README.md b/examples/01.NLDBD/README.md
index 648dc919..77226345 100644
--- a/examples/01.NLDBD/README.md
+++ b/examples/01.NLDBD/README.md
@@ -6,4 +6,4 @@ Date : 19/July/2019
 
 **Command** : restG4 NLDBD.rml
 
-**Remark** : The second version of NLDBD.rml is used in order to force loading the remote materials file. Inside the GitHub workflow the remote materials file is downloaded and overwritten (except for the reference pipeline that still needs the old materials file).
+**Remark** : The second version of `NLDBD.rml` (NLDBD2.rml) is used in order to force loading the remote materials file. `NLDBD2.rml` will be used by the `ctests`. Inside the GitHub workflow the remote materials file is downloaded and the local version is overwritten (thus that pipeline simply uses `NLDBD.rml`). The reference pipeline still needs the old materials file, which now is available in the example geometry directory (named `rest.xml`).

From 42a8a36a3a13fce80086ed67d8960432fbab54ea Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Tue, 4 Oct 2022 16:17:56 +0200
Subject: [PATCH 35/42] 08.alphas. Adding old material files inside alphas
 example

---
 .github/workflows/validation.yml       | 4 ++++
 examples/08.Alphas/geometry/setup.gdml | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml
index e76fa79e..3d40976f 100644
--- a/.github/workflows/validation.yml
+++ b/.github/workflows/validation.yml
@@ -306,6 +306,10 @@ jobs:
         run: |
           source ${{ env.REST_PATH }}/thisREST.sh
           cd ${{ env.REST_PATH }}/examples/restG4/08.Alphas/
+          cd geometry
+          rm rest.xml
+          wget https://rest-for-physics.github.io/materials/rest.xml
+          cd ..
           mkdir data
           export REST_ENERGY=5
           export REST_FOIL=1
diff --git a/examples/08.Alphas/geometry/setup.gdml b/examples/08.Alphas/geometry/setup.gdml
index ba869571..b8c083d4 100644
--- a/examples/08.Alphas/geometry/setup.gdml
+++ b/examples/08.Alphas/geometry/setup.gdml
@@ -3,7 +3,7 @@
 
 <!DOCTYPE gdml [
         <!ENTITY geometry SYSTEM "geometry.gdml">
-        <!ENTITY materials SYSTEM "https://rest-for-physics.github.io/materials/rest.xml">
+        <!ENTITY materials SYSTEM "rest.xml">
         ]>
 
 <gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

From fcc45fa70b0f117bfacb314b0906f9794b00fe61 Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Tue, 4 Oct 2022 16:18:36 +0200
Subject: [PATCH 36/42] Uploading rest.xml into 08.aplhas

---
 examples/08.Alphas/geometry/rest.xml | 400 +++++++++++++++++++++++++++
 1 file changed, 400 insertions(+)
 create mode 100644 examples/08.Alphas/geometry/rest.xml

diff --git a/examples/08.Alphas/geometry/rest.xml b/examples/08.Alphas/geometry/rest.xml
new file mode 100644
index 00000000..40a41977
--- /dev/null
+++ b/examples/08.Alphas/geometry/rest.xml
@@ -0,0 +1,400 @@
+<!-- ##VERSION REST materials 1.4## -->
+<!-- densities in mg/cm3 @ 293.15K -->
+    <materials>
+        <!-- {{{ Elements definition -->
+        <element name="Hydrogen" formula="H" Z="1">
+            <atom value="1.00794" />
+        </element>
+       
+	<element name="Helium" formula="N" Z="2">
+	    <atom value="4.0026" />
+	</element>
+
+        <element name="Carbon" formula="C" Z="6">
+            <atom value="12.0107" />
+        </element>
+        <element name="Nitrogen" formula="N" Z="7">
+            <atom value="14.0067" />
+        </element>
+        <element name="Fluor" formula="F" Z="9">
+            <atom value="18.9984" />
+        </element>
+        <element name="Silicon" formula="Si" Z="14" state="solid">
+            <atom value="28.0855" />
+        </element>
+        <element name="Chromium" formula="Cr" Z="24" state="solid">
+            <atom value="51.996" />
+        </element>
+        <element name="Manganese" formula="Mn" Z="25">
+            <atom value="54.938045" />
+        </element>
+        <element name="Iron" formula="Fe" Z="26" state="solid">
+            <atom value="55.845" />
+        </element>
+        <element name="Nickel" formula="Ni" Z="28" state="solid">
+            <atom value="58.6934" />
+        </element>
+        <element name="Aluminium" formula="Al" Z="13" state="solid">
+            <atom value="26.982" />
+        </element>
+        <element name="Xenon" formula="Xe" Z="54" state="gas">
+            <atom value="131.293" />
+        </element>
+        <element name="Argon" formula="Ar" Z="18" state="gas">
+            <atom value="39.948" />
+        </element>
+        <element name="Neon" formula="Ne" Z="10" state="gas">
+         <atom value="20.1797" />
+        </element>
+        <element name="Zinc" formula="Zn" Z="30">
+	<atom value="65.4094"/>
+        </element>
+	<element name="Magnesium" formula="Mg" Z="12">
+	<atom value="24.3050"/>
+	</element>
+	<element name="Sulfur" formula="S" Z="16">
+	<atom value="32.0655"/>
+	</element>
+          <element name="Chlorine" formula="Cl" Z="17">
+	<atom value="35.4532"/>
+	</element>
+        <element name="Iodide" formula="I" Z="53">
+	<atom value="126.9"/>
+	</element>
+      
+
+        
+       
+        <!-- }}} -->
+
+        <!-- {{{ Quenchers -->
+        <material name="TMA" state="gas">
+            <D unit="mg/cm3" value="quencherDensity" />
+            <T unit="K" value="gasTemperature" />
+            <P unit="bar" value="gasPressure" />
+            <composite n="3" ref="Carbon" />
+            <composite n="9" ref="Hydrogen" />
+            <composite n="1" ref="Nitrogen" />
+        </material>
+
+        <material name="isobutane" state="gas">
+            <D unit="mg/cm3" value="quencherDensity" />
+            <T unit="K" value="gasTemperature" />
+            <P unit="bar" value="gasPressure" />
+            <composite n="4" ref="Carbon" />
+            <composite n="10" ref="Hydrogen" />
+        </material>
+        <!-- }}} -->
+
+        <!-- {{{ Gas mixtures -->
+        <material name="PureHelium" state="gas">
+	    <T unit="K" value="gasTemperature"/>
+	    <P unit="bar" value="gasPressure"/>
+	    <MEE unit="eV" value="188"/>
+            <D unit="mg/cm3" value="targetGasDensity"/>
+	    <fraction n="1" ref="Helium"/>
+	</material>
+
+        <material name="PureXenon" state="gas">
+            <T unit="K" value="gasTemperature"/>
+            <P unit="bar" value="gasPressure"/>
+            <MEE unit="eV" value="482"/>
+            <D unit="mg/cm3" value="targetGasDensity"/>
+            <fraction n="1" ref="Xenon"/>
+        </material>
+
+        <material name="Xenon_TMA" state="gas">
+            <D unit="mg/cm3" value="targetGasDensity+quencherDensity" />
+            <P unit="bar" value="gasPressure" />
+            <T unit="K" value="gasTemperature" />
+            <fraction n="quencherFraction" ref="TMA" />
+            <fraction n="1-quencherFraction" ref="Xenon" />
+        </material>
+
+        <material name="Xenon_ISO" state="gas">
+            <D unit="mg/cm3" value="targetGasDensity+quencherDensity" />
+            <P unit="bar" value="gasPressure" />
+            <T unit="K" value="gasTemperature" />
+            <fraction n="quencherFraction" ref="isobutane" />
+            <fraction n="1-quencherFraction" ref="Xenon" />
+        </material>
+
+        <material name="PureArgon" state="gas">
+            <T unit="K" value="gasTemperature"/>
+            <P unit="bar" value="gasPressure"/>
+            <MEE unit="eV" value="188"/>
+            <D unit="mg/cm3" value="targetGasDensity"/>
+            <fraction n="1" ref="Argon"/>
+        </material>
+
+        <material name="Ar_ISO" state="gas">
+            <D unit="mg/cm3" value="targetGasDensity+quencherDensity" />
+            <P unit="bar" value="gasPressure" />
+            <T unit="K" value="gasTemperature" />
+            <fraction n="quencherFraction" ref="isobutane" />
+            <fraction n="1-quencherFraction" ref="Argon" />
+        </material>
+
+        <material name="Neon_ISO" state="gas">
+            <D unit="mg/cm3" value="targetGasDensity+quencherDensity" />
+            <P unit="bar" value="gasPressure" />
+            <T unit="K" value="gasTemperature" />
+            <fraction n="quencherFraction" ref="isobutane" />
+            <fraction n="1-quencherFraction" ref="Neon" />
+        </material>
+
+        <!-- }}} -->
+
+        <!-- {{{ Copper -->
+        <isotope N="63" Z="29" name="Cu63">
+            <atom unit="g/mole" value="62.9296"/>
+        </isotope>
+        <isotope N="65" Z="29" name="Cu65">
+            <atom unit="g/mole" value="64.9278"/>
+        </isotope>
+        <element name="Cu">
+            <fraction n="0.6917" ref="Cu63"/>
+            <fraction n="0.3083" ref="Cu65"/>
+        </element>
+        <material name="Copper" state="solid">
+            <MEE unit="eV" value="322"/>
+            <D unit="g/cm3" value="8.96"/>
+            <fraction n="1" ref="Cu"/>
+        </material>
+        <!-- }}} -->
+
+      <!-- {{{ Aluminium -->
+        <isotope N="27" Z="13" name="Al27">
+        <atom unit="g/mole" value="26.982"/>
+          </isotope>
+        <element name="Al">
+        <fraction n="1.0000" ref="Al27"/>
+        </element>
+        <material name="Aluminium" state="solid">
+         <MEE unit="eV" value="166"/>
+        <D unit="g/cm3" value="2.70"/>
+        <fraction n="1" ref="Al"/>
+         </material>
+    <!-- }}} -->   
+
+ 	<!-- {{{ Cadmium-->
+        <isotope N="106" Z="48" name="Cd106">
+        <atom unit="g/mole" value="105.91"/>
+          </isotope>
+	<isotope N="108" Z="48" name="Cd108">
+        <atom unit="g/mole" value="107.90"/>
+          </isotope>
+	<isotope N="110" Z="48" name="Cd110">
+        <atom unit="g/mole" value="109.90"/>
+          </isotope>
+	<isotope N="111" Z="48" name="Cd111">
+        <atom unit="g/mole" value="110.90"/>
+          </isotope>
+	<isotope N="112" Z="48" name="Cd112">
+        <atom unit="g/mole" value="111.90"/>
+          </isotope>
+	<isotope N="113" Z="48" name="Cd113">
+        <atom unit="g/mole" value="112.90"/>
+          </isotope>
+	<isotope N="114" Z="48" name="Cd114">
+        <atom unit="g/mole" value="113.90"/>
+          </isotope>
+	<isotope N="116" Z="48" name="Cd116">
+        <atom unit="g/mole" value="115.90"/>
+          </isotope>
+        <element name="Cd">
+        <fraction n="0.0125" ref="Cd106"/>
+	 <fraction n="0.0089" ref="Cd108"/>
+	 <fraction n="0.1249" ref="Cd110"/>
+	 <fraction n="0.1280" ref="Cd111"/>
+	 <fraction n="0.2413" ref="Cd112"/>
+	<fraction n="0.1222" ref="Cd113"/>
+	 <fraction n="0.2873" ref="Cd114"/>
+	 <fraction n="0.0749" ref="Cd116"/>
+        </element>
+        <material name="Cadmium" state="solid">
+         <MEE unit="eV" value="469.0"/>
+        <D unit="g/cm3" value="8.65"/>
+ 	 <fraction n="1" ref="Cd"/>
+         </material>
+   	 <!-- }}} -->   
+
+                                      
+        <!-- {{{ Stainlesssteel -->
+        <material name="Stainlesssteel" state="solid">
+            <MEE unit="eV" value="280.927567486627"/>
+            <D unit="g/cm3" value="8.02"/>
+            <fraction n="0.02" ref="Manganese"/>
+            <fraction n="0.01" ref="Silicon"/>
+            <fraction n="0.19" ref="Chromium"/>
+            <fraction n="0.1" ref="Nickel"/>
+            <fraction n="0.68" ref="Iron"/>
+        </material>
+        <!-- }}} -->
+
+        <!-- {{{ Air -->
+        <isotope N="14" Z="7" name="N14">
+            <atom unit="g/mole" value="14.0031"/>
+        </isotope>
+        <isotope N="15" Z="7" name="N15">
+            <atom unit="g/mole" value="15.0001"/>
+        </isotope>
+        <element name="Nitrogen">
+            <fraction n="0.99632" ref="N14"/>
+            <fraction n="0.00368" ref="N15"/>
+        </element>
+
+        <isotope N="16" Z="8" name="O16">
+            <atom unit="g/mole" value="15.9949"/>
+        </isotope>
+        <isotope N="17" Z="8" name="O17">
+            <atom unit="g/mole" value="16.9991"/>
+        </isotope>
+        <isotope N="18" Z="8" name="O18">
+            <atom unit="g/mole" value="17.9992"/>
+        </isotope>
+        <element name="Oxygen">
+            <fraction n="0.99757" ref="O16"/>
+            <fraction n="0.00038" ref="O17"/>
+            <fraction n="0.00205" ref="O18"/>
+        </element>
+        <material name="Air" state="gas">
+            <T unit="K" value="293.13"/>
+            <MEE unit="eV" value="85.7030667332999"/>
+            <D unit="g/cm3" value="0.00129"/>
+            <fraction n="0.7" ref="Nitrogen"/>
+            <fraction n="0.3" ref="Oxygen"/>
+        </material>
+        <!-- }}} -->
+
+        <!-- {{{ Vacuum -->
+        <material name="Vacuum" state="gas">
+            <T unit="K" value="293.13"/>
+            <MEE unit="eV" value="85.7030667332999"/>
+            <D unit="g/cm3" value="1.e-20"/>
+            <fraction n="0.7" ref="Nitrogen"/>
+            <fraction n="0.3" ref="Oxygen"/>
+        </material>
+        <!-- }}} -->
+
+        <!-- {{{ Water -->
+        <element Z="1" formula="H" name="Hydrogen">
+            <atom value="2" />
+        </element>
+
+        <element Z="8" formula="O" name="Oxygen">
+            <atom value="16" />
+        </element>
+
+        <material name="Water" formula="H2O">
+            <D value="1.0" />
+            <composite n="2" ref="Hydrogen" />
+            <composite n="1" ref="Oxygen" />
+        </material>
+        <!-- }}} -->
+
+        <!-- {{{ Lead -->
+        <isotope N="204" Z="82" name="Pb204">
+            <atom unit="g/mole" value="203.973"/>
+        </isotope>
+        <isotope N="206" Z="82" name="Pb206">
+            <atom unit="g/mole" value="205.974"/>
+        </isotope>
+        <isotope N="207" Z="82" name="Pb207">
+            <atom unit="g/mole" value="206.976"/>
+        </isotope>
+        <isotope N="208" Z="82" name="Pb208">
+            <atom unit="g/mole" value="207.977"/>
+        </isotope>
+        <element name="Pb">
+            <fraction n="0.014" ref="Pb204"/>
+            <fraction n="0.241" ref="Pb206"/>
+            <fraction n="0.221" ref="Pb207"/>
+            <fraction n="0.524" ref="Pb208"/>
+        </element>
+        <material name="Lead" state="solid">
+            <MEE unit="eV" value="823"/>
+            <D unit="g/cm3" value="11.34"/>
+            <fraction n="1" ref="Pb"/>
+        </material>
+        <!-- }}} -->
+
+        <!-- {{{ Kapton -->
+        <material name="Kapton" state="solid">
+            <MEE unit="eV" value="79.6"/>
+            <D unit="g/cm3" value="1.42"/>
+            <fraction n="0.026362" ref="Hydrogen"/>
+            <fraction n="0.691133" ref="Carbon"/>
+            <fraction n="0.073270" ref="Nitrogen"/>
+            <fraction n="0.209235" ref="Oxygen"/>
+        </material>
+        <!-- }}} -->
+	<!--  {{{ Rubber-Neoprene -->
+	<material name="Neoprene" state="solid">
+	<D unit="g/cm3" value="1.23"/>
+          <MEE unit="eV" value="93.000000"/>
+	<fraction n="0.542646" ref="Carbon"/>
+	<fraction n="0.056920" ref="Hydrogen"/>
+	<fraction n="0.400434" ref="Chlorine"/>
+	
+	</material>
+	<!--  }}}  -->
+
+        <!-- {{{ Teflon (PTFE) -->
+        <material name="PTFE" state="solid">
+            <MEE unit="eV" value="105.35244885659"/>
+            <D unit="g/cm3" value="2.2"/>
+            <fraction n="0.240151969606079" ref="Carbon"/>
+            <fraction n="0.759848030393921" ref="Fluor"/>
+        </material>
+        <!-- }}} -->
+
+       <!-- {{{ Polyethylene -->
+    	<material name="PE" state="solid">
+            <MEE unit="eV" value="57.4000000"/>
+            <D unit="g/cm3" value="0.940"/>
+            <fraction n="0.143711" ref="Hydrogen"/>
+            <fraction n="0.856289" ref="Carbon"/>
+     	</material>
+    	<!-- }}} -->
+
+        <!-- {{{ Mylar -->
+        <material name="Mylar" state="solid">
+            <MEE unit="eV" value="78.700000"/>
+            <D unit="g/cm3" value="2.2"/>
+            <fraction n="0.041959" ref="Hydrogen"/>
+            <fraction n="0.625017" ref="Fluor"/>
+            <fraction n="0.333025" ref="Oxygen"/>
+        </material>
+        <!-- }}} -->
+
+        <!-- {{{ Plasctic scintillator -->
+        <material name="BC408" state="solid">
+            <MEE unit="eV" value="64.700000"/>
+            <D unit="g/cm3" value="1.03"/>
+            <fraction n="0.085000" ref="Hydrogen"/>
+            <fraction n="0.915000" ref="Carbon"/>
+        </material>
+        <!-- }}} -->
+	
+	<!-- {{{ Acrylic -->
+         <material name="Acrylic" state="solid">
+             <MEE unit="eV" value="0.00000"/><!-- this is not a correct figure -->
+             <D unit="g/cm3" value="1.18"/>
+             <fraction n="0.080000" ref="Hydrogen"/>
+             <fraction n="0.600000" ref="Carbon"/>
+             <fraction n="0.320000" ref="Oxygen"/>
+         </material>
+         <!-- }}} -->
+	<!-- {{{ Silicone (Polydimethylsiloxane) -->
+    	<material name="PDMS" state="solid">
+             <D unit="g/cm3" value="0.965"/>
+             <fraction n="0.081555" ref="Hydrogen"/>
+             <fraction n="0.323940" ref="Carbon"/>
+             <fraction n="0.215759" ref="Oxygen"/>
+             <fraction n="0.378746" ref="Silicon"/>
+     	</material>
+    	<!-- }}} -->
+      
+
+    </materials>

From 599a803cc9c1b50ceaa92680a26e5102924ed390 Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Tue, 4 Oct 2022 16:28:47 +0200
Subject: [PATCH 37/42] 08.Alphas using sed strategy to update materials file

---
 .github/workflows/validation.yml       | 4 ----
 examples/08.Alphas/geometry/setup.gdml | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml
index 3d40976f..e76fa79e 100644
--- a/.github/workflows/validation.yml
+++ b/.github/workflows/validation.yml
@@ -306,10 +306,6 @@ jobs:
         run: |
           source ${{ env.REST_PATH }}/thisREST.sh
           cd ${{ env.REST_PATH }}/examples/restG4/08.Alphas/
-          cd geometry
-          rm rest.xml
-          wget https://rest-for-physics.github.io/materials/rest.xml
-          cd ..
           mkdir data
           export REST_ENERGY=5
           export REST_FOIL=1
diff --git a/examples/08.Alphas/geometry/setup.gdml b/examples/08.Alphas/geometry/setup.gdml
index b8c083d4..80a6fa28 100644
--- a/examples/08.Alphas/geometry/setup.gdml
+++ b/examples/08.Alphas/geometry/setup.gdml
@@ -3,7 +3,7 @@
 
 <!DOCTYPE gdml [
         <!ENTITY geometry SYSTEM "geometry.gdml">
-        <!ENTITY materials SYSTEM "rest.xml">
+        <!ENTITY materials SYSTEM "https://rest-for-physics.github.io/materials/legacy/v1.4/rest.xml">
         ]>
 
 <gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

From 74b9312e2d848199d47832b9cb776112c3cdc258 Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Tue, 4 Oct 2022 16:40:02 +0200
Subject: [PATCH 38/42] 08.alphas/setup.gdml now uses official updated
 materials file

---
 examples/08.Alphas/geometry/setup.gdml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/08.Alphas/geometry/setup.gdml b/examples/08.Alphas/geometry/setup.gdml
index 80a6fa28..ba869571 100644
--- a/examples/08.Alphas/geometry/setup.gdml
+++ b/examples/08.Alphas/geometry/setup.gdml
@@ -3,7 +3,7 @@
 
 <!DOCTYPE gdml [
         <!ENTITY geometry SYSTEM "geometry.gdml">
-        <!ENTITY materials SYSTEM "https://rest-for-physics.github.io/materials/legacy/v1.4/rest.xml">
+        <!ENTITY materials SYSTEM "https://rest-for-physics.github.io/materials/rest.xml">
         ]>
 
 <gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

From e6b8b5cf3f288ddeb444c1a3ba9f3f94ebfc18d3 Mon Sep 17 00:00:00 2001
From: Javier Galan <javier.galan@unizar.es>
Date: Tue, 4 Oct 2022 16:48:26 +0200
Subject: [PATCH 39/42] Updating 01.NLDBD materials file

---
 .github/workflows/validation.yml                | 5 +----
 examples/01.NLDBD/geometry/mySetupTemplate.gdml | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml
index e76fa79e..3d77a5e3 100644
--- a/.github/workflows/validation.yml
+++ b/.github/workflows/validation.yml
@@ -158,10 +158,6 @@ jobs:
         run: |
           source ${{ env.REST_PATH }}/thisREST.sh
           cd ${{ env.REST_PATH }}/examples/restG4/01.NLDBD/
-          cd geometry
-          rm rest.xml
-          wget https://rest-for-physics.github.io/materials/rest.xml
-          cd ..
           restG4 NLDBD.rml -o Run00001_NLDBD_Test.root
           restRoot -b -q Validate.C'("Run00001_NLDBD_Test.root")'
 
@@ -510,6 +506,7 @@ jobs:
         run: |
           source ${{ env.REST_PATH }}/thisREST.sh
           cd ${{ env.REST_PATH }}/examples/restG4/01.NLDBD/
+          sed -i 's/https:\/\/rest-for-physics.github.io\/materials\/rest.xml/https:\/\/rest-for-physics.github.io\/materials\/legacy\/v1.4\/rest.xml/g' geometry/mySetupTemplate.gdml
           restG4 NLDBD.rml -o Run00001_NLDBD_Test.root
           restRoot -b -q Validate.C'("Run00001_NLDBD_Test.root")'
 
diff --git a/examples/01.NLDBD/geometry/mySetupTemplate.gdml b/examples/01.NLDBD/geometry/mySetupTemplate.gdml
index 7f94c54d..66895a6a 100644
--- a/examples/01.NLDBD/geometry/mySetupTemplate.gdml
+++ b/examples/01.NLDBD/geometry/mySetupTemplate.gdml
@@ -3,7 +3,7 @@
 
 <!DOCTYPE gdml [
         <!ENTITY geometry SYSTEM "myGeometryTemplate.gdml">
-        <!ENTITY materials SYSTEM "rest.xml">
+        <!ENTITY materials SYSTEM "https://rest-for-physics.github.io/materials/rest.xml">
         ]>
 
 <gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

From ffa1a6be20b0e414c6d8ac41139515a0751fbf63 Mon Sep 17 00:00:00 2001
From: Luis Obis <luis.antonio.obis@gmail.com>
Date: Tue, 4 Oct 2022 19:09:04 +0200
Subject: [PATCH 40/42] prepare for merge

---
 .github/workflows/validation.yml              |  24 +-
 .gitlab-ci.yml                                |  10 +-
 examples/01.NLDBD/README.md                   |   2 -
 .../01.NLDBD/geometry/mySetupTemplate.gdml    |   1 +
 .../01.NLDBD/geometry/mySetupTemplate2.gdml   |  50 ---
 examples/01.NLDBD/geometry/rest.xml           | 400 ------------------
 .../04.MuonScan/CosmicMuonsFromCircle.rml     |  24 +-
 examples/04.MuonScan/CosmicMuonsFromWall.rml  |  24 +-
 examples/04.MuonScan/Muon.rml                 |   2 +-
 examples/04.MuonScan/geometry.gdml            |  43 ++
 examples/04.MuonScan/setup.gdml               |  36 ++
 examples/06.IonRecoils/geometry/rest.xml      | 400 ------------------
 examples/06.IonRecoils/geometry/setup.gdml    |   4 +-
 examples/07.FullChainDecay/geometry/rest.xml  | 399 -----------------
 .../07.FullChainDecay/geometry/setup.gdml     |   2 +-
 examples/08.Alphas/geometry/rest.xml          | 400 ------------------
 .../geometry/assemblyDepthOne/setup.gdml      |   2 +-
 .../geometry/noAssembly/setup.gdml            |   2 +-
 test/src/examples.cxx                         |   2 +-
 19 files changed, 143 insertions(+), 1684 deletions(-)
 delete mode 100644 examples/01.NLDBD/geometry/mySetupTemplate2.gdml
 delete mode 100644 examples/01.NLDBD/geometry/rest.xml
 create mode 100644 examples/04.MuonScan/geometry.gdml
 create mode 100644 examples/04.MuonScan/setup.gdml
 delete mode 100644 examples/06.IonRecoils/geometry/rest.xml
 delete mode 100644 examples/07.FullChainDecay/geometry/rest.xml
 delete mode 100644 examples/08.Alphas/geometry/rest.xml

diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml
index 3d77a5e3..78554358 100644
--- a/.github/workflows/validation.yml
+++ b/.github/workflows/validation.yml
@@ -247,10 +247,6 @@ jobs:
         run: |
           source ${{ env.REST_PATH }}/thisREST.sh
           cd ${{ env.REST_PATH }}/examples/restG4/06.IonRecoils/
-          cd geometry
-          rm rest.xml
-          wget https://rest-for-physics.github.io/materials/rest.xml
-          cd ..
           restG4 recoils.rml -o Run00001_F20_Recoils.root
           restRoot -b -q Validate.C'("Run00001_F20_Recoils.root")'
 
@@ -272,12 +268,8 @@ jobs:
         run: |
           source ${{ env.REST_PATH }}/thisREST.sh
           cd ${{ env.REST_PATH }}/examples/restG4/07.FullChainDecay/
-          cd geometry
-          rm rest.xml
-          wget https://rest-for-physics.github.io/materials/rest.xml
-          cd ..
           restG4 fullChain.rml -o Run00001_U238_FullChainDecay.root
-          restRoot -b -q Validate.C'("Run00001_U238_FullChainDecay.root", 15)'
+          restRoot -b -q Validate.C'("Run00001_U238_FullChainDecay.root", 17)'
           restG4 singleDecay.rml -o Run00002_U238_SingleChainDecay.root
           restRoot -b -q Validate.C'("Run00002_U238_SingleChainDecay.root", 1)'
           export REST_ISOTOPE=Be7
@@ -452,8 +444,19 @@ jobs:
           mkdir -p ${{ env.REST_FRAMEWORK_SOURCE_DIR }}/build && cd ${{ env.REST_FRAMEWORK_SOURCE_DIR }}/build
           cmake ../ -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -DREST_WELCOME=ON -DREST_G4=ON -DCMAKE_INSTALL_PREFIX=${{ env.REST_PATH }}
           make -j4 install
+      - name: Test before
+        run: |
+          cat ${{ env.REST_PATH }}/examples/restG4/01.NLDBD/geometry/mySetupTemplate.gdml
+          find . -name "*.gdml"
+      - name: Use old materials for reference Geant4 version
+        run: |
+          find . -name "*.gdml" | xargs sed -i 's/https:\/\/rest-for-physics.github.io\/materials\/rest.xml/https:\/\/rest-for-physics.github.io\/materials\/legacy\/v1.4\/rest.xml/g'
+      - name: Test after
+        run: |
+          cat ${{ env.REST_PATH }}/examples/restG4/01.NLDBD/geometry/mySetupTemplate.gdml
+          find . -name "*.gdml"
       - name: Cache framework installation
-        id: framework-install-restG4-cache-old-Geant4
+        id: framework-install-restG4-cache-reference
         uses: actions/cache@v3
         with:
           path: ${{ env.REST_PATH }}
@@ -506,7 +509,6 @@ jobs:
         run: |
           source ${{ env.REST_PATH }}/thisREST.sh
           cd ${{ env.REST_PATH }}/examples/restG4/01.NLDBD/
-          sed -i 's/https:\/\/rest-for-physics.github.io\/materials\/rest.xml/https:\/\/rest-for-physics.github.io\/materials\/legacy\/v1.4\/rest.xml/g' geometry/mySetupTemplate.gdml
           restG4 NLDBD.rml -o Run00001_NLDBD_Test.root
           restRoot -b -q Validate.C'("Run00001_NLDBD_Test.root")'
 
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 60ae2a57..7f412c43 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -74,10 +74,6 @@ Load REST Libraries:
   script:
     - source ${CI_PROJECT_DIR}/install/thisREST.sh
     - cd ${CI_PROJECT_DIR}/install/examples/restG4/01.NLDBD/
-    - cd geometry
-    - rm rest.xml
-    - wget https://rest-for-physics.github.io/materials/rest.xml
-    - cd ..
     - restG4 NLDBD.rml
     - geant4-config --version
     - restRoot -b -q Validate.C'("Run00001_NLDBD_Test.root")'
@@ -126,13 +122,9 @@ Load REST Libraries:
   script:
     - source ${CI_PROJECT_DIR}/install/thisREST.sh
     - cd ${CI_PROJECT_DIR}/install/examples/restG4/07.FullChainDecay/
-    - cd geometry
-    - rm rest.xml
-    - wget https://rest-for-physics.github.io/materials/rest.xml
-    - cd ..
     - restG4 fullChain.rml
     - restG4 singleDecay.rml
-    - restRoot -b -q Validate.C'("Run00001_U238_FullChainDecay.root", 15)'
+    - restRoot -b -q Validate.C'("Run00001_U238_FullChainDecay.root", 17)'
     - restRoot -b -q Validate.C'("Run00002_U238_SingleChainDecay.root", 1)'
     - export REST_ISOTOPE="Be7"
     - restG4 singleDecay.rml
diff --git a/examples/01.NLDBD/README.md b/examples/01.NLDBD/README.md
index 77226345..876d0b02 100644
--- a/examples/01.NLDBD/README.md
+++ b/examples/01.NLDBD/README.md
@@ -5,5 +5,3 @@ Date : 19/July/2019
 **Event generator** : The event generator will launch neutrinoless double beta decays from the gas volume.
 
 **Command** : restG4 NLDBD.rml
-
-**Remark** : The second version of `NLDBD.rml` (NLDBD2.rml) is used in order to force loading the remote materials file. `NLDBD2.rml` will be used by the `ctests`. Inside the GitHub workflow the remote materials file is downloaded and the local version is overwritten (thus that pipeline simply uses `NLDBD.rml`). The reference pipeline still needs the old materials file, which now is available in the example geometry directory (named `rest.xml`).
diff --git a/examples/01.NLDBD/geometry/mySetupTemplate.gdml b/examples/01.NLDBD/geometry/mySetupTemplate.gdml
index 66895a6a..8d9636dc 100644
--- a/examples/01.NLDBD/geometry/mySetupTemplate.gdml
+++ b/examples/01.NLDBD/geometry/mySetupTemplate.gdml
@@ -43,6 +43,7 @@
 
     &geometry;
 
+
     <setup name="Default" version="1.0">
         <world ref="World"/>
     </setup>
diff --git a/examples/01.NLDBD/geometry/mySetupTemplate2.gdml b/examples/01.NLDBD/geometry/mySetupTemplate2.gdml
deleted file mode 100644
index 1fca8637..00000000
--- a/examples/01.NLDBD/geometry/mySetupTemplate2.gdml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no" ?>
-<!-- ##VERSION REST Example 01.NLDBD Version 1.0## -->
-
-<!DOCTYPE gdml [
-        <!ENTITY geometry SYSTEM "myGeometryTemplate.gdml">
-		<!ENTITY materials SYSTEM "https://rest-for-physics.github.io/materials/rest.xml">
-        ]>
-
-<gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:noNamespaceSchemaLocation="http://service-spi.web.cern.ch/service-spi/app/releases/GDML/schema/gdml.xsd">
-
-    <!-- Just an example of main geometry file : myGeometryTemplate.gdml 
-         This file just defines de parameters of the geometry.
-         The geometry it is defined in geometry/myGeometryDefinition.gdml
-         The materials are defined in geometry/materials.xml
-         Author :   J. Galan    Date : 09-Jul-2015
-    -->
-
-    <!-- All values should be in mm -->
-
-    <define>
-        <constant name="world_size" value="20000"/>
-
-        <!-- The TPC gas target -->
-        <constant name="gasRadius" value="750"/>
-        <constant name="gasLength" value="2000"/>
-
-        <variable name="targetGasDensity"
-                  value="56.5884"/> <!-- mg/cm3 (This density corresponds to 200Kg in vessel volume) -->
-        <variable name="quencherDensity" value="0.254"/> <!-- mg/cm3 (Corresponds to 1% TMA) -->
-        <variable name="quencherFraction" value="0.01"/>
-        <variable name="gasTemperature" value="300"/> <!-- K -->
-        <variable name="gasPressure" value="10"/> <!-- bar -->
-
-        <!-- The vessel definitions -->
-        <constant name="vesselThickness" value="50"/>
-
-        <!-- The water tank -->
-        <constant name="waterTankSize" value="8000"/>
-    </define>
-
-    &materials;
-
-    &geometry;
-
-    <setup name="Default" version="1.0">
-        <world ref="World"/>
-    </setup>
-
-</gdml>
diff --git a/examples/01.NLDBD/geometry/rest.xml b/examples/01.NLDBD/geometry/rest.xml
deleted file mode 100644
index 40a41977..00000000
--- a/examples/01.NLDBD/geometry/rest.xml
+++ /dev/null
@@ -1,400 +0,0 @@
-<!-- ##VERSION REST materials 1.4## -->
-<!-- densities in mg/cm3 @ 293.15K -->
-    <materials>
-        <!-- {{{ Elements definition -->
-        <element name="Hydrogen" formula="H" Z="1">
-            <atom value="1.00794" />
-        </element>
-       
-	<element name="Helium" formula="N" Z="2">
-	    <atom value="4.0026" />
-	</element>
-
-        <element name="Carbon" formula="C" Z="6">
-            <atom value="12.0107" />
-        </element>
-        <element name="Nitrogen" formula="N" Z="7">
-            <atom value="14.0067" />
-        </element>
-        <element name="Fluor" formula="F" Z="9">
-            <atom value="18.9984" />
-        </element>
-        <element name="Silicon" formula="Si" Z="14" state="solid">
-            <atom value="28.0855" />
-        </element>
-        <element name="Chromium" formula="Cr" Z="24" state="solid">
-            <atom value="51.996" />
-        </element>
-        <element name="Manganese" formula="Mn" Z="25">
-            <atom value="54.938045" />
-        </element>
-        <element name="Iron" formula="Fe" Z="26" state="solid">
-            <atom value="55.845" />
-        </element>
-        <element name="Nickel" formula="Ni" Z="28" state="solid">
-            <atom value="58.6934" />
-        </element>
-        <element name="Aluminium" formula="Al" Z="13" state="solid">
-            <atom value="26.982" />
-        </element>
-        <element name="Xenon" formula="Xe" Z="54" state="gas">
-            <atom value="131.293" />
-        </element>
-        <element name="Argon" formula="Ar" Z="18" state="gas">
-            <atom value="39.948" />
-        </element>
-        <element name="Neon" formula="Ne" Z="10" state="gas">
-         <atom value="20.1797" />
-        </element>
-        <element name="Zinc" formula="Zn" Z="30">
-	<atom value="65.4094"/>
-        </element>
-	<element name="Magnesium" formula="Mg" Z="12">
-	<atom value="24.3050"/>
-	</element>
-	<element name="Sulfur" formula="S" Z="16">
-	<atom value="32.0655"/>
-	</element>
-          <element name="Chlorine" formula="Cl" Z="17">
-	<atom value="35.4532"/>
-	</element>
-        <element name="Iodide" formula="I" Z="53">
-	<atom value="126.9"/>
-	</element>
-      
-
-        
-       
-        <!-- }}} -->
-
-        <!-- {{{ Quenchers -->
-        <material name="TMA" state="gas">
-            <D unit="mg/cm3" value="quencherDensity" />
-            <T unit="K" value="gasTemperature" />
-            <P unit="bar" value="gasPressure" />
-            <composite n="3" ref="Carbon" />
-            <composite n="9" ref="Hydrogen" />
-            <composite n="1" ref="Nitrogen" />
-        </material>
-
-        <material name="isobutane" state="gas">
-            <D unit="mg/cm3" value="quencherDensity" />
-            <T unit="K" value="gasTemperature" />
-            <P unit="bar" value="gasPressure" />
-            <composite n="4" ref="Carbon" />
-            <composite n="10" ref="Hydrogen" />
-        </material>
-        <!-- }}} -->
-
-        <!-- {{{ Gas mixtures -->
-        <material name="PureHelium" state="gas">
-	    <T unit="K" value="gasTemperature"/>
-	    <P unit="bar" value="gasPressure"/>
-	    <MEE unit="eV" value="188"/>
-            <D unit="mg/cm3" value="targetGasDensity"/>
-	    <fraction n="1" ref="Helium"/>
-	</material>
-
-        <material name="PureXenon" state="gas">
-            <T unit="K" value="gasTemperature"/>
-            <P unit="bar" value="gasPressure"/>
-            <MEE unit="eV" value="482"/>
-            <D unit="mg/cm3" value="targetGasDensity"/>
-            <fraction n="1" ref="Xenon"/>
-        </material>
-
-        <material name="Xenon_TMA" state="gas">
-            <D unit="mg/cm3" value="targetGasDensity+quencherDensity" />
-            <P unit="bar" value="gasPressure" />
-            <T unit="K" value="gasTemperature" />
-            <fraction n="quencherFraction" ref="TMA" />
-            <fraction n="1-quencherFraction" ref="Xenon" />
-        </material>
-
-        <material name="Xenon_ISO" state="gas">
-            <D unit="mg/cm3" value="targetGasDensity+quencherDensity" />
-            <P unit="bar" value="gasPressure" />
-            <T unit="K" value="gasTemperature" />
-            <fraction n="quencherFraction" ref="isobutane" />
-            <fraction n="1-quencherFraction" ref="Xenon" />
-        </material>
-
-        <material name="PureArgon" state="gas">
-            <T unit="K" value="gasTemperature"/>
-            <P unit="bar" value="gasPressure"/>
-            <MEE unit="eV" value="188"/>
-            <D unit="mg/cm3" value="targetGasDensity"/>
-            <fraction n="1" ref="Argon"/>
-        </material>
-
-        <material name="Ar_ISO" state="gas">
-            <D unit="mg/cm3" value="targetGasDensity+quencherDensity" />
-            <P unit="bar" value="gasPressure" />
-            <T unit="K" value="gasTemperature" />
-            <fraction n="quencherFraction" ref="isobutane" />
-            <fraction n="1-quencherFraction" ref="Argon" />
-        </material>
-
-        <material name="Neon_ISO" state="gas">
-            <D unit="mg/cm3" value="targetGasDensity+quencherDensity" />
-            <P unit="bar" value="gasPressure" />
-            <T unit="K" value="gasTemperature" />
-            <fraction n="quencherFraction" ref="isobutane" />
-            <fraction n="1-quencherFraction" ref="Neon" />
-        </material>
-
-        <!-- }}} -->
-
-        <!-- {{{ Copper -->
-        <isotope N="63" Z="29" name="Cu63">
-            <atom unit="g/mole" value="62.9296"/>
-        </isotope>
-        <isotope N="65" Z="29" name="Cu65">
-            <atom unit="g/mole" value="64.9278"/>
-        </isotope>
-        <element name="Cu">
-            <fraction n="0.6917" ref="Cu63"/>
-            <fraction n="0.3083" ref="Cu65"/>
-        </element>
-        <material name="Copper" state="solid">
-            <MEE unit="eV" value="322"/>
-            <D unit="g/cm3" value="8.96"/>
-            <fraction n="1" ref="Cu"/>
-        </material>
-        <!-- }}} -->
-
-      <!-- {{{ Aluminium -->
-        <isotope N="27" Z="13" name="Al27">
-        <atom unit="g/mole" value="26.982"/>
-          </isotope>
-        <element name="Al">
-        <fraction n="1.0000" ref="Al27"/>
-        </element>
-        <material name="Aluminium" state="solid">
-         <MEE unit="eV" value="166"/>
-        <D unit="g/cm3" value="2.70"/>
-        <fraction n="1" ref="Al"/>
-         </material>
-    <!-- }}} -->   
-
- 	<!-- {{{ Cadmium-->
-        <isotope N="106" Z="48" name="Cd106">
-        <atom unit="g/mole" value="105.91"/>
-          </isotope>
-	<isotope N="108" Z="48" name="Cd108">
-        <atom unit="g/mole" value="107.90"/>
-          </isotope>
-	<isotope N="110" Z="48" name="Cd110">
-        <atom unit="g/mole" value="109.90"/>
-          </isotope>
-	<isotope N="111" Z="48" name="Cd111">
-        <atom unit="g/mole" value="110.90"/>
-          </isotope>
-	<isotope N="112" Z="48" name="Cd112">
-        <atom unit="g/mole" value="111.90"/>
-          </isotope>
-	<isotope N="113" Z="48" name="Cd113">
-        <atom unit="g/mole" value="112.90"/>
-          </isotope>
-	<isotope N="114" Z="48" name="Cd114">
-        <atom unit="g/mole" value="113.90"/>
-          </isotope>
-	<isotope N="116" Z="48" name="Cd116">
-        <atom unit="g/mole" value="115.90"/>
-          </isotope>
-        <element name="Cd">
-        <fraction n="0.0125" ref="Cd106"/>
-	 <fraction n="0.0089" ref="Cd108"/>
-	 <fraction n="0.1249" ref="Cd110"/>
-	 <fraction n="0.1280" ref="Cd111"/>
-	 <fraction n="0.2413" ref="Cd112"/>
-	<fraction n="0.1222" ref="Cd113"/>
-	 <fraction n="0.2873" ref="Cd114"/>
-	 <fraction n="0.0749" ref="Cd116"/>
-        </element>
-        <material name="Cadmium" state="solid">
-         <MEE unit="eV" value="469.0"/>
-        <D unit="g/cm3" value="8.65"/>
- 	 <fraction n="1" ref="Cd"/>
-         </material>
-   	 <!-- }}} -->   
-
-                                      
-        <!-- {{{ Stainlesssteel -->
-        <material name="Stainlesssteel" state="solid">
-            <MEE unit="eV" value="280.927567486627"/>
-            <D unit="g/cm3" value="8.02"/>
-            <fraction n="0.02" ref="Manganese"/>
-            <fraction n="0.01" ref="Silicon"/>
-            <fraction n="0.19" ref="Chromium"/>
-            <fraction n="0.1" ref="Nickel"/>
-            <fraction n="0.68" ref="Iron"/>
-        </material>
-        <!-- }}} -->
-
-        <!-- {{{ Air -->
-        <isotope N="14" Z="7" name="N14">
-            <atom unit="g/mole" value="14.0031"/>
-        </isotope>
-        <isotope N="15" Z="7" name="N15">
-            <atom unit="g/mole" value="15.0001"/>
-        </isotope>
-        <element name="Nitrogen">
-            <fraction n="0.99632" ref="N14"/>
-            <fraction n="0.00368" ref="N15"/>
-        </element>
-
-        <isotope N="16" Z="8" name="O16">
-            <atom unit="g/mole" value="15.9949"/>
-        </isotope>
-        <isotope N="17" Z="8" name="O17">
-            <atom unit="g/mole" value="16.9991"/>
-        </isotope>
-        <isotope N="18" Z="8" name="O18">
-            <atom unit="g/mole" value="17.9992"/>
-        </isotope>
-        <element name="Oxygen">
-            <fraction n="0.99757" ref="O16"/>
-            <fraction n="0.00038" ref="O17"/>
-            <fraction n="0.00205" ref="O18"/>
-        </element>
-        <material name="Air" state="gas">
-            <T unit="K" value="293.13"/>
-            <MEE unit="eV" value="85.7030667332999"/>
-            <D unit="g/cm3" value="0.00129"/>
-            <fraction n="0.7" ref="Nitrogen"/>
-            <fraction n="0.3" ref="Oxygen"/>
-        </material>
-        <!-- }}} -->
-
-        <!-- {{{ Vacuum -->
-        <material name="Vacuum" state="gas">
-            <T unit="K" value="293.13"/>
-            <MEE unit="eV" value="85.7030667332999"/>
-            <D unit="g/cm3" value="1.e-20"/>
-            <fraction n="0.7" ref="Nitrogen"/>
-            <fraction n="0.3" ref="Oxygen"/>
-        </material>
-        <!-- }}} -->
-
-        <!-- {{{ Water -->
-        <element Z="1" formula="H" name="Hydrogen">
-            <atom value="2" />
-        </element>
-
-        <element Z="8" formula="O" name="Oxygen">
-            <atom value="16" />
-        </element>
-
-        <material name="Water" formula="H2O">
-            <D value="1.0" />
-            <composite n="2" ref="Hydrogen" />
-            <composite n="1" ref="Oxygen" />
-        </material>
-        <!-- }}} -->
-
-        <!-- {{{ Lead -->
-        <isotope N="204" Z="82" name="Pb204">
-            <atom unit="g/mole" value="203.973"/>
-        </isotope>
-        <isotope N="206" Z="82" name="Pb206">
-            <atom unit="g/mole" value="205.974"/>
-        </isotope>
-        <isotope N="207" Z="82" name="Pb207">
-            <atom unit="g/mole" value="206.976"/>
-        </isotope>
-        <isotope N="208" Z="82" name="Pb208">
-            <atom unit="g/mole" value="207.977"/>
-        </isotope>
-        <element name="Pb">
-            <fraction n="0.014" ref="Pb204"/>
-            <fraction n="0.241" ref="Pb206"/>
-            <fraction n="0.221" ref="Pb207"/>
-            <fraction n="0.524" ref="Pb208"/>
-        </element>
-        <material name="Lead" state="solid">
-            <MEE unit="eV" value="823"/>
-            <D unit="g/cm3" value="11.34"/>
-            <fraction n="1" ref="Pb"/>
-        </material>
-        <!-- }}} -->
-
-        <!-- {{{ Kapton -->
-        <material name="Kapton" state="solid">
-            <MEE unit="eV" value="79.6"/>
-            <D unit="g/cm3" value="1.42"/>
-            <fraction n="0.026362" ref="Hydrogen"/>
-            <fraction n="0.691133" ref="Carbon"/>
-            <fraction n="0.073270" ref="Nitrogen"/>
-            <fraction n="0.209235" ref="Oxygen"/>
-        </material>
-        <!-- }}} -->
-	<!--  {{{ Rubber-Neoprene -->
-	<material name="Neoprene" state="solid">
-	<D unit="g/cm3" value="1.23"/>
-          <MEE unit="eV" value="93.000000"/>
-	<fraction n="0.542646" ref="Carbon"/>
-	<fraction n="0.056920" ref="Hydrogen"/>
-	<fraction n="0.400434" ref="Chlorine"/>
-	
-	</material>
-	<!--  }}}  -->
-
-        <!-- {{{ Teflon (PTFE) -->
-        <material name="PTFE" state="solid">
-            <MEE unit="eV" value="105.35244885659"/>
-            <D unit="g/cm3" value="2.2"/>
-            <fraction n="0.240151969606079" ref="Carbon"/>
-            <fraction n="0.759848030393921" ref="Fluor"/>
-        </material>
-        <!-- }}} -->
-
-       <!-- {{{ Polyethylene -->
-    	<material name="PE" state="solid">
-            <MEE unit="eV" value="57.4000000"/>
-            <D unit="g/cm3" value="0.940"/>
-            <fraction n="0.143711" ref="Hydrogen"/>
-            <fraction n="0.856289" ref="Carbon"/>
-     	</material>
-    	<!-- }}} -->
-
-        <!-- {{{ Mylar -->
-        <material name="Mylar" state="solid">
-            <MEE unit="eV" value="78.700000"/>
-            <D unit="g/cm3" value="2.2"/>
-            <fraction n="0.041959" ref="Hydrogen"/>
-            <fraction n="0.625017" ref="Fluor"/>
-            <fraction n="0.333025" ref="Oxygen"/>
-        </material>
-        <!-- }}} -->
-
-        <!-- {{{ Plasctic scintillator -->
-        <material name="BC408" state="solid">
-            <MEE unit="eV" value="64.700000"/>
-            <D unit="g/cm3" value="1.03"/>
-            <fraction n="0.085000" ref="Hydrogen"/>
-            <fraction n="0.915000" ref="Carbon"/>
-        </material>
-        <!-- }}} -->
-	
-	<!-- {{{ Acrylic -->
-         <material name="Acrylic" state="solid">
-             <MEE unit="eV" value="0.00000"/><!-- this is not a correct figure -->
-             <D unit="g/cm3" value="1.18"/>
-             <fraction n="0.080000" ref="Hydrogen"/>
-             <fraction n="0.600000" ref="Carbon"/>
-             <fraction n="0.320000" ref="Oxygen"/>
-         </material>
-         <!-- }}} -->
-	<!-- {{{ Silicone (Polydimethylsiloxane) -->
-    	<material name="PDMS" state="solid">
-             <D unit="g/cm3" value="0.965"/>
-             <fraction n="0.081555" ref="Hydrogen"/>
-             <fraction n="0.323940" ref="Carbon"/>
-             <fraction n="0.215759" ref="Oxygen"/>
-             <fraction n="0.378746" ref="Silicon"/>
-     	</material>
-    	<!-- }}} -->
-      
-
-    </materials>
diff --git a/examples/04.MuonScan/CosmicMuonsFromCircle.rml b/examples/04.MuonScan/CosmicMuonsFromCircle.rml
index bb620401..b17919bf 100644
--- a/examples/04.MuonScan/CosmicMuonsFromCircle.rml
+++ b/examples/04.MuonScan/CosmicMuonsFromCircle.rml
@@ -1,5 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+
 <restG4>
+
     <TRestRun name="CosmicMuonRun" title="A basic muon test with 2 active volumes">
         <parameter name="experimentName" value="CosmicMuonScan"/>
         <parameter name="readOnly" value="false"/>
@@ -10,38 +12,51 @@
         <parameter name="overwrite" value="off"/>
         <parameter name="outputFileName" value="Run[fRunNumber]_[fRunType]_[fRunTag]_[fRunUser].root"/>
     </TRestRun>
+
     <TRestGeant4Metadata name="restG4 run" title="MuonsFromCircle">
-        <parameter name="gdmlFile" value="geometry/setup.gdml"/>
+
+        <parameter name="gdmlFile" value="setup.gdml"/>
         <parameter name="subEventTimeDelay" value="100us"/>
+
         <parameter name="nEvents" value="10000"/>
+
         <parameter name="seed" value="1702198"/>
         <parameter name="saveAllEvents" value="false"/>
         <parameter name="printProgress" value="true"/>
+
         <!-- From planar surface above detector (cosmic rays) -->
-        <generator type="surface" shape="circle" position="(0,100,0)mm" size="(400,0,0)mm" rotationAngle="90deg" rotationAxis="(1,0,0)">
+        <generator type="surface" shape="circle"
+                   position="(0,100,0)mm" size="(400,0,0)mm"
+                   rotationAngle="90deg" rotationAxis="(1,0,0)">
             <source particle="mu-" excitedLevel="0.0" fullChain="on">
                 <energy type="TH1D" file="Muons.root" name="cosmicmuon"/>
                 <angular type="formula" name="Cos2" direction="(0,-1,0)"/>
             </source>
         </generator>
+
         <detector>
             <parameter name="energyRange" value="(0,10)" units="GeV"/>
             <volume name="det_dw_01" sensitive="true" maxStepSize="1mm"/>
             <volume name="det_up_01" maxStepSize="1mm"/>
         </detector>
+
     </TRestGeant4Metadata>
+
     <TRestGeant4PhysicsLists name="default" title="First physics list implementation." verboseLevel="warning">
         <parameter name="cutForGamma" value="1" units="um"/>
         <parameter name="cutForElectron" value="1" units="um"/>
         <parameter name="cutForPositron" value="1" units="um"/>
+
         <parameter name="cutForMuon" value="1" units="mm"/>
         <parameter name="cutForNeutron" value="1" units="mm"/>
         <parameter name="minEnergyRangeProductionCuts" value="1" units="keV"/>
         <parameter name="maxEnergyRangeProductionCuts" value="1" units="GeV"/>
+
         <!-- EM Physics lists -->
         <physicsList name="G4EmLivermorePhysics"/>
         <!-- <physicsList name="G4EmPenelopePhysics"> </physicsList> -->
         <!-- <physicsList name="G4EmStandardPhysics_option3"> </physicsList> -->
+
         <!-- Decay physics lists -->
         <physicsList name="G4DecayPhysics"/>
         <physicsList name="G4RadioactiveDecayPhysics"/>
@@ -49,10 +64,13 @@
             <option name="ICM" value="true"/>
             <option name="ARM" value="true"/>
         </physicsList>
+
         <!-- Hadron physics lists -->
         <physicsList name="G4HadronElasticPhysicsHP"/>
         <physicsList name="G4IonBinaryCascadePhysics"/>
         <physicsList name="G4HadronPhysicsQGSP_BIC_HP"/>
         <physicsList name="G4EmExtraPhysics"/>
+
     </TRestGeant4PhysicsLists>
+
 </restG4>
diff --git a/examples/04.MuonScan/CosmicMuonsFromWall.rml b/examples/04.MuonScan/CosmicMuonsFromWall.rml
index 027e19a0..dd178577 100644
--- a/examples/04.MuonScan/CosmicMuonsFromWall.rml
+++ b/examples/04.MuonScan/CosmicMuonsFromWall.rml
@@ -1,7 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+
 <!--
 First concept author G. Luzón (16-11-2020) -->
+
 <restG4>
+
     <TRestRun name="CosmicMuonRun" title="A basic muon test with 2 active volumes">
         <parameter name="experimentName" value="CosmicMuonScan"/>
         <parameter name="readOnly" value="false"/>
@@ -12,37 +15,49 @@ First concept author G. Luzón (16-11-2020) -->
         <parameter name="overwrite" value="off"/>
         <parameter name="outputFileName" value="Run[fRunNumber]_[fRunType]_[fRunTag]_[fRunUser].root"/>
     </TRestRun>
+
     <TRestGeant4Metadata name="restG4 run" title="MuonsFromWall">
-        <parameter name="gdmlFile" value="geometry/setup.gdml"/>
+
+        <parameter name="gdmlFile" value="setup.gdml"/>
         <parameter name="subEventTimeDelay" value="100us"/>
+
         <parameter name="nEvents" value="1000"/>
         <parameter name="seed" value="17021981"/>
+
         <parameter name="saveAllEvents" value="false"/>
         <parameter name="printProgress" value="true"/>
-        <generator type="surface" shape="wall" position="(0,0,50)cm" size="(30,30,0)cm" rotationAngle="0" rotationAxis="(1,0,0)">
+
+        <generator type="surface" shape="wall" position="(0,0,50)cm" size="(30,30,0)cm" rotationAngle="0"
+                   rotationAxis="(1,0,0)">
             <source particle="mu-" excitedLevel="0.0" fullChain="on">
                 <energy type="TH1D" file="Muons.root" name="cosmicmuon"/>
                 <angular type="formula" name="Cos2" direction="(0,0,-1)"/>
             </source>
         </generator>
+
         <detector>
             <parameter name="energyRange" value="(0,10)" units="GeV"/>
             <volume name="det_dw_01" sensitive="true" maxStepSize="1mm"/>
             <volume name="det_up_01" maxStepSize="1mm"/>
         </detector>
+
     </TRestGeant4Metadata>
+
     <TRestGeant4PhysicsLists name="default" title="First physics list implementation." verboseLevel="warning">
         <parameter name="cutForGamma" value="1" units="um"/>
         <parameter name="cutForElectron" value="1" units="um"/>
         <parameter name="cutForPositron" value="1" units="um"/>
+
         <parameter name="cutForMuon" value="1" units="mm"/>
         <parameter name="cutForNeutron" value="1" units="mm"/>
         <parameter name="minEnergyRangeProductionCuts" value="1" units="keV"/>
         <parameter name="maxEnergyRangeProductionCuts" value="1" units="GeV"/>
+
         <!-- EM Physics lists -->
         <physicsList name="G4EmLivermorePhysics"/>
         <!-- <physicsList name="G4EmPenelopePhysics"> </physicsList> -->
         <!-- <physicsList name="G4EmStandardPhysics_option3"> </physicsList> -->
+
         <!-- Decay physics lists -->
         <physicsList name="G4DecayPhysics"/>
         <physicsList name="G4RadioactiveDecayPhysics"/>
@@ -50,10 +65,13 @@ First concept author G. Luzón (16-11-2020) -->
             <option name="ICM" value="true"/>
             <option name="ARM" value="true"/>
         </physicsList>
+
         <!-- Hadron physics lists -->
         <physicsList name="G4HadronElasticPhysicsHP"/>
         <physicsList name="G4IonBinaryCascadePhysics"/>
         <physicsList name="G4HadronPhysicsQGSP_BIC_HP"/>
         <physicsList name="G4EmExtraPhysics"/>
+
     </TRestGeant4PhysicsLists>
+
 </restG4>
diff --git a/examples/04.MuonScan/Muon.rml b/examples/04.MuonScan/Muon.rml
index 9528488a..70fa44a1 100644
--- a/examples/04.MuonScan/Muon.rml
+++ b/examples/04.MuonScan/Muon.rml
@@ -11,7 +11,7 @@
         <parameter name="outputFileName" value="Run[fRunNumber]_[fRunType]_[fRunTag]_[fRunUser].root"/>
     </TRestRun>
     <TRestGeant4Metadata name="restG4 run" title="MuonsFromPoint" verboseLevel="info">
-        <parameter name="gdmlFile" value="geometry/setup.gdml"/>
+        <parameter name="gdmlFile" value="setup.gdml"/>
         <parameter name="subEventTimeDelay" value="100us"/>
         <parameter name="nEvents" value="1000"/>
         <parameter name="saveAllEvents" value="off"/>
diff --git a/examples/04.MuonScan/geometry.gdml b/examples/04.MuonScan/geometry.gdml
new file mode 100644
index 00000000..85597d75
--- /dev/null
+++ b/examples/04.MuonScan/geometry.gdml
@@ -0,0 +1,43 @@
+<solids>
+    <box name="WorldSolid" x="world_size" y="world_size" z="world_size" lunit="mm"/>
+    <box name="layer" x="500" y="500" z="50" lunit="mm"/>
+    <sphere name="esfera" rmin="0" rmax="5" deltaphi="360" deltatheta="180" aunit="deg" lunit="mm"/>
+</solids>
+
+<structure>
+<volume name="topLayerVolume">
+    <materialref ref="Ar_ISO"/>
+    <solidref ref="layer"/>
+</volume>
+
+<volume name="bottomLayerVolume">
+    <materialref ref="Ar_ISO"/>
+    <solidref ref="layer"/>
+</volume>
+
+<volume name="EsferaVolume">
+    <materialref ref="Lead"/>
+    <solidref ref="esfera"/>
+</volume>
+
+<volume name="World">
+    <materialref ref="Air"/>
+    <solidref ref="WorldSolid"/>
+
+    <physvol name="det_up_01">
+        <volumeref ref="topLayerVolume"/>
+        <position name="upPosition" unit="mm" x="0" y="0" z="300"/>
+    </physvol>
+
+    <physvol name="det_dw_01">
+        <volumeref ref="bottomLayerVolume"/>
+        <position name="downPosition" unit="mm" x="0" y="0" z="-300"/>
+    </physvol>
+
+    <physvol name="target">
+        <volumeref ref="EsferaVolume"/>
+        <position name="targetPosition" unit="mm" x="0" y="0" z="0"/>
+    </physvol>
+
+</volume>
+</structure>
diff --git a/examples/04.MuonScan/setup.gdml b/examples/04.MuonScan/setup.gdml
new file mode 100644
index 00000000..2dcd3d81
--- /dev/null
+++ b/examples/04.MuonScan/setup.gdml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<!-- ##VERSION TREX-DM Basic geometry Version 1.1 (Ar_ISO - 1 bar - Quencher: 0.01 )## -->
+
+<!DOCTYPE gdml [
+        <!ENTITY geometry SYSTEM "geometry.gdml">
+        <!ENTITY materials SYSTEM "https://rest-for-physics.github.io/materials/rest.xml">
+        ]>
+
+<gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:noNamespaceSchemaLocation="http://service-spi.web.cern.ch/service-spi/app/releases/GDML/schema/gdml.xsd">
+
+    <!-- All values should be in mm -->
+
+    <define>
+        <constant name="world_size" value="20000"/>
+
+        <!-- We must define these variables that are hardcoded in materials.xml -->
+        <!-- They have no use in this example since we do not use a gas mixture in our simulation -->
+        <!-- This makes non sense, and it could be solved if we would have a dedicated materials file for gas mixtures -->
+        <variable name="targetGasDensity" value="1*0.9"/>  <!-- mg/cm3 -->
+        <variable name="quencherDensity" value="1*0.05"/> <!-- mg/cm3 -->
+        <variable name="quencherFraction" value="0.01"/>
+        <variable name="gasTemperature" value="300"/> <!-- K -->
+        <variable name="gasPressure" value="1"/> <!-- bar -->
+    </define>
+
+    &materials;
+
+    &geometry;
+
+
+    <setup name="Default" version="1.0">
+        <world ref="World"/>
+    </setup>
+
+</gdml>
diff --git a/examples/06.IonRecoils/geometry/rest.xml b/examples/06.IonRecoils/geometry/rest.xml
deleted file mode 100644
index 40a41977..00000000
--- a/examples/06.IonRecoils/geometry/rest.xml
+++ /dev/null
@@ -1,400 +0,0 @@
-<!-- ##VERSION REST materials 1.4## -->
-<!-- densities in mg/cm3 @ 293.15K -->
-    <materials>
-        <!-- {{{ Elements definition -->
-        <element name="Hydrogen" formula="H" Z="1">
-            <atom value="1.00794" />
-        </element>
-       
-	<element name="Helium" formula="N" Z="2">
-	    <atom value="4.0026" />
-	</element>
-
-        <element name="Carbon" formula="C" Z="6">
-            <atom value="12.0107" />
-        </element>
-        <element name="Nitrogen" formula="N" Z="7">
-            <atom value="14.0067" />
-        </element>
-        <element name="Fluor" formula="F" Z="9">
-            <atom value="18.9984" />
-        </element>
-        <element name="Silicon" formula="Si" Z="14" state="solid">
-            <atom value="28.0855" />
-        </element>
-        <element name="Chromium" formula="Cr" Z="24" state="solid">
-            <atom value="51.996" />
-        </element>
-        <element name="Manganese" formula="Mn" Z="25">
-            <atom value="54.938045" />
-        </element>
-        <element name="Iron" formula="Fe" Z="26" state="solid">
-            <atom value="55.845" />
-        </element>
-        <element name="Nickel" formula="Ni" Z="28" state="solid">
-            <atom value="58.6934" />
-        </element>
-        <element name="Aluminium" formula="Al" Z="13" state="solid">
-            <atom value="26.982" />
-        </element>
-        <element name="Xenon" formula="Xe" Z="54" state="gas">
-            <atom value="131.293" />
-        </element>
-        <element name="Argon" formula="Ar" Z="18" state="gas">
-            <atom value="39.948" />
-        </element>
-        <element name="Neon" formula="Ne" Z="10" state="gas">
-         <atom value="20.1797" />
-        </element>
-        <element name="Zinc" formula="Zn" Z="30">
-	<atom value="65.4094"/>
-        </element>
-	<element name="Magnesium" formula="Mg" Z="12">
-	<atom value="24.3050"/>
-	</element>
-	<element name="Sulfur" formula="S" Z="16">
-	<atom value="32.0655"/>
-	</element>
-          <element name="Chlorine" formula="Cl" Z="17">
-	<atom value="35.4532"/>
-	</element>
-        <element name="Iodide" formula="I" Z="53">
-	<atom value="126.9"/>
-	</element>
-      
-
-        
-       
-        <!-- }}} -->
-
-        <!-- {{{ Quenchers -->
-        <material name="TMA" state="gas">
-            <D unit="mg/cm3" value="quencherDensity" />
-            <T unit="K" value="gasTemperature" />
-            <P unit="bar" value="gasPressure" />
-            <composite n="3" ref="Carbon" />
-            <composite n="9" ref="Hydrogen" />
-            <composite n="1" ref="Nitrogen" />
-        </material>
-
-        <material name="isobutane" state="gas">
-            <D unit="mg/cm3" value="quencherDensity" />
-            <T unit="K" value="gasTemperature" />
-            <P unit="bar" value="gasPressure" />
-            <composite n="4" ref="Carbon" />
-            <composite n="10" ref="Hydrogen" />
-        </material>
-        <!-- }}} -->
-
-        <!-- {{{ Gas mixtures -->
-        <material name="PureHelium" state="gas">
-	    <T unit="K" value="gasTemperature"/>
-	    <P unit="bar" value="gasPressure"/>
-	    <MEE unit="eV" value="188"/>
-            <D unit="mg/cm3" value="targetGasDensity"/>
-	    <fraction n="1" ref="Helium"/>
-	</material>
-
-        <material name="PureXenon" state="gas">
-            <T unit="K" value="gasTemperature"/>
-            <P unit="bar" value="gasPressure"/>
-            <MEE unit="eV" value="482"/>
-            <D unit="mg/cm3" value="targetGasDensity"/>
-            <fraction n="1" ref="Xenon"/>
-        </material>
-
-        <material name="Xenon_TMA" state="gas">
-            <D unit="mg/cm3" value="targetGasDensity+quencherDensity" />
-            <P unit="bar" value="gasPressure" />
-            <T unit="K" value="gasTemperature" />
-            <fraction n="quencherFraction" ref="TMA" />
-            <fraction n="1-quencherFraction" ref="Xenon" />
-        </material>
-
-        <material name="Xenon_ISO" state="gas">
-            <D unit="mg/cm3" value="targetGasDensity+quencherDensity" />
-            <P unit="bar" value="gasPressure" />
-            <T unit="K" value="gasTemperature" />
-            <fraction n="quencherFraction" ref="isobutane" />
-            <fraction n="1-quencherFraction" ref="Xenon" />
-        </material>
-
-        <material name="PureArgon" state="gas">
-            <T unit="K" value="gasTemperature"/>
-            <P unit="bar" value="gasPressure"/>
-            <MEE unit="eV" value="188"/>
-            <D unit="mg/cm3" value="targetGasDensity"/>
-            <fraction n="1" ref="Argon"/>
-        </material>
-
-        <material name="Ar_ISO" state="gas">
-            <D unit="mg/cm3" value="targetGasDensity+quencherDensity" />
-            <P unit="bar" value="gasPressure" />
-            <T unit="K" value="gasTemperature" />
-            <fraction n="quencherFraction" ref="isobutane" />
-            <fraction n="1-quencherFraction" ref="Argon" />
-        </material>
-
-        <material name="Neon_ISO" state="gas">
-            <D unit="mg/cm3" value="targetGasDensity+quencherDensity" />
-            <P unit="bar" value="gasPressure" />
-            <T unit="K" value="gasTemperature" />
-            <fraction n="quencherFraction" ref="isobutane" />
-            <fraction n="1-quencherFraction" ref="Neon" />
-        </material>
-
-        <!-- }}} -->
-
-        <!-- {{{ Copper -->
-        <isotope N="63" Z="29" name="Cu63">
-            <atom unit="g/mole" value="62.9296"/>
-        </isotope>
-        <isotope N="65" Z="29" name="Cu65">
-            <atom unit="g/mole" value="64.9278"/>
-        </isotope>
-        <element name="Cu">
-            <fraction n="0.6917" ref="Cu63"/>
-            <fraction n="0.3083" ref="Cu65"/>
-        </element>
-        <material name="Copper" state="solid">
-            <MEE unit="eV" value="322"/>
-            <D unit="g/cm3" value="8.96"/>
-            <fraction n="1" ref="Cu"/>
-        </material>
-        <!-- }}} -->
-
-      <!-- {{{ Aluminium -->
-        <isotope N="27" Z="13" name="Al27">
-        <atom unit="g/mole" value="26.982"/>
-          </isotope>
-        <element name="Al">
-        <fraction n="1.0000" ref="Al27"/>
-        </element>
-        <material name="Aluminium" state="solid">
-         <MEE unit="eV" value="166"/>
-        <D unit="g/cm3" value="2.70"/>
-        <fraction n="1" ref="Al"/>
-         </material>
-    <!-- }}} -->   
-
- 	<!-- {{{ Cadmium-->
-        <isotope N="106" Z="48" name="Cd106">
-        <atom unit="g/mole" value="105.91"/>
-          </isotope>
-	<isotope N="108" Z="48" name="Cd108">
-        <atom unit="g/mole" value="107.90"/>
-          </isotope>
-	<isotope N="110" Z="48" name="Cd110">
-        <atom unit="g/mole" value="109.90"/>
-          </isotope>
-	<isotope N="111" Z="48" name="Cd111">
-        <atom unit="g/mole" value="110.90"/>
-          </isotope>
-	<isotope N="112" Z="48" name="Cd112">
-        <atom unit="g/mole" value="111.90"/>
-          </isotope>
-	<isotope N="113" Z="48" name="Cd113">
-        <atom unit="g/mole" value="112.90"/>
-          </isotope>
-	<isotope N="114" Z="48" name="Cd114">
-        <atom unit="g/mole" value="113.90"/>
-          </isotope>
-	<isotope N="116" Z="48" name="Cd116">
-        <atom unit="g/mole" value="115.90"/>
-          </isotope>
-        <element name="Cd">
-        <fraction n="0.0125" ref="Cd106"/>
-	 <fraction n="0.0089" ref="Cd108"/>
-	 <fraction n="0.1249" ref="Cd110"/>
-	 <fraction n="0.1280" ref="Cd111"/>
-	 <fraction n="0.2413" ref="Cd112"/>
-	<fraction n="0.1222" ref="Cd113"/>
-	 <fraction n="0.2873" ref="Cd114"/>
-	 <fraction n="0.0749" ref="Cd116"/>
-        </element>
-        <material name="Cadmium" state="solid">
-         <MEE unit="eV" value="469.0"/>
-        <D unit="g/cm3" value="8.65"/>
- 	 <fraction n="1" ref="Cd"/>
-         </material>
-   	 <!-- }}} -->   
-
-                                      
-        <!-- {{{ Stainlesssteel -->
-        <material name="Stainlesssteel" state="solid">
-            <MEE unit="eV" value="280.927567486627"/>
-            <D unit="g/cm3" value="8.02"/>
-            <fraction n="0.02" ref="Manganese"/>
-            <fraction n="0.01" ref="Silicon"/>
-            <fraction n="0.19" ref="Chromium"/>
-            <fraction n="0.1" ref="Nickel"/>
-            <fraction n="0.68" ref="Iron"/>
-        </material>
-        <!-- }}} -->
-
-        <!-- {{{ Air -->
-        <isotope N="14" Z="7" name="N14">
-            <atom unit="g/mole" value="14.0031"/>
-        </isotope>
-        <isotope N="15" Z="7" name="N15">
-            <atom unit="g/mole" value="15.0001"/>
-        </isotope>
-        <element name="Nitrogen">
-            <fraction n="0.99632" ref="N14"/>
-            <fraction n="0.00368" ref="N15"/>
-        </element>
-
-        <isotope N="16" Z="8" name="O16">
-            <atom unit="g/mole" value="15.9949"/>
-        </isotope>
-        <isotope N="17" Z="8" name="O17">
-            <atom unit="g/mole" value="16.9991"/>
-        </isotope>
-        <isotope N="18" Z="8" name="O18">
-            <atom unit="g/mole" value="17.9992"/>
-        </isotope>
-        <element name="Oxygen">
-            <fraction n="0.99757" ref="O16"/>
-            <fraction n="0.00038" ref="O17"/>
-            <fraction n="0.00205" ref="O18"/>
-        </element>
-        <material name="Air" state="gas">
-            <T unit="K" value="293.13"/>
-            <MEE unit="eV" value="85.7030667332999"/>
-            <D unit="g/cm3" value="0.00129"/>
-            <fraction n="0.7" ref="Nitrogen"/>
-            <fraction n="0.3" ref="Oxygen"/>
-        </material>
-        <!-- }}} -->
-
-        <!-- {{{ Vacuum -->
-        <material name="Vacuum" state="gas">
-            <T unit="K" value="293.13"/>
-            <MEE unit="eV" value="85.7030667332999"/>
-            <D unit="g/cm3" value="1.e-20"/>
-            <fraction n="0.7" ref="Nitrogen"/>
-            <fraction n="0.3" ref="Oxygen"/>
-        </material>
-        <!-- }}} -->
-
-        <!-- {{{ Water -->
-        <element Z="1" formula="H" name="Hydrogen">
-            <atom value="2" />
-        </element>
-
-        <element Z="8" formula="O" name="Oxygen">
-            <atom value="16" />
-        </element>
-
-        <material name="Water" formula="H2O">
-            <D value="1.0" />
-            <composite n="2" ref="Hydrogen" />
-            <composite n="1" ref="Oxygen" />
-        </material>
-        <!-- }}} -->
-
-        <!-- {{{ Lead -->
-        <isotope N="204" Z="82" name="Pb204">
-            <atom unit="g/mole" value="203.973"/>
-        </isotope>
-        <isotope N="206" Z="82" name="Pb206">
-            <atom unit="g/mole" value="205.974"/>
-        </isotope>
-        <isotope N="207" Z="82" name="Pb207">
-            <atom unit="g/mole" value="206.976"/>
-        </isotope>
-        <isotope N="208" Z="82" name="Pb208">
-            <atom unit="g/mole" value="207.977"/>
-        </isotope>
-        <element name="Pb">
-            <fraction n="0.014" ref="Pb204"/>
-            <fraction n="0.241" ref="Pb206"/>
-            <fraction n="0.221" ref="Pb207"/>
-            <fraction n="0.524" ref="Pb208"/>
-        </element>
-        <material name="Lead" state="solid">
-            <MEE unit="eV" value="823"/>
-            <D unit="g/cm3" value="11.34"/>
-            <fraction n="1" ref="Pb"/>
-        </material>
-        <!-- }}} -->
-
-        <!-- {{{ Kapton -->
-        <material name="Kapton" state="solid">
-            <MEE unit="eV" value="79.6"/>
-            <D unit="g/cm3" value="1.42"/>
-            <fraction n="0.026362" ref="Hydrogen"/>
-            <fraction n="0.691133" ref="Carbon"/>
-            <fraction n="0.073270" ref="Nitrogen"/>
-            <fraction n="0.209235" ref="Oxygen"/>
-        </material>
-        <!-- }}} -->
-	<!--  {{{ Rubber-Neoprene -->
-	<material name="Neoprene" state="solid">
-	<D unit="g/cm3" value="1.23"/>
-          <MEE unit="eV" value="93.000000"/>
-	<fraction n="0.542646" ref="Carbon"/>
-	<fraction n="0.056920" ref="Hydrogen"/>
-	<fraction n="0.400434" ref="Chlorine"/>
-	
-	</material>
-	<!--  }}}  -->
-
-        <!-- {{{ Teflon (PTFE) -->
-        <material name="PTFE" state="solid">
-            <MEE unit="eV" value="105.35244885659"/>
-            <D unit="g/cm3" value="2.2"/>
-            <fraction n="0.240151969606079" ref="Carbon"/>
-            <fraction n="0.759848030393921" ref="Fluor"/>
-        </material>
-        <!-- }}} -->
-
-       <!-- {{{ Polyethylene -->
-    	<material name="PE" state="solid">
-            <MEE unit="eV" value="57.4000000"/>
-            <D unit="g/cm3" value="0.940"/>
-            <fraction n="0.143711" ref="Hydrogen"/>
-            <fraction n="0.856289" ref="Carbon"/>
-     	</material>
-    	<!-- }}} -->
-
-        <!-- {{{ Mylar -->
-        <material name="Mylar" state="solid">
-            <MEE unit="eV" value="78.700000"/>
-            <D unit="g/cm3" value="2.2"/>
-            <fraction n="0.041959" ref="Hydrogen"/>
-            <fraction n="0.625017" ref="Fluor"/>
-            <fraction n="0.333025" ref="Oxygen"/>
-        </material>
-        <!-- }}} -->
-
-        <!-- {{{ Plasctic scintillator -->
-        <material name="BC408" state="solid">
-            <MEE unit="eV" value="64.700000"/>
-            <D unit="g/cm3" value="1.03"/>
-            <fraction n="0.085000" ref="Hydrogen"/>
-            <fraction n="0.915000" ref="Carbon"/>
-        </material>
-        <!-- }}} -->
-	
-	<!-- {{{ Acrylic -->
-         <material name="Acrylic" state="solid">
-             <MEE unit="eV" value="0.00000"/><!-- this is not a correct figure -->
-             <D unit="g/cm3" value="1.18"/>
-             <fraction n="0.080000" ref="Hydrogen"/>
-             <fraction n="0.600000" ref="Carbon"/>
-             <fraction n="0.320000" ref="Oxygen"/>
-         </material>
-         <!-- }}} -->
-	<!-- {{{ Silicone (Polydimethylsiloxane) -->
-    	<material name="PDMS" state="solid">
-             <D unit="g/cm3" value="0.965"/>
-             <fraction n="0.081555" ref="Hydrogen"/>
-             <fraction n="0.323940" ref="Carbon"/>
-             <fraction n="0.215759" ref="Oxygen"/>
-             <fraction n="0.378746" ref="Silicon"/>
-     	</material>
-    	<!-- }}} -->
-      
-
-    </materials>
diff --git a/examples/06.IonRecoils/geometry/setup.gdml b/examples/06.IonRecoils/geometry/setup.gdml
index c20ad4d5..37ca222b 100644
--- a/examples/06.IonRecoils/geometry/setup.gdml
+++ b/examples/06.IonRecoils/geometry/setup.gdml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="no" ?>
-<!-- ##VERSION REST Example 06.IonRecoils Version 1.0## -->
+<!-- ##VERSION REST Example 01.NLDBD Version 1.0## -->
 
 <!DOCTYPE gdml [
         <!ENTITY geometry SYSTEM "geometry.gdml">
-        <!ENTITY materials SYSTEM "rest.xml">
+        <!ENTITY materials SYSTEM "https://rest-for-physics.github.io/materials/rest.xml">
         ]>
 
 <gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/examples/07.FullChainDecay/geometry/rest.xml b/examples/07.FullChainDecay/geometry/rest.xml
deleted file mode 100644
index cbe95329..00000000
--- a/examples/07.FullChainDecay/geometry/rest.xml
+++ /dev/null
@@ -1,399 +0,0 @@
-<!-- ##VERSION REST materials 1.4## -->
-<!-- densities in mg/cm3 @ 293.15K -->
-    <materials>
-        <!-- {{{ Elements definition -->
-        <element name="Hydrogen" formula="H" Z="1">
-            <atom value="1.00794" />
-        </element>
-       
-	<element name="Helium" formula="N" Z="2">
-	    <atom value="4.0026" />
-	</element>
-
-        <element name="Carbon" formula="C" Z="6">
-            <atom value="12.0107" />
-        </element>
-        <element name="Nitrogen" formula="N" Z="7">
-            <atom value="14.0067" />
-        </element>
-        <element name="Fluor" formula="F" Z="9">
-            <atom value="18.9984" />
-        </element>
-        <element name="Silicon" formula="Si" Z="14" state="solid">
-            <atom value="28.0855" />
-        </element>
-        <element name="Chromium" formula="Cr" Z="24" state="solid">
-            <atom value="51.996" />
-        </element>
-        <element name="Manganese" formula="Mn" Z="25">
-            <atom value="54.938045" />
-        </element>
-        <element name="Iron" formula="Fe" Z="26" state="solid">
-            <atom value="55.845" />
-        </element>
-        <element name="Nickel" formula="Ni" Z="28" state="solid">
-            <atom value="58.6934" />
-        </element>
-        <element name="Aluminium" formula="Al" Z="13" state="solid">
-            <atom value="26.982" />
-        </element>
-        <element name="Xenon" formula="Xe" Z="54" state="gas">
-            <atom value="131.293" />
-        </element>
-        <element name="Argon" formula="Ar" Z="18" state="gas">
-            <atom value="39.948" />
-        </element>
-        <element name="Neon" formula="Ne" Z="10" state="gas">
-         <atom value="20.1797" />
-        </element>
-        <element name="Zinc" formula="Zn" Z="30">
-	<atom value="65.4094"/>
-        </element>
-	<element name="Magnesium" formula="Mg" Z="12">
-	<atom value="24.3050"/>
-	</element>
-	<element name="Sulfur" formula="S" Z="16">
-	<atom value="32.0655"/>
-	</element>
-          <element name="Chlorine" formula="Cl" Z="17">
-	<atom value="35.4532"/>
-	</element>
-        <element name="Iodide" formula="I" Z="53">
-	<atom value="126.9"/>
-	</element>
-      
-
-        
-       
-        <!-- }}} -->
-
-        <!-- {{{ Quenchers -->
-        <material name="TMA" state="gas">
-            <D unit="mg/cm3" value="quencherDensity" />
-            <T unit="K" value="gasTemperature" />
-            <P unit="bar" value="gasPressure" />
-            <composite n="3" ref="Carbon" />
-            <composite n="9" ref="Hydrogen" />
-            <composite n="1" ref="Nitrogen" />
-        </material>
-
-        <material name="isobutane" state="gas">
-            <D unit="mg/cm3" value="quencherDensity" />
-            <T unit="K" value="gasTemperature" />
-            <P unit="bar" value="gasPressure" />
-            <composite n="4" ref="Carbon" />
-            <composite n="10" ref="Hydrogen" />
-        </material>
-        <!-- }}} -->
-
-        <!-- {{{ Gas mixtures -->
-        <material name="PureHelium" state="gas">
-	    <T unit="K" value="gasTemperature"/>
-	    <P unit="bar" value="gasPressure"/>
-	    <MEE unit="eV" value="188"/>
-            <D unit="mg/cm3" value="targetGasDensity"/>
-	    <fraction n="1" ref="Helium"/>
-	</material>
-
-        <material name="PureXenon" state="gas">
-            <T unit="K" value="gasTemperature"/>
-            <P unit="bar" value="gasPressure"/>
-            <MEE unit="eV" value="482"/>
-            <D unit="mg/cm3" value="targetGasDensity"/>
-            <fraction n="1" ref="Xenon"/>
-        </material>
-
-        <material name="Xenon_TMA" state="gas">
-            <D unit="mg/cm3" value="targetGasDensity+quencherDensity" />
-            <P unit="bar" value="gasPressure" />
-            <T unit="K" value="gasTemperature" />
-            <fraction n="quencherFraction" ref="TMA" />
-            <fraction n="1-quencherFraction" ref="Xenon" />
-        </material>
-
-        <material name="Xenon_ISO" state="gas">
-            <D unit="mg/cm3" value="targetGasDensity+quencherDensity" />
-            <P unit="bar" value="gasPressure" />
-            <T unit="K" value="gasTemperature" />
-            <fraction n="quencherFraction" ref="isobutane" />
-            <fraction n="1-quencherFraction" ref="Xenon" />
-        </material>
-
-        <material name="PureArgon" state="gas">
-            <T unit="K" value="gasTemperature"/>
-            <P unit="bar" value="gasPressure"/>
-            <MEE unit="eV" value="188"/>
-            <D unit="mg/cm3" value="targetGasDensity"/>
-            <fraction n="1" ref="Argon"/>
-        </material>
-
-        <material name="Ar_ISO" state="gas">
-            <D unit="mg/cm3" value="targetGasDensity+quencherDensity" />
-            <P unit="bar" value="gasPressure" />
-            <T unit="K" value="gasTemperature" />
-            <fraction n="quencherFraction" ref="isobutane" />
-            <fraction n="1-quencherFraction" ref="Argon" />
-        </material>
-
-        <material name="Neon_ISO" state="gas">
-            <D unit="mg/cm3" value="targetGasDensity+quencherDensity" />
-            <P unit="bar" value="gasPressure" />
-            <T unit="K" value="gasTemperature" />
-            <fraction n="quencherFraction" ref="isobutane" />
-            <fraction n="1-quencherFraction" ref="Neon" />
-        </material>
-
-        <!-- }}} -->
-
-        <!-- {{{ Copper -->
-        <isotope N="63" Z="29" name="Cu63">
-            <atom unit="g/mole" value="62.9296"/>
-        </isotope>
-        <isotope N="65" Z="29" name="Cu65">
-            <atom unit="g/mole" value="64.9278"/>
-        </isotope>
-        <element name="Cu">
-            <fraction n="0.6917" ref="Cu63"/>
-            <fraction n="0.3083" ref="Cu65"/>
-        </element>
-        <material name="Copper" state="solid">
-            <MEE unit="eV" value="322"/>
-            <D unit="g/cm3" value="8.96"/>
-            <fraction n="1" ref="Cu"/>
-        </material>
-        <!-- }}} -->
-
-      <!-- {{{ Aluminium -->
-        <isotope N="27" Z="13" name="Al27">
-        <atom unit="g/mole" value="26.982"/>
-          </isotope>
-        <element name="Al">
-        <fraction n="1.0000" ref="Al27"/>
-        </element>
-        <material name="Aluminium" state="solid">
-         <MEE unit="eV" value="166"/>
-        <D unit="g/cm3" value="2.70"/>
-        <fraction n="1" ref="Al"/>
-         </material>
-    <!-- }}} -->   
-
- 	<!-- {{{ Cadmium-->
-        <isotope N="106" Z="48" name="Cd106">
-        <atom unit="g/mole" value="105.91"/>
-          </isotope>
-	<isotope N="108" Z="48" name="Cd108">
-        <atom unit="g/mole" value="107.90"/>
-          </isotope>
-	<isotope N="110" Z="48" name="Cd110">
-        <atom unit="g/mole" value="109.90"/>
-          </isotope>
-	<isotope N="111" Z="48" name="Cd111">
-        <atom unit="g/mole" value="110.90"/>
-          </isotope>
-	<isotope N="112" Z="48" name="Cd112">
-        <atom unit="g/mole" value="111.90"/>
-          </isotope>
-	<isotope N="113" Z="48" name="Cd113">
-        <atom unit="g/mole" value="112.90"/>
-          </isotope>
-	<isotope N="114" Z="48" name="Cd114">
-        <atom unit="g/mole" value="113.90"/>
-          </isotope>
-	<isotope N="116" Z="48" name="Cd116">
-        <atom unit="g/mole" value="115.90"/>
-          </isotope>
-        <element name="Cd">
-        <fraction n="0.0125" ref="Cd106"/>
-	 <fraction n="0.0089" ref="Cd108"/>
-	 <fraction n="0.1249" ref="Cd110"/>
-	 <fraction n="0.1280" ref="Cd111"/>
-	 <fraction n="0.2413" ref="Cd112"/>
-	<fraction n="0.1222" ref="Cd113"/>
-	 <fraction n="0.2873" ref="Cd114"/>
-	 <fraction n="0.0749" ref="Cd116"/>
-        </element>
-        <material name="Cadmium" state="solid">
-         <MEE unit="eV" value="469.0"/>
-        <D unit="g/cm3" value="8.65"/>
- 	 <fraction n="1" ref="Cd"/>
-         </material>
-   	 <!-- }}} -->   
-
-        <!-- {{{ Stainlesssteel -->
-        <material name="Stainlesssteel" state="solid">
-            <MEE unit="eV" value="280.927567486627"/>
-            <D unit="g/cm3" value="8.02"/>
-            <fraction n="0.02" ref="Manganese"/>
-            <fraction n="0.01" ref="Silicon"/>
-            <fraction n="0.19" ref="Chromium"/>
-            <fraction n="0.1" ref="Nickel"/>
-            <fraction n="0.68" ref="Iron"/>
-        </material>
-        <!-- }}} -->
-
-        <!-- {{{ Air -->
-        <isotope N="14" Z="7" name="N14">
-            <atom unit="g/mole" value="14.0031"/>
-        </isotope>
-        <isotope N="15" Z="7" name="N15">
-            <atom unit="g/mole" value="15.0001"/>
-        </isotope>
-        <element name="Nitrogen">
-            <fraction n="0.99632" ref="N14"/>
-            <fraction n="0.00368" ref="N15"/>
-        </element>
-
-        <isotope N="16" Z="8" name="O16">
-            <atom unit="g/mole" value="15.9949"/>
-        </isotope>
-        <isotope N="17" Z="8" name="O17">
-            <atom unit="g/mole" value="16.9991"/>
-        </isotope>
-        <isotope N="18" Z="8" name="O18">
-            <atom unit="g/mole" value="17.9992"/>
-        </isotope>
-        <element name="Oxygen">
-            <fraction n="0.99757" ref="O16"/>
-            <fraction n="0.00038" ref="O17"/>
-            <fraction n="0.00205" ref="O18"/>
-        </element>
-        <material name="Air" state="gas">
-            <T unit="K" value="293.13"/>
-            <MEE unit="eV" value="85.7030667332999"/>
-            <D unit="g/cm3" value="0.00129"/>
-            <fraction n="0.7" ref="Nitrogen"/>
-            <fraction n="0.3" ref="Oxygen"/>
-        </material>
-        <!-- }}} -->
-
-        <!-- {{{ Vacuum -->
-        <material name="Vacuum" state="gas">
-            <T unit="K" value="293.13"/>
-            <MEE unit="eV" value="85.7030667332999"/>
-            <D unit="g/cm3" value="1.e-20"/>
-            <fraction n="0.7" ref="Nitrogen"/>
-            <fraction n="0.3" ref="Oxygen"/>
-        </material>
-        <!-- }}} -->
-
-        <!-- {{{ Water -->
-        <element Z="1" formula="H" name="Hydrogen">
-            <atom value="2" />
-        </element>
-
-        <element Z="8" formula="O" name="Oxygen">
-            <atom value="16" />
-        </element>
-
-        <material name="Water" formula="H2O">
-            <D value="1.0" />
-            <composite n="2" ref="Hydrogen" />
-            <composite n="1" ref="Oxygen" />
-        </material>
-        <!-- }}} -->
-
-        <!-- {{{ Lead -->
-        <isotope N="204" Z="82" name="Pb204">
-            <atom unit="g/mole" value="203.973"/>
-        </isotope>
-        <isotope N="206" Z="82" name="Pb206">
-            <atom unit="g/mole" value="205.974"/>
-        </isotope>
-        <isotope N="207" Z="82" name="Pb207">
-            <atom unit="g/mole" value="206.976"/>
-        </isotope>
-        <isotope N="208" Z="82" name="Pb208">
-            <atom unit="g/mole" value="207.977"/>
-        </isotope>
-        <element name="Pb">
-            <fraction n="0.014" ref="Pb204"/>
-            <fraction n="0.241" ref="Pb206"/>
-            <fraction n="0.221" ref="Pb207"/>
-            <fraction n="0.524" ref="Pb208"/>
-        </element>
-        <material name="Lead" state="solid">
-            <MEE unit="eV" value="823"/>
-            <D unit="g/cm3" value="11.34"/>
-            <fraction n="1" ref="Pb"/>
-        </material>
-        <!-- }}} -->
-
-        <!-- {{{ Kapton -->
-        <material name="Kapton" state="solid">
-            <MEE unit="eV" value="79.6"/>
-            <D unit="g/cm3" value="1.42"/>
-            <fraction n="0.026362" ref="Hydrogen"/>
-            <fraction n="0.691133" ref="Carbon"/>
-            <fraction n="0.073270" ref="Nitrogen"/>
-            <fraction n="0.209235" ref="Oxygen"/>
-        </material>
-        <!-- }}} -->
-	<!--  {{{ Rubber-Neoprene -->
-	<material name="Neoprene" state="solid">
-	<D unit="g/cm3" value="1.23"/>
-          <MEE unit="eV" value="93.000000"/>
-	<fraction n="0.542646" ref="Carbon"/>
-	<fraction n="0.056920" ref="Hydrogen"/>
-	<fraction n="0.400434" ref="Chlorine"/>
-	
-	</material>
-	<!--  }}}  -->
-
-        <!-- {{{ Teflon (PTFE) -->
-        <material name="PTFE" state="solid">
-            <MEE unit="eV" value="105.35244885659"/>
-            <D unit="g/cm3" value="2.2"/>
-            <fraction n="0.240151969606079" ref="Carbon"/>
-            <fraction n="0.759848030393921" ref="Fluor"/>
-        </material>
-        <!-- }}} -->
-
-       <!-- {{{ Polyethylene -->
-    	<material name="PE" state="solid">
-            <MEE unit="eV" value="57.4000000"/>
-            <D unit="g/cm3" value="0.940"/>
-            <fraction n="0.143711" ref="Hydrogen"/>
-            <fraction n="0.856289" ref="Carbon"/>
-     	</material>
-    	<!-- }}} -->
-
-        <!-- {{{ Mylar -->
-        <material name="Mylar" state="solid">
-            <MEE unit="eV" value="78.700000"/>
-            <D unit="g/cm3" value="2.2"/>
-            <fraction n="0.041959" ref="Hydrogen"/>
-            <fraction n="0.625017" ref="Fluor"/>
-            <fraction n="0.333025" ref="Oxygen"/>
-        </material>
-        <!-- }}} -->
-
-        <!-- {{{ Plasctic scintillator -->
-        <material name="BC408" state="solid">
-            <MEE unit="eV" value="64.700000"/>
-            <D unit="g/cm3" value="1.03"/>
-            <fraction n="0.085000" ref="Hydrogen"/>
-            <fraction n="0.915000" ref="Carbon"/>
-        </material>
-        <!-- }}} -->
-	
-	<!-- {{{ Acrylic -->
-         <material name="Acrylic" state="solid">
-             <MEE unit="eV" value="0.00000"/><!-- this is not a correct figure -->
-             <D unit="g/cm3" value="1.18"/>
-             <fraction n="0.080000" ref="Hydrogen"/>
-             <fraction n="0.600000" ref="Carbon"/>
-             <fraction n="0.320000" ref="Oxygen"/>
-         </material>
-         <!-- }}} -->
-	<!-- {{{ Silicone (Polydimethylsiloxane) -->
-    	<material name="PDMS" state="solid">
-             <D unit="g/cm3" value="0.965"/>
-             <fraction n="0.081555" ref="Hydrogen"/>
-             <fraction n="0.323940" ref="Carbon"/>
-             <fraction n="0.215759" ref="Oxygen"/>
-             <fraction n="0.378746" ref="Silicon"/>
-     	</material>
-    	<!-- }}} -->
-      
-
-    </materials>
diff --git a/examples/07.FullChainDecay/geometry/setup.gdml b/examples/07.FullChainDecay/geometry/setup.gdml
index 13a299d4..1cf13bc5 100644
--- a/examples/07.FullChainDecay/geometry/setup.gdml
+++ b/examples/07.FullChainDecay/geometry/setup.gdml
@@ -3,7 +3,7 @@
 
 <!DOCTYPE gdml [
         <!ENTITY geometry SYSTEM "geometry.gdml">
-        <!ENTITY materials SYSTEM "rest.xml">
+        <!ENTITY materials SYSTEM "https://rest-for-physics.github.io/materials/rest.xml">
         ]>
 
 <gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/examples/08.Alphas/geometry/rest.xml b/examples/08.Alphas/geometry/rest.xml
deleted file mode 100644
index 40a41977..00000000
--- a/examples/08.Alphas/geometry/rest.xml
+++ /dev/null
@@ -1,400 +0,0 @@
-<!-- ##VERSION REST materials 1.4## -->
-<!-- densities in mg/cm3 @ 293.15K -->
-    <materials>
-        <!-- {{{ Elements definition -->
-        <element name="Hydrogen" formula="H" Z="1">
-            <atom value="1.00794" />
-        </element>
-       
-	<element name="Helium" formula="N" Z="2">
-	    <atom value="4.0026" />
-	</element>
-
-        <element name="Carbon" formula="C" Z="6">
-            <atom value="12.0107" />
-        </element>
-        <element name="Nitrogen" formula="N" Z="7">
-            <atom value="14.0067" />
-        </element>
-        <element name="Fluor" formula="F" Z="9">
-            <atom value="18.9984" />
-        </element>
-        <element name="Silicon" formula="Si" Z="14" state="solid">
-            <atom value="28.0855" />
-        </element>
-        <element name="Chromium" formula="Cr" Z="24" state="solid">
-            <atom value="51.996" />
-        </element>
-        <element name="Manganese" formula="Mn" Z="25">
-            <atom value="54.938045" />
-        </element>
-        <element name="Iron" formula="Fe" Z="26" state="solid">
-            <atom value="55.845" />
-        </element>
-        <element name="Nickel" formula="Ni" Z="28" state="solid">
-            <atom value="58.6934" />
-        </element>
-        <element name="Aluminium" formula="Al" Z="13" state="solid">
-            <atom value="26.982" />
-        </element>
-        <element name="Xenon" formula="Xe" Z="54" state="gas">
-            <atom value="131.293" />
-        </element>
-        <element name="Argon" formula="Ar" Z="18" state="gas">
-            <atom value="39.948" />
-        </element>
-        <element name="Neon" formula="Ne" Z="10" state="gas">
-         <atom value="20.1797" />
-        </element>
-        <element name="Zinc" formula="Zn" Z="30">
-	<atom value="65.4094"/>
-        </element>
-	<element name="Magnesium" formula="Mg" Z="12">
-	<atom value="24.3050"/>
-	</element>
-	<element name="Sulfur" formula="S" Z="16">
-	<atom value="32.0655"/>
-	</element>
-          <element name="Chlorine" formula="Cl" Z="17">
-	<atom value="35.4532"/>
-	</element>
-        <element name="Iodide" formula="I" Z="53">
-	<atom value="126.9"/>
-	</element>
-      
-
-        
-       
-        <!-- }}} -->
-
-        <!-- {{{ Quenchers -->
-        <material name="TMA" state="gas">
-            <D unit="mg/cm3" value="quencherDensity" />
-            <T unit="K" value="gasTemperature" />
-            <P unit="bar" value="gasPressure" />
-            <composite n="3" ref="Carbon" />
-            <composite n="9" ref="Hydrogen" />
-            <composite n="1" ref="Nitrogen" />
-        </material>
-
-        <material name="isobutane" state="gas">
-            <D unit="mg/cm3" value="quencherDensity" />
-            <T unit="K" value="gasTemperature" />
-            <P unit="bar" value="gasPressure" />
-            <composite n="4" ref="Carbon" />
-            <composite n="10" ref="Hydrogen" />
-        </material>
-        <!-- }}} -->
-
-        <!-- {{{ Gas mixtures -->
-        <material name="PureHelium" state="gas">
-	    <T unit="K" value="gasTemperature"/>
-	    <P unit="bar" value="gasPressure"/>
-	    <MEE unit="eV" value="188"/>
-            <D unit="mg/cm3" value="targetGasDensity"/>
-	    <fraction n="1" ref="Helium"/>
-	</material>
-
-        <material name="PureXenon" state="gas">
-            <T unit="K" value="gasTemperature"/>
-            <P unit="bar" value="gasPressure"/>
-            <MEE unit="eV" value="482"/>
-            <D unit="mg/cm3" value="targetGasDensity"/>
-            <fraction n="1" ref="Xenon"/>
-        </material>
-
-        <material name="Xenon_TMA" state="gas">
-            <D unit="mg/cm3" value="targetGasDensity+quencherDensity" />
-            <P unit="bar" value="gasPressure" />
-            <T unit="K" value="gasTemperature" />
-            <fraction n="quencherFraction" ref="TMA" />
-            <fraction n="1-quencherFraction" ref="Xenon" />
-        </material>
-
-        <material name="Xenon_ISO" state="gas">
-            <D unit="mg/cm3" value="targetGasDensity+quencherDensity" />
-            <P unit="bar" value="gasPressure" />
-            <T unit="K" value="gasTemperature" />
-            <fraction n="quencherFraction" ref="isobutane" />
-            <fraction n="1-quencherFraction" ref="Xenon" />
-        </material>
-
-        <material name="PureArgon" state="gas">
-            <T unit="K" value="gasTemperature"/>
-            <P unit="bar" value="gasPressure"/>
-            <MEE unit="eV" value="188"/>
-            <D unit="mg/cm3" value="targetGasDensity"/>
-            <fraction n="1" ref="Argon"/>
-        </material>
-
-        <material name="Ar_ISO" state="gas">
-            <D unit="mg/cm3" value="targetGasDensity+quencherDensity" />
-            <P unit="bar" value="gasPressure" />
-            <T unit="K" value="gasTemperature" />
-            <fraction n="quencherFraction" ref="isobutane" />
-            <fraction n="1-quencherFraction" ref="Argon" />
-        </material>
-
-        <material name="Neon_ISO" state="gas">
-            <D unit="mg/cm3" value="targetGasDensity+quencherDensity" />
-            <P unit="bar" value="gasPressure" />
-            <T unit="K" value="gasTemperature" />
-            <fraction n="quencherFraction" ref="isobutane" />
-            <fraction n="1-quencherFraction" ref="Neon" />
-        </material>
-
-        <!-- }}} -->
-
-        <!-- {{{ Copper -->
-        <isotope N="63" Z="29" name="Cu63">
-            <atom unit="g/mole" value="62.9296"/>
-        </isotope>
-        <isotope N="65" Z="29" name="Cu65">
-            <atom unit="g/mole" value="64.9278"/>
-        </isotope>
-        <element name="Cu">
-            <fraction n="0.6917" ref="Cu63"/>
-            <fraction n="0.3083" ref="Cu65"/>
-        </element>
-        <material name="Copper" state="solid">
-            <MEE unit="eV" value="322"/>
-            <D unit="g/cm3" value="8.96"/>
-            <fraction n="1" ref="Cu"/>
-        </material>
-        <!-- }}} -->
-
-      <!-- {{{ Aluminium -->
-        <isotope N="27" Z="13" name="Al27">
-        <atom unit="g/mole" value="26.982"/>
-          </isotope>
-        <element name="Al">
-        <fraction n="1.0000" ref="Al27"/>
-        </element>
-        <material name="Aluminium" state="solid">
-         <MEE unit="eV" value="166"/>
-        <D unit="g/cm3" value="2.70"/>
-        <fraction n="1" ref="Al"/>
-         </material>
-    <!-- }}} -->   
-
- 	<!-- {{{ Cadmium-->
-        <isotope N="106" Z="48" name="Cd106">
-        <atom unit="g/mole" value="105.91"/>
-          </isotope>
-	<isotope N="108" Z="48" name="Cd108">
-        <atom unit="g/mole" value="107.90"/>
-          </isotope>
-	<isotope N="110" Z="48" name="Cd110">
-        <atom unit="g/mole" value="109.90"/>
-          </isotope>
-	<isotope N="111" Z="48" name="Cd111">
-        <atom unit="g/mole" value="110.90"/>
-          </isotope>
-	<isotope N="112" Z="48" name="Cd112">
-        <atom unit="g/mole" value="111.90"/>
-          </isotope>
-	<isotope N="113" Z="48" name="Cd113">
-        <atom unit="g/mole" value="112.90"/>
-          </isotope>
-	<isotope N="114" Z="48" name="Cd114">
-        <atom unit="g/mole" value="113.90"/>
-          </isotope>
-	<isotope N="116" Z="48" name="Cd116">
-        <atom unit="g/mole" value="115.90"/>
-          </isotope>
-        <element name="Cd">
-        <fraction n="0.0125" ref="Cd106"/>
-	 <fraction n="0.0089" ref="Cd108"/>
-	 <fraction n="0.1249" ref="Cd110"/>
-	 <fraction n="0.1280" ref="Cd111"/>
-	 <fraction n="0.2413" ref="Cd112"/>
-	<fraction n="0.1222" ref="Cd113"/>
-	 <fraction n="0.2873" ref="Cd114"/>
-	 <fraction n="0.0749" ref="Cd116"/>
-        </element>
-        <material name="Cadmium" state="solid">
-         <MEE unit="eV" value="469.0"/>
-        <D unit="g/cm3" value="8.65"/>
- 	 <fraction n="1" ref="Cd"/>
-         </material>
-   	 <!-- }}} -->   
-
-                                      
-        <!-- {{{ Stainlesssteel -->
-        <material name="Stainlesssteel" state="solid">
-            <MEE unit="eV" value="280.927567486627"/>
-            <D unit="g/cm3" value="8.02"/>
-            <fraction n="0.02" ref="Manganese"/>
-            <fraction n="0.01" ref="Silicon"/>
-            <fraction n="0.19" ref="Chromium"/>
-            <fraction n="0.1" ref="Nickel"/>
-            <fraction n="0.68" ref="Iron"/>
-        </material>
-        <!-- }}} -->
-
-        <!-- {{{ Air -->
-        <isotope N="14" Z="7" name="N14">
-            <atom unit="g/mole" value="14.0031"/>
-        </isotope>
-        <isotope N="15" Z="7" name="N15">
-            <atom unit="g/mole" value="15.0001"/>
-        </isotope>
-        <element name="Nitrogen">
-            <fraction n="0.99632" ref="N14"/>
-            <fraction n="0.00368" ref="N15"/>
-        </element>
-
-        <isotope N="16" Z="8" name="O16">
-            <atom unit="g/mole" value="15.9949"/>
-        </isotope>
-        <isotope N="17" Z="8" name="O17">
-            <atom unit="g/mole" value="16.9991"/>
-        </isotope>
-        <isotope N="18" Z="8" name="O18">
-            <atom unit="g/mole" value="17.9992"/>
-        </isotope>
-        <element name="Oxygen">
-            <fraction n="0.99757" ref="O16"/>
-            <fraction n="0.00038" ref="O17"/>
-            <fraction n="0.00205" ref="O18"/>
-        </element>
-        <material name="Air" state="gas">
-            <T unit="K" value="293.13"/>
-            <MEE unit="eV" value="85.7030667332999"/>
-            <D unit="g/cm3" value="0.00129"/>
-            <fraction n="0.7" ref="Nitrogen"/>
-            <fraction n="0.3" ref="Oxygen"/>
-        </material>
-        <!-- }}} -->
-
-        <!-- {{{ Vacuum -->
-        <material name="Vacuum" state="gas">
-            <T unit="K" value="293.13"/>
-            <MEE unit="eV" value="85.7030667332999"/>
-            <D unit="g/cm3" value="1.e-20"/>
-            <fraction n="0.7" ref="Nitrogen"/>
-            <fraction n="0.3" ref="Oxygen"/>
-        </material>
-        <!-- }}} -->
-
-        <!-- {{{ Water -->
-        <element Z="1" formula="H" name="Hydrogen">
-            <atom value="2" />
-        </element>
-
-        <element Z="8" formula="O" name="Oxygen">
-            <atom value="16" />
-        </element>
-
-        <material name="Water" formula="H2O">
-            <D value="1.0" />
-            <composite n="2" ref="Hydrogen" />
-            <composite n="1" ref="Oxygen" />
-        </material>
-        <!-- }}} -->
-
-        <!-- {{{ Lead -->
-        <isotope N="204" Z="82" name="Pb204">
-            <atom unit="g/mole" value="203.973"/>
-        </isotope>
-        <isotope N="206" Z="82" name="Pb206">
-            <atom unit="g/mole" value="205.974"/>
-        </isotope>
-        <isotope N="207" Z="82" name="Pb207">
-            <atom unit="g/mole" value="206.976"/>
-        </isotope>
-        <isotope N="208" Z="82" name="Pb208">
-            <atom unit="g/mole" value="207.977"/>
-        </isotope>
-        <element name="Pb">
-            <fraction n="0.014" ref="Pb204"/>
-            <fraction n="0.241" ref="Pb206"/>
-            <fraction n="0.221" ref="Pb207"/>
-            <fraction n="0.524" ref="Pb208"/>
-        </element>
-        <material name="Lead" state="solid">
-            <MEE unit="eV" value="823"/>
-            <D unit="g/cm3" value="11.34"/>
-            <fraction n="1" ref="Pb"/>
-        </material>
-        <!-- }}} -->
-
-        <!-- {{{ Kapton -->
-        <material name="Kapton" state="solid">
-            <MEE unit="eV" value="79.6"/>
-            <D unit="g/cm3" value="1.42"/>
-            <fraction n="0.026362" ref="Hydrogen"/>
-            <fraction n="0.691133" ref="Carbon"/>
-            <fraction n="0.073270" ref="Nitrogen"/>
-            <fraction n="0.209235" ref="Oxygen"/>
-        </material>
-        <!-- }}} -->
-	<!--  {{{ Rubber-Neoprene -->
-	<material name="Neoprene" state="solid">
-	<D unit="g/cm3" value="1.23"/>
-          <MEE unit="eV" value="93.000000"/>
-	<fraction n="0.542646" ref="Carbon"/>
-	<fraction n="0.056920" ref="Hydrogen"/>
-	<fraction n="0.400434" ref="Chlorine"/>
-	
-	</material>
-	<!--  }}}  -->
-
-        <!-- {{{ Teflon (PTFE) -->
-        <material name="PTFE" state="solid">
-            <MEE unit="eV" value="105.35244885659"/>
-            <D unit="g/cm3" value="2.2"/>
-            <fraction n="0.240151969606079" ref="Carbon"/>
-            <fraction n="0.759848030393921" ref="Fluor"/>
-        </material>
-        <!-- }}} -->
-
-       <!-- {{{ Polyethylene -->
-    	<material name="PE" state="solid">
-            <MEE unit="eV" value="57.4000000"/>
-            <D unit="g/cm3" value="0.940"/>
-            <fraction n="0.143711" ref="Hydrogen"/>
-            <fraction n="0.856289" ref="Carbon"/>
-     	</material>
-    	<!-- }}} -->
-
-        <!-- {{{ Mylar -->
-        <material name="Mylar" state="solid">
-            <MEE unit="eV" value="78.700000"/>
-            <D unit="g/cm3" value="2.2"/>
-            <fraction n="0.041959" ref="Hydrogen"/>
-            <fraction n="0.625017" ref="Fluor"/>
-            <fraction n="0.333025" ref="Oxygen"/>
-        </material>
-        <!-- }}} -->
-
-        <!-- {{{ Plasctic scintillator -->
-        <material name="BC408" state="solid">
-            <MEE unit="eV" value="64.700000"/>
-            <D unit="g/cm3" value="1.03"/>
-            <fraction n="0.085000" ref="Hydrogen"/>
-            <fraction n="0.915000" ref="Carbon"/>
-        </material>
-        <!-- }}} -->
-	
-	<!-- {{{ Acrylic -->
-         <material name="Acrylic" state="solid">
-             <MEE unit="eV" value="0.00000"/><!-- this is not a correct figure -->
-             <D unit="g/cm3" value="1.18"/>
-             <fraction n="0.080000" ref="Hydrogen"/>
-             <fraction n="0.600000" ref="Carbon"/>
-             <fraction n="0.320000" ref="Oxygen"/>
-         </material>
-         <!-- }}} -->
-	<!-- {{{ Silicone (Polydimethylsiloxane) -->
-    	<material name="PDMS" state="solid">
-             <D unit="g/cm3" value="0.965"/>
-             <fraction n="0.081555" ref="Hydrogen"/>
-             <fraction n="0.323940" ref="Carbon"/>
-             <fraction n="0.215759" ref="Oxygen"/>
-             <fraction n="0.378746" ref="Silicon"/>
-     	</material>
-    	<!-- }}} -->
-      
-
-    </materials>
diff --git a/examples/10.Geometries/geometry/assemblyDepthOne/setup.gdml b/examples/10.Geometries/geometry/assemblyDepthOne/setup.gdml
index 6b8b581e..3ce27eaa 100644
--- a/examples/10.Geometries/geometry/assemblyDepthOne/setup.gdml
+++ b/examples/10.Geometries/geometry/assemblyDepthOne/setup.gdml
@@ -3,7 +3,7 @@
 
 <!DOCTYPE gdml [
         <!ENTITY geometry SYSTEM "geometry.gdml">
-        <!ENTITY materials SYSTEM "https://sultan.unizar.es/materials/materials.xml">
+        <!ENTITY materials SYSTEM "https://rest-for-physics.github.io/materials/rest.xml">
         ]>
 
 <gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/examples/10.Geometries/geometry/noAssembly/setup.gdml b/examples/10.Geometries/geometry/noAssembly/setup.gdml
index 6b8b581e..3ce27eaa 100644
--- a/examples/10.Geometries/geometry/noAssembly/setup.gdml
+++ b/examples/10.Geometries/geometry/noAssembly/setup.gdml
@@ -3,7 +3,7 @@
 
 <!DOCTYPE gdml [
         <!ENTITY geometry SYSTEM "geometry.gdml">
-        <!ENTITY materials SYSTEM "https://sultan.unizar.es/materials/materials.xml">
+        <!ENTITY materials SYSTEM "https://rest-for-physics.github.io/materials/rest.xml">
         ]>
 
 <gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/test/src/examples.cxx b/test/src/examples.cxx
index 2aa2077e..3f39b31b 100644
--- a/test/src/examples.cxx
+++ b/test/src/examples.cxx
@@ -28,7 +28,7 @@ TEST(restG4, Example_01_NLDBD) {
     fs::current_path(thisExamplePath);
 
     CommandLineOptions::Options options;
-    options.rmlFile = "NLDBD2.rml";
+    options.rmlFile = "NLDBD.rml";
     options.outputFile = thisExamplePath / "NLDBD_simulation.root";  // TODO: fix not working with local path
 
     {  // Run simulation

From af3c5ba094bec9e220b856c371ac626b7fdd6989 Mon Sep 17 00:00:00 2001
From: Luis Obis <luis.antonio.obis@gmail.com>
Date: Tue, 4 Oct 2022 19:11:15 +0200
Subject: [PATCH 41/42] remove redundant files

---
 examples/01.NLDBD/NLDBD2.rml                | 80 ---------------------
 examples/04.MuonScan/geometry/geometry.gdml | 43 -----------
 examples/04.MuonScan/geometry/setup.gdml    | 36 ----------
 3 files changed, 159 deletions(-)
 delete mode 100644 examples/01.NLDBD/NLDBD2.rml
 delete mode 100644 examples/04.MuonScan/geometry/geometry.gdml
 delete mode 100644 examples/04.MuonScan/geometry/setup.gdml

diff --git a/examples/01.NLDBD/NLDBD2.rml b/examples/01.NLDBD/NLDBD2.rml
deleted file mode 100644
index abaedc3a..00000000
--- a/examples/01.NLDBD/NLDBD2.rml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Constructing XML-like REST metadata input file
-     File : config.rml
-     First concept author J. Galan (26-Apr-2015)
- -->
-<!-- 
-By default REST units are mm, keV and degrees
--->
-<restG4>
-    <globals>
-        <parameter name="mainDataPath" value=""/>
-        <parameter name="verboseLevel" value="essential"/>
-    </globals>
-    <TRestRun name="Run metadata" title="REST Metadata run info (template)"><parameter name="experimentName" value="Test"/><parameter name="runType" value="simulation"/>
-
-        // Value "auto" can add simulation run into database ???
-        <parameter name="runNumber" value="1"/>
-
-        // If no runTag is given in a restG4 simulation. The title of TRestGeant4Metadata will be used
-        <parameter name="runTag" value="NLDBD"/>
-
-        // The output filename can be built using any member from TRestRun, fRunNumber, fRunTag, ..., etc.
-        <parameter name="outputFile" value="Run[fRunNumber]_[fRunTag]_[fExperimentName].root"/>
-
-        <parameter name="runDescription" value="We launch just 100 events to check everything is ok."/>
-        <parameter name="user" value="${USER}"/>
-        <parameter name="verboseLevel" value="3"/>
-        <parameter name="overwrite" value="off"/>
-        <parameter name="readOnly" value="false"/>
-    </TRestRun>
-    <TRestGeant4Metadata name="DBDsimulation" title="NLDBD"><parameter name="gdmlFile" value="geometry/mySetupTemplate2.gdml"/><parameter name="subEventTimeDelay" value="100" units="us"/><parameter name="seed" value="17021981"/><!-- The number of events to be simulated is now defined in TRestGeant4Metadata --><parameter name="nEvents" value="100"/>
-
-        ///three types of source definition supported:
-        <generator type="volume" from="gas">
-            ///1. generator file
-            <source use="Xe136bb0n.dat"/>
-
-            ///2. decay0 package
-            <!--<source use="decay0" particle="Xe136" decayMode="0vbb" daughterLevel="3" />-->
-
-            ///3. geant4 internal
-            <!--<source use="geant4" particle="Na22" excitedLevel="0.0" fullChain="on">
-              <angular type="isotropic" />
-              <energy type="mono" energy="0.0" units="MeV" />
-            </source>-->
-        </generator>
-
-        <biasing value="off" type="virtualBox"><biasingVolume size="2850mm" position="(0,0,0)mm" factor="2" energyRange="(0,5)MeV"/><biasingVolume size="2450mm" position="(0,0,0)mm" factor="2" energyRange="(0,5)MeV"/><biasingVolume size="2050mm" position="(0,0,0)mm" factor="2" energyRange="(0,5)MeV"/></biasing>
-
-        <detector><parameter name="energyRange" value="(0,5)" units="MeV"/><parameter name="activateAllVolumes" value="false"/><volume name="gas" sensitive="true" maxStepSize="1mm"/></detector>
-
-    </TRestGeant4Metadata>
-    <TRestGeant4PhysicsLists name="default" title="First physics list implementation.">
-        <parameter name="cutForGamma" value="1" units="mm"/>
-        <parameter name="cutForElectron" value="2" units="mm"/>
-        <parameter name="cutForPositron" value="1" units="mm"/>
-        <parameter name="cutForMuon" value="1" units="mm"/>
-        <parameter name="cutForNeutron" value="1" units="mm"/>
-        <parameter name="minEnergyRangeProductionCuts" value="1" units="keV"/>
-        <parameter name="maxEnergyRangeProductionCuts" value="1" units="GeV"/>
-        <!-- EM Physics lists -->
-        <physicsList name="G4EmLivermorePhysics">
-            <!-- "G4EmPenelopePhysics", "G4EmStandardPhysics_option3" -->
-            <option name="pixe" value="true"/>
-        </physicsList>
-        <!-- Decay physics lists -->
-        <physicsList name="G4DecayPhysics"/>
-        <physicsList name="G4RadioactiveDecayPhysics"/>
-        <physicsList name="G4RadioactiveDecay">
-            <option name="ICM" value="true"/>
-            <option name="ARM" value="true"/>
-        </physicsList>
-        <!-- Hadron physics lists -->
-        <physicsList name="G4HadronElasticPhysicsHP"/>
-        <physicsList name="G4IonBinaryCascadePhysics"/>
-        <physicsList name="G4HadronPhysicsQGSP_BIC_HP"/>
-        <physicsList name="G4NeutronTrackingCut"/>
-        <physicsList name="G4EmExtraPhysics"/>
-    </TRestGeant4PhysicsLists>
-</restG4>
diff --git a/examples/04.MuonScan/geometry/geometry.gdml b/examples/04.MuonScan/geometry/geometry.gdml
deleted file mode 100644
index 85597d75..00000000
--- a/examples/04.MuonScan/geometry/geometry.gdml
+++ /dev/null
@@ -1,43 +0,0 @@
-<solids>
-    <box name="WorldSolid" x="world_size" y="world_size" z="world_size" lunit="mm"/>
-    <box name="layer" x="500" y="500" z="50" lunit="mm"/>
-    <sphere name="esfera" rmin="0" rmax="5" deltaphi="360" deltatheta="180" aunit="deg" lunit="mm"/>
-</solids>
-
-<structure>
-<volume name="topLayerVolume">
-    <materialref ref="Ar_ISO"/>
-    <solidref ref="layer"/>
-</volume>
-
-<volume name="bottomLayerVolume">
-    <materialref ref="Ar_ISO"/>
-    <solidref ref="layer"/>
-</volume>
-
-<volume name="EsferaVolume">
-    <materialref ref="Lead"/>
-    <solidref ref="esfera"/>
-</volume>
-
-<volume name="World">
-    <materialref ref="Air"/>
-    <solidref ref="WorldSolid"/>
-
-    <physvol name="det_up_01">
-        <volumeref ref="topLayerVolume"/>
-        <position name="upPosition" unit="mm" x="0" y="0" z="300"/>
-    </physvol>
-
-    <physvol name="det_dw_01">
-        <volumeref ref="bottomLayerVolume"/>
-        <position name="downPosition" unit="mm" x="0" y="0" z="-300"/>
-    </physvol>
-
-    <physvol name="target">
-        <volumeref ref="EsferaVolume"/>
-        <position name="targetPosition" unit="mm" x="0" y="0" z="0"/>
-    </physvol>
-
-</volume>
-</structure>
diff --git a/examples/04.MuonScan/geometry/setup.gdml b/examples/04.MuonScan/geometry/setup.gdml
deleted file mode 100644
index 005a7d7c..00000000
--- a/examples/04.MuonScan/geometry/setup.gdml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no" ?>
-<!-- ##VERSION Cosmic Bench Version 1.1 (Ar_ISO - 1 bar - Quencher: 0.01 )## -->
-
-<!DOCTYPE gdml [
-        <!ENTITY geometry SYSTEM "geometry.gdml">
-        <!ENTITY materials SYSTEM "https://rest-for-physics.github.io/materials/rest.xml">
-        ]>
-
-<gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:noNamespaceSchemaLocation="http://service-spi.web.cern.ch/service-spi/app/releases/GDML/schema/gdml.xsd">
-
-    <!-- All values should be in mm -->
-
-    <define>
-        <constant name="world_size" value="20000"/>
-
-        <!-- We must define these variables that are hardcoded in materials.xml -->
-        <!-- They have no use in this example since we do not use a gas mixture in our simulation -->
-        <!-- This makes non sense, and it could be solved if we would have a dedicated materials file for gas mixtures -->
-        <variable name="targetGasDensity" value="1*0.9"/>  <!-- mg/cm3 -->
-        <variable name="quencherDensity" value="1*0.05"/> <!-- mg/cm3 -->
-        <variable name="quencherFraction" value="0.01"/>
-        <variable name="gasTemperature" value="300"/> <!-- K -->
-        <variable name="gasPressure" value="1"/> <!-- bar -->
-    </define>
-
-    &materials;
-
-    &geometry;
-
-
-    <setup name="Default" version="1.0">
-        <world ref="World"/>
-    </setup>
-
-</gdml>

From 050f67807c99de1e44bcf3dbceba3dc0b48fbfe6 Mon Sep 17 00:00:00 2001
From: Luis Obis <luis.antonio.obis@gmail.com>
Date: Tue, 4 Oct 2022 19:21:30 +0200
Subject: [PATCH 42/42] attempt to fix sed pipeline

---
 .github/workflows/validation.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml
index 78554358..51573f1d 100644
--- a/.github/workflows/validation.yml
+++ b/.github/workflows/validation.yml
@@ -450,7 +450,13 @@ jobs:
           find . -name "*.gdml"
       - name: Use old materials for reference Geant4 version
         run: |
+          cd ${{ env.REST_PATH }}
+          pwd
+          cat ${{ env.REST_PATH }}/examples/restG4/01.NLDBD/geometry/mySetupTemplate.gdml
           find . -name "*.gdml" | xargs sed -i 's/https:\/\/rest-for-physics.github.io\/materials\/rest.xml/https:\/\/rest-for-physics.github.io\/materials\/legacy\/v1.4\/rest.xml/g'
+          cat ${{ env.REST_PATH }}/examples/restG4/01.NLDBD/geometry/mySetupTemplate.gdml
+          sed -i 's/https:\/\/rest-for-physics.github.io\/materials\/rest.xml/https:\/\/rest-for-physics.github.io\/materials\/legacy\/v1.4\/rest.xml/g' ${{ env.REST_PATH }}/examples/restG4/01.NLDBD/geometry/mySetupTemplate.gdml           
+          cat ${{ env.REST_PATH }}/examples/restG4/01.NLDBD/geometry/mySetupTemplate.gdml
       - name: Test after
         run: |
           cat ${{ env.REST_PATH }}/examples/restG4/01.NLDBD/geometry/mySetupTemplate.gdml