From febbdd62bf6e234454bb0fd01ebeb0f0e8652bde Mon Sep 17 00:00:00 2001
From: Daniel Jeans <daniel.jeans@kek.jp>
Date: Fri, 20 Sep 2024 10:14:46 +0900
Subject: [PATCH 1/5] fix definition of G4_Au

---
 ILD/compact/ILD_common_v02/materials.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ILD/compact/ILD_common_v02/materials.xml b/ILD/compact/ILD_common_v02/materials.xml
index 792f49a0f..80736b770 100644
--- a/ILD/compact/ILD_common_v02/materials.xml
+++ b/ILD/compact/ILD_common_v02/materials.xml
@@ -434,6 +434,7 @@
       <MEE unit="eV" value="790"/>
       <D unit="g/cm3" value="19.32"/>
       <atom unit="g/mole" value="196.967"/>
+      <fraction n="1" ref="Au"/>
     </material>
     <material name="G4_POLYETHYLENE" state="solid">
       <MEE unit="eV" value="57.4"/>

From 0b1361c06cf2911ca08d2d2bdc07a8466e45c839 Mon Sep 17 00:00:00 2001
From: Daniel Jeans <daniel.jeans@kek.jp>
Date: Fri, 20 Sep 2024 14:28:50 +0900
Subject: [PATCH 2/5] adjust some material definitions to remove warnings (sum
 of fractions != 1.0)

---
 ILD/compact/ILD_common_v02/materials.xml | 62 ++++++++++++++++--------
 1 file changed, 42 insertions(+), 20 deletions(-)

diff --git a/ILD/compact/ILD_common_v02/materials.xml b/ILD/compact/ILD_common_v02/materials.xml
index 80736b770..490af2856 100644
--- a/ILD/compact/ILD_common_v02/materials.xml
+++ b/ILD/compact/ILD_common_v02/materials.xml
@@ -472,19 +472,37 @@
       <composite n="5" ref="O" />
     </material>
 
-    <comment> materials for the SemiDigital Hadronic calorimeter</comment>
-    <material name="RPCGAS2" >
-    <!-- C2H2F4 (TFE) 0.93% + IsoButane 0.05% + SF6 0.02% -->
-    <!--  <D value="0.00421" unit="g/cm3" /> -->
-      <D value="0.00449" unit="g/cm3" />
-      <fraction n="0.70828" ref="F"/>
-      <fraction n="0.26054" ref="C"/>
-      <fraction n="0.01928" ref="H"/>
-      <fraction n="0.00439" ref="S"/>
+
+   <comment> materials for the SemiDigital Hadronic calorimeter</comment>
+
+   <material name="R134a">
+     <!-- R134a is C2H2F4 -->
+     <D value="0.00425" unit="g/cm3" />
+     <composite n="2" ref="C"/>
+     <composite n="2" ref="H"/>
+     <composite n="4" ref="F"/>
+   </material>
+
+   <material name="IsoButane">
+     <D value="0.002489" unit="g/cm3" />
+     <composite n="4" ref="C"/>
+     <composite n="10" ref="H"/>
+   </material>
+   
+   <material name="SulphurHexafluoride">
+     <D value="0.00617" unit="g/cm3" />
+     <composite n="1" ref="S"/>
+     <composite n="6" ref="F"/>
+   </material>
+
+   <material name="RPCGAS2" >
+     <D value="0.00449" unit="g/cm3" />
+     <fraction n="0.93" ref="R134a"/>
+     <fraction n="0.05" ref="IsoButane"/>
+     <fraction n="0.02" ref="SulphurHexafluoride"/>
     </material>
 
     <material name="FloatGlass" >
-<!--      <D value="2.44" unit="g/cm3" /> -->
       <D value="2.49" unit="g/cm3" />
       <fraction n="0.46645" ref="O"/>
       <fraction n="0.34125" ref="Si"/>
@@ -510,22 +528,26 @@
       <fraction n="0.141389" ref="O"/>
     </material>
 
+    <material name="PEEK" >
+      <D value="1.32" unit="g/cm3" />
+      <composite n="19" ref="C"/>
+      <composite n="12" ref="H"/>
+      <composite n="3" ref="O"/>
+    </material>
+
     <material name="PEEK-GF30" >
       <D value="1.51" unit="g/cm3" />
-      <fraction n="0.554056" ref="C"/>
-      <fraction n="0.116535" ref="O"/>
-      <fraction n="0.029408" ref="H"/>
-      <fraction n="0.333333" ref="Si"/>
+      <fraction n="0.70" ref="PEEK"/>
+      <fraction n="0.30" ref="FloatGlass"/>
     </material>
 
     <material name="g10-RPC">
-<!--      <MEE unit="eV" value="114.378463512112"/> -->
       <D value="1.80" unit="g/cm3" />
