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

Common MDI #381

Open
wants to merge 31 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
3a73b48
Merge pull request #7 from key4hep/main
aciarma Aug 26, 2024
b46055a
taken lumical from CLD_o2_v06
aciarma Aug 26, 2024
a05f5e7
Merge branch 'key4hep:main' into commonMDI
aciarma Aug 28, 2024
6a4bf57
dimensions compact + standalone compact
aciarma Aug 28, 2024
e704601
Merge branch 'commonMDI' of github.com:aciarma/k4geo into commonMDI
aciarma Aug 28, 2024
fd3c79a
Merge branch 'key4hep:main' into commonMDI
aciarma Aug 29, 2024
f424af0
updated for LumiCal_o3_v05
aciarma Aug 29, 2024
e15659e
added field maps (to fix) and quadrupoles
aciarma Aug 29, 2024
b33ed0d
change name FFQuads
aciarma Aug 29, 2024
4f52f42
fix FFQ file name
aciarma Aug 29, 2024
5854a26
addded FFQ magnetic field for different optics
aciarma Aug 30, 2024
b1660ee
Merge branch 'key4hep:main' into commonMDI
aciarma Sep 2, 2024
b1cad71
field map correctly read. fix a variable in FFQ
aciarma Sep 2, 2024
51825b6
add 2T detector solenoid field
aciarma Sep 2, 2024
b121ae3
fix ideal antisolenoid field
aciarma Sep 2, 2024
a5dfeeb
apply also to MDI_o1_v01
aciarma Sep 2, 2024
e8957b4
fix identical files
aciarma Sep 2, 2024
f3ff764
fix v01
aciarma Sep 2, 2024
a9776a3
update README
aciarma Sep 2, 2024
2438088
update README
aciarma Sep 2, 2024
0858110
add MDI elements to ALLEGRO_o1_v03
aciarma Sep 2, 2024
775610d
update on ALLEGRO_o1_v03
aciarma Sep 2, 2024
9f7db07
add MDI elements to IDEA_o1_v03
aciarma Sep 2, 2024
5b3554f
fixed paths in IDEA test
aciarma Sep 2, 2024
41863a4
fix IDEA_withDRC test
aciarma Sep 3, 2024
29e5b4b
fix IDEA_withDRC test again
aciarma Sep 3, 2024
7d59c06
Merge branch 'key4hep:main' into commonMDI
aciarma Sep 4, 2024
b6649fc
FFQuads_v01 made not sensitive, FFQuads_v01_sens to be used when needed
aciarma Sep 5, 2024
5d0f568
Merge branch 'commonMDI' of github.com:aciarma/k4geo into commonMDI
aciarma Sep 5, 2024
fb48223
fix non sensitive quads
aciarma Sep 5, 2024
4967b9d
fix non sensitive quads
aciarma Sep 5, 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
6 changes: 4 additions & 2 deletions FCCee/MDI/compact/MDI_o1_v00/MDI_standalone.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
<!-- only for standalone, should normally be included in the detector dimensions compact -->
<constant name="env_safety" value="0.1*mm"/>
<constant name="world_side" value="6100*mm"/>
<constant name="tracker_region_zmax" value="10*m"/>
<constant name="tracker_region_rmax" value="0.5*m"/>

<constant name="DetID_LumiCal" value=" 15"/>
<constant name="DetID_LumiCalInstrumentation" value=" 16"/>
Expand All @@ -55,8 +57,8 @@
<!-- <include ref="FFQuads_params_v572_T.xml"/>-->
<include ref="FFQuads_v01.xml"/>


<include ref="fields_antisol_map.xml"/>
<!-- <include ref="fields_solenoid.xml"/>
<include ref="fields_antisol_map.xml"/>-->
<!-- <include ref="${k4geo_DIR}/ILD/compact/ILD_common_v02/Field_AntiDID_Map_l.xml"/> -->
<!-- <include ref="fields_antisol_ideal.xml"/> -->

Expand Down
21 changes: 21 additions & 0 deletions FCCee/MDI/compact/MDI_o1_v00/fields_solenoid.xml
aciarma marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<lccdd>

<define>
<constant name="Solenoid_inner_radius" value="3719*mm"/>
<constant name="Solenoid_outer_radius" value="4272*mm"/>
<constant name="Solenoid_half_length" value="3705*mm"/>
<constant name="Solenoid_Coil_half_length" value="3476*mm"/>
<constant name="Solenoid_Coil_radius" value="3930*mm"/>
</define>

<fields>
<field name="GlobalSolenoid" type="solenoid"
inner_field="SolenoidField"
outer_field="-1.0*tesla"
zmax="Solenoid_Coil_half_length"
outer_radius="Solenoid_Coil_radius">
</field>
</fields>


</lccdd>
Loading