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

Including IDEA vertex detector (that is not just a scaled copy of the CLD one) #35

Open
wants to merge 39 commits into
base: main
Choose a base branch
from
Open

Including IDEA vertex detector (that is not just a scaled copy of the CLD one) #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
1dd6fa7
Begin v03 - small beampipe
aciarma May 9, 2022
7b7cc1b
fixed VXD volume definition for incongruence with smaller beampipe
aciarma May 9, 2022
18cf697
changed vxd barrel to fit small beampipe, same angular acceptance
aciarma Jun 27, 2022
09b6ba6
Pushing my changes to Vertex detector, but will now move everything t…
Nov 2, 2022
f142014
Uploading my progress on the IDEA VTX detector
Dec 6, 2022
cd92157
Merge branch 'main' of github.com:armin-ilg/FCCDetectors into armin
Dec 6, 2022
9551093
Implemented IDEA vertex endcap as simple pedals -> to be improved
Dec 6, 2022
70f63f6
Pushing my first version of the IDEA vertex: Quite realisic inner ver…
Dec 15, 2022
b44f9b6
Merge-in current main branch
Dec 15, 2022
c775bf3
Can remove these files from DetFCCeeIDEA as they are the same as in D…
Dec 15, 2022
5146d03
Adding current version of IDEA vertex
Dec 15, 2022
38901b7
Delete ECalBarrel.xml
armin-ilg Dec 15, 2022
a5615b4
Delete ECalEndcap.xml
armin-ilg Dec 15, 2022
fa2c0e0
Delete FCCee_DectDimensions.xml
armin-ilg Dec 15, 2022
0236a5d
Delete FCCee_o2_v03.xml
armin-ilg Dec 15, 2022
0e6bcc0
Delete HCalBarrel.xml
armin-ilg Dec 15, 2022
2eca716
Delete HCalEndcap.xml
armin-ilg Dec 15, 2022
9010a80
Delete Solenoid.xml
armin-ilg Dec 15, 2022
ad38213
Delete additional_materials.xml
armin-ilg Dec 15, 2022
4976ee8
Delete YokeEndcap.xml
armin-ilg Dec 15, 2022
9c94239
Delete YokeBarrel.xml
armin-ilg Dec 15, 2022
0345c1c
Delete TrackerDiskModuleOut.xml
armin-ilg Dec 15, 2022
8b81827
Delete TrackerDiskModuleIn.xml
armin-ilg Dec 15, 2022
f8cfef8
Delete OuterTrackerBarrelModuleUp.xml
armin-ilg Dec 15, 2022
7de350a
Delete OuterTrackerBarrelModuleDown.xml
armin-ilg Dec 15, 2022
14b3510
Delete OuterTracker.xml
armin-ilg Dec 15, 2022
fcb34f5
Delete FCCee_DectDimensions.xml
armin-ilg Dec 15, 2022
974f91a
Delete InnerTracker.xml
armin-ilg Dec 15, 2022
037eac5
Delete InnerTrackerBarrelModuleDown.xml
armin-ilg Dec 15, 2022
7f72c74
Delete Vertex.xml
armin-ilg Dec 15, 2022
6cfc398
Adding back mistakenly deleted file
Dec 15, 2022
a196ca8
Adding back mistakenly deleted file
Dec 15, 2022
d17598b
Added ability to have flex and support consisting of multiple compone…
Jan 16, 2023
0c04717
First implementation of IDEA end-cap and adaption of barrel
Feb 21, 2023
ab4a63f
Merge branch 'main' of github.com:HEP-FCC/FCCDetectors into armin
Feb 21, 2023
05b240f
Endcap and barrel now run through ddsim overlap checker (overlaps sti…
Mar 14, 2023
ca030d2
Adding useful scripts and IDEA vertex that runs using scripts/simulat…
Mar 21, 2023
601c695
Fixed endcap, all surfaces visible in teveDisplay, managed to run dds…
Apr 6, 2023
4f9e168
Adding vertex barrel support via DDCAD (still need to remove overlaps)
May 25, 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
6 changes: 4 additions & 2 deletions Detector/DetFCCeeCLD/compact/FCCee_o2_v02/FCCee_o2_v02.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,10 @@
</define>

<include ref="./FCCee_DectDimensions.xml" />

<include ref="../../../DetFCCeeCommon/compact/Beampipe.xml"/>
<include ref="../../../DetFCCeeCommon/compact/HOMAbsorber.xml"/>
<include ref="../../../DetFCCeeCommon/compact/BeamInstrumentation.xml"/>
<include ref="../../../DetFCCeeCommon/compact/LumiCal.xml"/>

<include ref="Vertex.xml"/>
<include ref="InnerTracker.xml"/>
<include ref="OuterTracker.xml"/>
Expand All @@ -50,5 +48,9 @@
<include ref="YokeBarrel.xml"/>
<include ref="YokeEndcap.xml"/>

<plugins>
<plugin name="DD4hepVolumeManager"/>
<plugin name="InstallSurfaceManager"/>
</plugins>

</lccdd>
8 changes: 4 additions & 4 deletions Detector/DetFCCeeCommon/compact/Beampipe.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

<comment>Part of beampipe made of Beryllium</comment>

<detector name="BeBeampipe" type="DD4hep_Beampipe_o1_v01" insideTrackingVolume="true" nocore="true" vis="BeamPipeVis">
<detector name="BeBeampipe" type="DD4hep_Beampipe_o1_v01" insideTrackingVolume="true" nocore="true" vis="BeamPipeVis" region="BeampipeRegion">
<parameter crossingangle="CrossingAngle" />
<envelope vis="BlueVis">
<shape type="Assembly"/>
Expand All @@ -40,7 +40,7 @@

</detector>

<detector name="BeamPipe" type="DD4hep_Beampipe_o1_v01" insideTrackingVolume="true" vis="BeamPipeVis" >
<detector name="BeamPipe" type="DD4hep_Beampipe_o1_v01" insideTrackingVolume="true" vis="BeamPipeVis" region="BeampipeRegion">
<envelope vis="BlueVis">
<shape type="Assembly"/>
</envelope>
Expand Down Expand Up @@ -75,7 +75,7 @@

</detector>
<comment>Full Cone Tungsten Shield</comment>
<detector name="BeamPipeShield" type="DD4hep_Mask_o1_v01" insideTrackingVolume="true" vis="TantalumVis" >
<detector name="BeamPipeShield" type="DD4hep_Mask_o1_v01" insideTrackingVolume="true" vis="TantalumVis" region="BeampipeRegion">
<parameter crossingangle="CrossingAngle" />

<comment>Before HOM space</comment>
Expand All @@ -99,7 +99,7 @@
</detector>
<comment>Asymmetric Tungsten Shield no Rotation</comment>

<detector name="BeamPipeShield_noRot" type="DD4hep_Mask_o1_v01" insideTrackingVolume="true" vis="TantalumVis" >
<detector name="BeamPipeShield_noRot" type="DD4hep_Mask_o1_v01" insideTrackingVolume="true" vis="TantalumVis" region="BeampipeRegion">
<parameter crossingangle="CrossingAngle" rotationX="true"/>

<section type="Center"
Expand Down
36 changes: 0 additions & 36 deletions Detector/DetFCCeeIDEA/compact/BeamInstrumentation.xml
View file
Open in desktop

This file was deleted.

150 changes: 0 additions & 150 deletions Detector/DetFCCeeIDEA/compact/Beampipe.xml
View file
Open in desktop

This file was deleted.

Loading