Merge branch 'main' into material-map-validation-acts-33.1.0

eic · Oct 7, 2024 · a7b2570 · a7b2570
2 parents 043a3f4 + 4c6c58a
commit a7b2570
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git 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
@@ -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);