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

feat: pull CAD generated service meshes into simulation #421

Draft
wants to merge 11 commits into
base: main
Choose a base branch
from
+49 −1
Draft

feat: pull CAD generated service meshes into simulation #421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bc4855d
feat: pull CAD generated service meshes into simulation
wdconinc May 3, 2023
5929df3
fix: keep the materials in epic
wdconinc May 3, 2023
5d0161a
update material scan script for testing the imported geometry
May 17, 2023
6b770e2
revert changes to material scan script
Jul 23, 2023
f214831
add a script for collecting g4MaterialScan results
Jul 23, 2023
a31e124
update the scan script
Aug 25, 2023
f9466b1
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 25, 2023
86edaa4
add a feature to scan over a phi range (take the average value)
Aug 26, 2023
b38b79b
fix an issue with calculating average material thickness
Aug 26, 2023
e390f99
fix a typo
Aug 26, 2023
ad4d2da
remove g4_material_scan.py, it will be added in a separate PR
Aug 26, 2023
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
32 changes: 32 additions & 0 deletions compact/tracking/cable_services.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<!-- SPDX-License-Identifier: LGPL-3.0-or-later -->
<!-- Copyright (C) 2022 Wouter Deconinck, Whitney Armstrong -->

<lccdd>
<materials>
<material name="0.000000_0.000000_1.000000_0.000000_0.000000">
<D value="7.85" unit="g/cm3"/>
<fraction n="1" ref="Fe"/>
</material>
<material name="1.000000_0.000000_0.000000_0.000000_0.000000">
<D value="7.85" unit="g/cm3"/>
<fraction n="1" ref="Fe"/>
</material>
<material name="1.000000_0.501961_0.000000_0.000000_0.000000">
<D value="7.85" unit="g/cm3"/>
<fraction n="1" ref="Fe"/>
</material>
<material name="1.000000_0.501961_0.250980_0.000000_0.000000">
<D value="7.85" unit="g/cm3"/>
<fraction n="1" ref="Fe"/>
</material>
</materials>

<detectors>
<detector name="Services" type="DD4hep_TestShape_Creator">
<check>
<shape type="CAD_MultiVolume" ref="meshes/FullCableSpaceEstimate.obj" unit="m">
</shape>
</check>
</detector>
</detectors>
</lccdd>
12 changes: 12 additions & 0 deletions compact/tracking/get_meshes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!-- SPDX-License-Identifier: LGPL-3.0-or-later -->
<!-- Copyright (C) 2022 Wouter Deconinck, Whitney Armstrong -->

<lccdd>
<plugins>
<plugin name="epic_FileLoader">
<arg value="cache:$DETECTOR_PATH:/opt/detector"/>
<arg value="file:meshes/FullCableSpaceEstimate.obj"/>
<arg value="url:https://github.com/eic/epic-data/raw/meshes/meshes/tracking/FullCableSpaceEstimate.obj"/>
</plugin>
</plugins>
</lccdd>
4 changes: 4 additions & 0 deletions configurations/services_only.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
features:
tracking:
get_meshes:
cable_services:
2 changes: 1 addition & 1 deletion src/FileLoader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ long load_file(Detector& /* desc */, int argc, char** argv)
{
// argument parsing
std::string cache, file, url;
std::string cmd("curl --retry 5 -f {0} -o {1}");
std::string cmd("curl --location --retry 5 -f {0} -o {1}");
for (int i = 0; i < argc && argv[i]; ++i) {
if (0 == std::strncmp("cache:", argv[i], 6))
cache = (argv[i] + 6);
Expand Down