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.

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

[FCCee] Centralize beampipe geometries in an MDI folder #344

Merged
merged 26 commits into from
Jul 19, 2024
Merged
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
5f51f0e
CAD files for beampipe added
aciarma May 30, 2024
c9eed51
added materials for CAD beampipe, added CAD beampipe to main xml, add…
aciarma May 30, 2024
e5ffc7a
forgot dimensions for FFQs and solenoid
aciarma May 30, 2024
4e4e66a
move /CADbeampipe to /MDI
aciarma Jun 25, 2024
a1f423b
changed path of CAD pipe in ALLEGRO_o1_v03.xml
aciarma Jun 25, 2024
f16a479
solving conflicts
aciarma Jun 25, 2024
6d5434f
Merge branch 'key4hep-main' into CADpipe2
aciarma Jun 25, 2024
bb2052e
add CAD pipe to IDEA
aciarma Jun 25, 2024
e641538
fixed duplicate variables and commented out FFQ fields in ALLEGRO_o1_…
aciarma Jun 26, 2024
d241139
fixed tests
aciarma Jun 26, 2024
0fad5ae
Update FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/ALLEGRO_o1_v03.xml
aciarma Jun 26, 2024
98090ee
Update FCCee/IDEA/compact/IDEA_o1_v03/IDEA_o1_v03.xml
aciarma Jun 26, 2024
64f3592
Update FCCee/IDEA/compact/IDEA_o1_v03/IDEA_o1_v03.xml
aciarma Jun 26, 2024
799807d
Update FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/ALLEGRO_o1_v03.xml
aciarma Jun 26, 2024
358ac33
remove old beam pipe compacts, remove duplicate HCAL barrel import in…
aciarma Jun 26, 2024
c6a2f0a
Merge branch 'CADpipe2' of github.com:aciarma/k4geo into CADpipe2
aciarma Jun 26, 2024
72880e0
remove beampipe.xml from ALLEGRO main
aciarma Jun 26, 2024
8a91c1a
removed ALLEGRO_o1_v01/HOMAbsorber.xml
aciarma Jun 26, 2024
3dcb103
changed Material01 to IronDens785
aciarma Jul 5, 2024
de1406a
added MDI_o1_v00 and fixed READMEs
aciarma Jul 8, 2024
c9566cb
add back the shape based beampipe on IDEA and ALLEGRO
aciarma Jul 18, 2024
594fa9a
removed stl files, README updated
aciarma Jul 18, 2024
a014a0f
Merge branch 'master' into CADpipe2
aciarma Jul 19, 2024
a7c8b9c
Update FCCee/MDI/compact/README.md
aciarma Jul 19, 2024
affc2cb
Update FCCee/ALLEGRO/compact/README.md
aciarma Jul 19, 2024
4223801
fixed pipe dimensions for ALLEGRO
aciarma Jul 19, 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
Prev Previous commit
Next Next commit
changed path of CAD pipe in ALLEGRO_o1_v03.xml
aciarma committed Jun 25, 2024
commit a1f423b4fc375f0457e8c9c559dbdff9533c1da2
6 changes: 3 additions & 3 deletions FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/ALLEGRO_o1_v03.xml
Original file line number Diff line number Diff line change
@@ -37,17 +37,17 @@
<include ref="./DectDimensions.xml" />

<!--<include ref="Beampipe.xml"/>-->
aciarma marked this conversation as resolved.
Show resolved Hide resolved
<include ref="../../../CAD_beampipe/compact/Beampipe_CADimport_o1_v02.xml" />
<include ref="../../../MDI/compact/MDI_o1_v01/Beampipe_CADimport_o1_v02.xml" />
<include ref="BeamInstrumentation.xml"/>
<include ref="LumiCal.xml"/>
<include ref="HOMAbsorber.xml"/>
<!--<include ref="HOMAbsorber.xml"/>-->
aciarma marked this conversation as resolved.
Show resolved Hide resolved
aciarma marked this conversation as resolved.
Show resolved Hide resolved
<!--taken from DetFCCeeCLD/compact/FCCee_o2_v02 -->
<include ref="Vertex.xml"/>
<include ref="DriftChamber.xml"/>
<include ref="ECalBarrel_thetamodulemerged.xml"/>
<include ref="HCalBarrel_TileCal.xml"/>
<include ref="ECalEndcaps_coneCryo.xml"/>
<include ref="HCalEndcaps_ThreeParts_TileCal.xml"/>
<include ref="HCalBarrel_TileCal.xml"/>
aciarma marked this conversation as resolved.
Show resolved Hide resolved
<include ref="MuonTagger.xml"/>