forked from key4hep/k4geo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
added field maps (to fix) and quadrupoles
- Loading branch information
Showing
5 changed files
with
192 additions
and
69 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| <!--<?xml version="1.0" encoding="UTF-8"?>--> | ||
|
|
||
| <lccdd> | ||
|
|
||
| <!-- #========================================================================== | ||
| # AIDA Detector description implementation | ||
| #========================================================================== | ||
| # Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) | ||
| # All rights reserved. | ||
| # | ||
| # For the licensing terms see $DD4hepINSTALL/LICENSE. | ||
| # For the list of contributors see $DD4hepINSTALL/doc/CREDITS. | ||
| # | ||
| #========================================================================== | ||
| --> | ||
| <info name="FFQs" | ||
| title="Final Focusing Quadrupoles" | ||
| author="Andrea Ciarma" | ||
| url="no" | ||
| status="development" | ||
| version="1"> | ||
| <comment>Final Focusing Quadrupoles simplified model - Started from MaskTrafos.xml by A. Sailer</comment> | ||
| </info> | ||
|
|
||
| <define> | ||
| <constant name="QC1_rmin" value="42/2*mm"/> | ||
| <constant name="QC1_rmax" value="64/2*mm"/> | ||
| <constant name="QC1L1_len" value="700*mm"/> | ||
| <constant name="QC1L2_len" value="1250*mm"/> | ||
| <constant name="QC1L3_len" value="1250*mm"/> | ||
| <constant name="QC1L1_start" value="2200*mm"/> | ||
| <constant name="QC1L2_start" value="QC1L1_start+QC1L1_len+8*cm"/> | ||
| <constant name="QC1L3_start" value="QC1L2_start+QC1L2_len+8*cm"/> | ||
|
|
||
| </define> | ||
|
|
||
| <readouts> | ||
| <!-- this may be improved --> | ||
| <readout name="FFQ_Readout"> | ||
| <id>system:5,side:-2,layer:6,module:11,sensor:8</id> | ||
| </readout> | ||
| </readouts> | ||
|
|
||
| <detectors> | ||
| <detector name="QC1" type="DD4hep_Mask_o1_v01" vis="KICKVis" id="DetID_FFQs" readout="FFQ_Readout"> | ||
| <parameter crossingangle="CrossingAngle" /> | ||
| <envelope vis="KICKVis"> | ||
| <shape type="Assembly"/> | ||
| </envelope> | ||
| <section type="Upstream" start="QC1L1_start" end="QC1L1_start+QC1L1_len" | ||
| rMin1="QC1_rmin" rMin2="QC1_rmin" | ||
| rMax1="QC1_rmax" rMax2="QC1_rmax" | ||
| material="FFQMaterial" name="QC1L1u" sensitive="tracker"/> | ||
| <section type="Dnstream" start="QC1L1_start" end="QC1L1_start+QC1L1_len" | ||
| rMin1="QC1_rmin" rMin2="QC1_rmin" | ||
| rMax1="QC1_rmax" rMax2="QC1_rmax" | ||
| material="FFQMaterial" name="QC1L1d" sensitive="tracker"/> | ||
| <section type="Upstream" start="QC1L2_start" end="QC1L2_start+QC1L2_len" | ||
| rMin1="QC1_rmin" rMin2="QC1_rmin" | ||
| rMax1="QC1_rmax" rMax2="QC1_rmax" | ||
| material="FFQMaterial" name="QC1L2u" sensitive="tracker"/> | ||
| <section type="Dnstream" start="QC1L2_start" end="QC1L2_start+QC1L2_len" | ||
| rMin1="QC1_rmin" rMin2="QC1_rmin" | ||
| rMax1="QC1_rmax" rMax2="QC1_rmax" | ||
| material="FFQMaterial" name="QC1L2d" sensitive="tracker"/> | ||
| <section type="Upstream" start="QC1L3_start" end="QC1L3_start+QC1L3_len" | ||
| rMin1="QC1_rmin" rMin2="QC1_rmin" | ||
| rMax1="QC1_rmax" rMax2="QC1_rmax" | ||
| material="FFQMaterial" name="QC1L3u" sensitive="tracker"/> | ||
| <section type="Dnstream" start="QC1L3_start" end="QC1L3_start+QC1L3_len" | ||
| rMin1="QC1_rmin" rMin2="QC1_rmin" | ||
| rMax1="QC1_rmax" rMax2="QC1_rmax" | ||
| material="FFQMaterial" name="QC1L3d" sensitive="tracker"/> | ||
| </detector> | ||
| </detectors> | ||
|
|
||
| </lccdd> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| <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> | ||
|
|
||
| <field name="CompensatingSolenoidZplus" type="solenoid" | ||
| inner_field="-SolenoidField -SolenoidField * QD0_min_z / ( QD0_min_z - CompSol_min_z)" | ||
| outer_field="0*tesla" | ||
| zmax="QD0_min_z" | ||
| zmin="CompSol_min_z" | ||
| outer_radius="20*cm"> | ||
| </field> | ||
|
|
||
| <field name="CompensatingSolenoidZminus" type="solenoid" | ||
| inner_field="-SolenoidField -SolenoidField * QD0_min_z / ( QD0_min_z - CompSol_min_z)" | ||
| outer_field="0*tesla" | ||
| zmin="-QD0_min_z" | ||
| zmax="-CompSol_min_z" | ||
| outer_radius="20*cm"> | ||
| </field> | ||
|
|
||
| <!-- to check with the visualisation that this works... : | ||
| <field name="GlobalSolenoid" type="solenoid" | ||
| inner_field="SolenoidField" | ||
| outer_field="-1.5*tesla" | ||
| zmax="1*m" | ||
| outer_radius="Solenoid_Coil_radius"> | ||
| </field> | ||
| <field name="CompensatingSolenoid" type="solenoid" | ||
| inner_field="-SolenoidField" | ||
| outer_field="0*tesla" | ||
| zmax="3*m" | ||
| zmin="1*m" | ||
| outer_radius="Solenoid_Coil_radius"> | ||
| </field> | ||
| --> | ||
|
|
||
|
|
||
| </fields> | ||
|
|
||
|
|
||
| </lccdd> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| <lccdd> | ||
| <info name="fields_antisol_map" | ||
| title="Magnetic field for the compensating and screening solenoids only. Field map from M. Koratzinos" | ||
| author="Andrea Ciarma" | ||
| url="" | ||
| status="development" | ||
| version="1"> | ||
| <comment>Dimensions and Materials for the FCCee common MDI</comment> | ||
| </info> | ||
|
|
||
| <fields> | ||
| <!-- Detailed field map --> | ||
| <field name="AntisolField" type="FieldXYZ" | ||
| filename = "${k4geo_DIR}/fieldmaps/FCCee_fieldMapXYZ_120218.root" | ||
| treeName = "ntuple" | ||
| xVarName = "X" | ||
| yVarName = "Y" | ||
| zVarName = "Z" | ||
| BxVarName = "Bx" | ||
| ByVarName = "By" | ||
| BzVarName = "Bz" | ||
| xScale = "1.0" | ||
| yScale = "1.0" | ||
| zScale = "1.0" | ||
| bScale = "1.0" | ||
| coorUnits = "mm" | ||
| BfieldUnits = "tesla" | ||
| > | ||
| </field> | ||
| </fields> | ||
|
|
||
| </lccdd> |