From 4c6c58aeca1e39fa161b114389f93f6f195b69d4 Mon Sep 17 00:00:00 2001
From: Roman Tkachenko <59330244+RomanTkachenko-dev@users.noreply.github.com>
Date: Fri, 27 Sep 2024 07:28:41 +0300
Subject: [PATCH] Move sensor material parameters to XML file (#775)

### Briefly, what does this PR introduce?
Move sensor material parameters to XML file

### What kind of change does this PR introduce?
- [ ] Bug fix (issue #772)
- [ ] New feature (issue #__)
- [ ] Documentation update
- [ ] Other: __

### Please check if this PR fulfills the following:
- [ ] Tests for the changes have been added
- [ ] Documentation has been added / updated
- [ ] Changes have been communicated to collaborators

### Does this PR introduce breaking changes? What changes might users
need to make to their code?

### Does this PR change default behavior?

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: billlee77 <wenliang.billlee@gmail.com>
Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
---
 compact/pid/pfrich.xml |  4 ++++
 src/PFRICH_geo.cpp     | 10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/compact/pid/pfrich.xml b/compact/pid/pfrich.xml
index 2126303ab..3652d0c46 100644
--- a/compact/pid/pfrich.xml
+++ b/compact/pid/pfrich.xml
@@ -129,6 +129,10 @@
   side="PFRICH_sensor_sensitive_size"
   thickness="PFRICH_sensor_thickness"
   gap="0.2*mm"
+  windowmat="Quartz"
+  pcbmat="G10"
+  mpdmat="SiliconDioxide"
+  asicmat="SiliconCarbide"
   />
 
 <plane
diff --git a/src/PFRICH_geo.cpp b/src/PFRICH_geo.cpp
index 19b542857..07fec6bd1 100644
--- a/src/PFRICH_geo.cpp
+++ b/src/PFRICH_geo.cpp
@@ -82,6 +82,11 @@ static Ref_t createDetector(Detector& description, xml_h e, SensitiveDetector se
   double sensorThickness = sensorElem.attr<double>(_Unicode(thickness));
   auto readoutName       = detElem.attr<std::string>(_Unicode(readout));
 
+  auto HRPPD_WindowMat = description.material(sensorElem.attr<std::string>(_Unicode(windowmat)));
+  auto HRPPD_PCBMat    = description.material(sensorElem.attr<std::string>(_Unicode(pcbmat)));
+  auto HRPPD_MPDMat    = description.material(sensorElem.attr<std::string>(_Unicode(mpdmat)));
+  auto HRPPD_ASICMat   = description.material(sensorElem.attr<std::string>(_Unicode(asicmat)));
+
   double vesselRmin0 = dims.attr<double>(_Unicode(rmin0));
   double vesselRmin1 = dims.attr<double>(_Unicode(rmin1));
   double vesselRmax0 = dims.attr<double>(_Unicode(rmax0));
@@ -334,11 +339,6 @@ static Ref_t createDetector(Detector& description, xml_h e, SensitiveDetector se
   /*--------------------------------------------------*/
   // HRPPD material definition:
 
-  auto HRPPD_WindowMat = description.material("Quartz");
-  auto HRPPD_PCBMat    = description.material("G10");
-  auto HRPPD_MPDMat    = description.material("SiliconDioxide");
-  auto HRPPD_ASICMat   = description.material("SiliconCarbide");
-
   Box hrppd_Solid(xysize / 2, xysize / 2, hrppd_container_volume_thickness / 2);
 
   Volume hrppdVol_air(detName + "_air_hrppd", hrppd_Solid, air);