Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move sensor material parameters to XML file #775

Merged
merged 6 commits into from
Sep 27, 2024
Merged

Move sensor material parameters to XML file #775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a77c41c
Move sensor material parameters to XML file
RomanTkachenko-dev Aug 28, 2024
841f61b
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 28, 2024
ceac994
Corrected the material diffinition
billlee77 Sep 23, 2024
c9449c1
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 23, 2024
be1a6db
Merge branch 'main' into 772-pfrich-sensor-material-parameter-move-to…
billlee77 Sep 23, 2024
3d65b28
Merge branch 'main' into 772-pfrich-sensor-material-parameter-move-to…
veprbl Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions compact/pid/pfrich.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions src/PFRICH_geo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down Expand Up @@ -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);
Expand Down
Loading