-      <fraction n="0.07868" ref="C"/>
-      <fraction n="0.46056" ref="O"/>
-      <fraction n="0.02045" ref="H"/>
-      <fraction n="0.46056" ref="Si"/>
-      <fraction n="0.080"   ref="Cl"/>
+      <fraction n="0.0786" ref="C"/>
+      <fraction n="0.4605" ref="O"/>
+      <fraction n="0.0204" ref="H"/>
+      <fraction n="0.3605" ref="Si"/>
+      <fraction n="0.0800" ref="Cl"/>
     </material>
 
     <material name="graphite">

From c699daf79939229dcce07770ae06cc389449880a Mon Sep 17 00:00:00 2001
From: Daniel Jeans <daniel.jeans@kek.jp>
Date: Fri, 20 Sep 2024 17:26:03 +0900
Subject: [PATCH 3/5] add comment

---
 ILD/compact/ILD_common_v02/materials.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ILD/compact/ILD_common_v02/materials.xml b/ILD/compact/ILD_common_v02/materials.xml
index 490af2856..1041a83e3 100644
--- a/ILD/compact/ILD_common_v02/materials.xml
+++ b/ILD/compact/ILD_common_v02/materials.xml
@@ -496,6 +496,7 @@
    </material>
 
    <material name="RPCGAS2" >
+     <!-- mass fractions: R134a:0.93 + IsoButane:0.05 + SF6:0.02 --> 
      <D value="0.00449" unit="g/cm3" />
      <fraction n="0.93" ref="R134a"/>
      <fraction n="0.05" ref="IsoButane"/>

From 45f3af9106624f58f58e878d1eb01e2ad5be925f Mon Sep 17 00:00:00 2001
From: Daniel Jeans <daniel.jeans@kek.jp>
Date: Thu, 17 Oct 2024 14:24:04 +0900
Subject: [PATCH 4/5] adjust RPCGas definition (from G. Grenier)

---
 ILD/compact/ILD_common_v02/materials.xml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/ILD/compact/ILD_common_v02/materials.xml b/ILD/compact/ILD_common_v02/materials.xml
index 1041a83e3..0adaac33a 100644
--- a/ILD/compact/ILD_common_v02/materials.xml
+++ b/ILD/compact/ILD_common_v02/materials.xml
@@ -488,6 +488,12 @@
      <composite n="4" ref="C"/>
      <composite n="10" ref="H"/>
    </material>
+
+   <material name="CarbonDioxide">
+     <D value="0.00198" unit="g/cm3" />
+     <composite n="1" ref="C"/>
+     <composite n="2" ref="O"/>
+   </material>
    
    <material name="SulphurHexafluoride">
      <D value="0.00617" unit="g/cm3" />
@@ -496,10 +502,11 @@
    </material>
 
    <material name="RPCGAS2" >
-     <!-- mass fractions: R134a:0.93 + IsoButane:0.05 + SF6:0.02 --> 
+     <!-- ORIG: mass fractions: R134a:0.93 + IsoButane:0.05 + SF6:0.02 --> 
+     <!-- SUGGESTED UPDATE from G.GRENIER (10/2024) mass fractions: R134a:0.93 + CO2:0.05 + SF6:0.02 --> 
      <D value="0.00449" unit="g/cm3" />
      <fraction n="0.93" ref="R134a"/>
-     <fraction n="0.05" ref="IsoButane"/>
+     <fraction n="0.05" ref="CarbonDioxide"/>
      <fraction n="0.02" ref="SulphurHexafluoride"/>
     </material>
 

From 2b8bade61cbaa83a4cf30124514c3ee0eec76757 Mon Sep 17 00:00:00 2001
From: Daniel Jeans <daniel.jeans@kek.jp>
Date: Thu, 17 Oct 2024 15:10:08 +0900
Subject: [PATCH 5/5] adjust density of RPC gas

---
 ILD/compact/ILD_common_v02/materials.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ILD/compact/ILD_common_v02/materials.xml b/ILD/compact/ILD_common_v02/materials.xml
index 0adaac33a..726cdde45 100644
--- a/ILD/compact/ILD_common_v02/materials.xml
+++ b/ILD/compact/ILD_common_v02/materials.xml
@@ -502,9 +502,9 @@
    </material>
 
    <material name="RPCGAS2" >
-     <!-- ORIG: mass fractions: R134a:0.93 + IsoButane:0.05 + SF6:0.02 --> 
-     <!-- SUGGESTED UPDATE from G.GRENIER (10/2024) mass fractions: R134a:0.93 + CO2:0.05 + SF6:0.02 --> 
-     <D value="0.00449" unit="g/cm3" />
+     <!-- mass fractions: R134a:0.93 + CO2:0.05 + SF6:0.02 --> 
+     <!-- calculated density: 0.0041749 g/cm3 -->
+     <D value="0.0041749" unit="g/cm3" />
      <fraction n="0.93" ref="R134a"/>
      <fraction n="0.05" ref="CarbonDioxide"/>
      <fraction n="0.02" ref="SulphurHexafluoride"/>