From 245c056f24aa0905e2080d1dcb62ce31ddd2f928 Mon Sep 17 00:00:00 2001 From: aciarma <92432372+aciarma@users.noreply.github.com> Date: Fri, 19 Jul 2024 14:26:39 +0200 Subject: [PATCH] [FCCee] Centralize beampipe geometries in an MDI folder (#344) * CAD files for beampipe added * added materials for CAD beampipe, added CAD beampipe to main xml, added solenoids + FFQs fields * forgot dimensions for FFQs and solenoid * move /CADbeampipe to /MDI * changed path of CAD pipe in ALLEGRO_o1_v03.xml * add CAD pipe to IDEA * fixed duplicate variables and commented out FFQ fields in ALLEGRO_o1_v01.xml * fixed tests * Update FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/ALLEGRO_o1_v03.xml Co-authored-by: Andre Sailer * Update FCCee/IDEA/compact/IDEA_o1_v03/IDEA_o1_v03.xml Co-authored-by: Andre Sailer * Update FCCee/IDEA/compact/IDEA_o1_v03/IDEA_o1_v03.xml Co-authored-by: Andre Sailer * Update FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/ALLEGRO_o1_v03.xml Co-authored-by: Andre Sailer * remove old beam pipe compacts, remove duplicate HCAL barrel import in ALLEGRO * remove beampipe.xml from ALLEGRO main * removed ALLEGRO_o1_v01/HOMAbsorber.xml * changed Material01 to IronDens785 * added MDI_o1_v00 and fixed READMEs * add back the shape based beampipe on IDEA and ALLEGRO * removed stl files, README updated * Update FCCee/MDI/compact/README.md Co-authored-by: Brieuc Francois * Update FCCee/ALLEGRO/compact/README.md Co-authored-by: Brieuc Francois * fixed pipe dimensions for ALLEGRO --------- Co-authored-by: Andre Sailer Co-authored-by: Brieuc Francois --- .../compact/ALLEGRO_o1_v03/ALLEGRO_o1_v03.xml | 18 ++- .../compact/ALLEGRO_o1_v03/Beampipe.xml | 150 ------------------ .../compact/ALLEGRO_o1_v03/DectDimensions.xml | 28 ++-- .../compact/ALLEGRO_o1_v03/materials.xml | 31 ++++ FCCee/ALLEGRO/compact/README.md | 2 +- .../IDEA/compact/IDEA_o1_v03/IDEA_o1_v03.xml | 8 +- .../compact/IDEA_o1_v03/materials_o1_v02.xml | 2 +- FCCee/IDEA/compact/README.md | 1 - .../BeamInstrumentation_o1_v01.xml | 0 .../compact/MDI_o1_v00}/Beampipe_o4_v05.xml | 0 .../compact/MDI_o1_v00}/HOMAbsorber.xml | 0 .../BeamInstrumentation_o1_v01.xml} | 0 .../MDI_o1_v01/Beampipe_CADimport_o1_v02.xml | 99 ++++++++++++ FCCee/MDI/compact/README.md | 18 +++ test/CMakeLists.txt | 4 +- 15 files changed, 189 insertions(+), 172 deletions(-) delete mode 100644 FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/Beampipe.xml rename FCCee/{IDEA/compact/IDEA_o1_v03 => MDI/compact/MDI_o1_v00}/BeamInstrumentation_o1_v01.xml (100%) rename FCCee/{IDEA/compact/IDEA_o1_v03 => MDI/compact/MDI_o1_v00}/Beampipe_o4_v05.xml (100%) rename FCCee/{ALLEGRO/compact/ALLEGRO_o1_v03 => MDI/compact/MDI_o1_v00}/HOMAbsorber.xml (100%) rename FCCee/{ALLEGRO/compact/ALLEGRO_o1_v03/BeamInstrumentation.xml => MDI/compact/MDI_o1_v01/BeamInstrumentation_o1_v01.xml} (100%) create mode 100644 FCCee/MDI/compact/MDI_o1_v01/Beampipe_CADimport_o1_v02.xml create mode 100644 FCCee/MDI/compact/README.md diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/ALLEGRO_o1_v03.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/ALLEGRO_o1_v03.xml index da8377bfd..4858ee905 100644 --- a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/ALLEGRO_o1_v03.xml +++ b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/ALLEGRO_o1_v03.xml @@ -30,16 +30,21 @@ - - + + + + + + + + - - + @@ -72,6 +77,8 @@ outer_radius="20*cm"> + + + diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/Beampipe.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/Beampipe.xml deleted file mode 100644 index b86af5217..000000000 --- a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/Beampipe.xml +++ /dev/null @@ -1,150 +0,0 @@ - - - - A beampipe for FCCee, R(central) = 1.5 cm - - - - - - - - - - - - - - - - - - - - Part of beampipe made of Beryllium - - - - - - - -
- -
- - - - - - - - - - - - - Golden foil in the inner part of the Be beampipe - -
- -
- - Part of beampipe made of Copper - -
- - - - - -
- - - -
- - -
- - -Full Cone Tungsten Shield - - - - Before HOM space -
- - After HOM space (1197.5*m - 1298.7*mm) +18 cm as solenoid is now closer to IP -
- - -Asymmetric Tungsten Shield no Rotation - - - - -
- - was 370 -
- - one degree less, to fit lumical window -
- -
- - - - - diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/DectDimensions.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/DectDimensions.xml index 7b3a2a305..c09dbea21 100644 --- a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/DectDimensions.xml +++ b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/DectDimensions.xml @@ -48,22 +48,30 @@ - - - - - - - + + + + + + + + + + + - - + + - + + + + + diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/materials.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/materials.xml index d2cec5087..338606639 100644 --- a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/materials.xml +++ b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/materials.xml @@ -475,4 +475,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/ALLEGRO/compact/README.md b/FCCee/ALLEGRO/compact/README.md index 630ebcbdb..2d8dd9f66 100644 --- a/FCCee/ALLEGRO/compact/README.md +++ b/FCCee/ALLEGRO/compact/README.md @@ -8,4 +8,4 @@ Known caveat: the drift chamber has a larger z extent than in the IDEA detector ALLEGRO_o1_v03: with respect to v02 it features an ECal barrel with 11 layers and cell corners projective along phi. The vertex detector and drift chamber are now taken directly from IDEA_o1_v03, this effectively updates both the vertex detector (which was taken from an old CLD version) and the drift chamber (which was corresponding to IDEA_o1_v02/DriftChamber_o1_v01.xml). The z-extent of the drift chamber is now unchanged w.r.t. the IDEA detector (2 m) since it requires optimization anyway. -Magnetic fields (solenoid + MDI) have been added. +Magnetic fields (solenoid + MDI) have been added. \ No newline at end of file diff --git a/FCCee/IDEA/compact/IDEA_o1_v03/IDEA_o1_v03.xml b/FCCee/IDEA/compact/IDEA_o1_v03/IDEA_o1_v03.xml index 5ebedf0ed..66a5c49bd 100644 --- a/FCCee/IDEA/compact/IDEA_o1_v03/IDEA_o1_v03.xml +++ b/FCCee/IDEA/compact/IDEA_o1_v03/IDEA_o1_v03.xml @@ -34,8 +34,12 @@ - - + + + + + + diff --git a/FCCee/IDEA/compact/IDEA_o1_v03/materials_o1_v02.xml b/FCCee/IDEA/compact/IDEA_o1_v03/materials_o1_v02.xml index aea439da0..189bc202e 100644 --- a/FCCee/IDEA/compact/IDEA_o1_v03/materials_o1_v02.xml +++ b/FCCee/IDEA/compact/IDEA_o1_v03/materials_o1_v02.xml @@ -330,7 +330,7 @@ - + diff --git a/FCCee/IDEA/compact/README.md b/FCCee/IDEA/compact/README.md index 4239c24d4..192d63f55 100644 --- a/FCCee/IDEA/compact/README.md +++ b/FCCee/IDEA/compact/README.md @@ -15,4 +15,3 @@ IDEA_o1_v03 ------------ Based on o1_v02 but replacing the drift chamber (o1, v01) for the lightweight implementation based on twisted tubes (o1, v02). NB: production threshold and step limit physics have to be tuned for the drift chamber. July 2024: Added a detailed version of the muon system. - diff --git a/FCCee/IDEA/compact/IDEA_o1_v03/BeamInstrumentation_o1_v01.xml b/FCCee/MDI/compact/MDI_o1_v00/BeamInstrumentation_o1_v01.xml similarity index 100% rename from FCCee/IDEA/compact/IDEA_o1_v03/BeamInstrumentation_o1_v01.xml rename to FCCee/MDI/compact/MDI_o1_v00/BeamInstrumentation_o1_v01.xml diff --git a/FCCee/IDEA/compact/IDEA_o1_v03/Beampipe_o4_v05.xml b/FCCee/MDI/compact/MDI_o1_v00/Beampipe_o4_v05.xml similarity index 100% rename from FCCee/IDEA/compact/IDEA_o1_v03/Beampipe_o4_v05.xml rename to FCCee/MDI/compact/MDI_o1_v00/Beampipe_o4_v05.xml diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/HOMAbsorber.xml b/FCCee/MDI/compact/MDI_o1_v00/HOMAbsorber.xml similarity index 100% rename from FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/HOMAbsorber.xml rename to FCCee/MDI/compact/MDI_o1_v00/HOMAbsorber.xml diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/BeamInstrumentation.xml b/FCCee/MDI/compact/MDI_o1_v01/BeamInstrumentation_o1_v01.xml similarity index 100% rename from FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/BeamInstrumentation.xml rename to FCCee/MDI/compact/MDI_o1_v01/BeamInstrumentation_o1_v01.xml diff --git a/FCCee/MDI/compact/MDI_o1_v01/Beampipe_CADimport_o1_v02.xml b/FCCee/MDI/compact/MDI_o1_v01/Beampipe_CADimport_o1_v02.xml new file mode 100644 index 000000000..c4a3132f6 --- /dev/null +++ b/FCCee/MDI/compact/MDI_o1_v01/Beampipe_CADimport_o1_v02.xml @@ -0,0 +1,99 @@ + + + + + + A beampipe for FCCee coming from F. Fransesini CAD drawings. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FCCee/MDI/compact/README.md b/FCCee/MDI/compact/README.md new file mode 100644 index 000000000..0b177c6d5 --- /dev/null +++ b/FCCee/MDI/compact/README.md @@ -0,0 +1,18 @@ +aciarma - 08/07/24 + +- MDI_o1_v00 +-- Beampipe_o4_v05.xml : "shape based" beam pipe with AlBeMet central chamber and Paraffin cooling. From IDEA_o1_v02. +-- BeamInstrumentation_o1_v01.xml : compensating and screening solenoids +-- HOMAbsorber.xml : old model of the HOM absorbers. Not needed anymore with new low impedance beam pipe. + +- MDI_o1_v01 (STL FILES NOT IN THIS REPO!!! WILL BE ADDED LATER) +-- Beampipe_CADimport_o1_v02.xml : import CAD models for engineered beam pipe (by F. Fransesini/INFN-LNF) +These .stl files are hosted [here](https://fccsw.web.cern.ch/fccsw/filesForSimDigiReco/MDI/MDI_o1_v01/) +-- stl_files/Pipe_240430 + ├── AlBeMet162_30042024.stl : central and elliptoconical chambers, with cooling manifolds + ├── Copper_pipe_28092023.stl : low impedance beam pipe separation region + ├── Gold_19042024.stl : 5um coating inside the central chamber + ├── Paraffine_19042024.stl : cooling for central chamber + ├── Tungsten_mask_02102023.stl : SR masks 2.1m upstream + └── Water_30042024.stl : cooling for elliptoconical chambers +-- BeamInstrumentation_o1_v01.xml : compensating and screening solenoids \ No newline at end of file diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 83aae7aa0..3d4876777 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -92,7 +92,7 @@ if(DCH_INFO_H_EXIST) SET( test_name "test_IDEA_o1_v03" ) ADD_TEST( t_${test_name} "${CMAKE_INSTALL_PREFIX}/bin/run_test_${PackageName}.sh" ddsim --compactFile=${CMAKE_CURRENT_SOURCE_DIR}/../FCCee/IDEA/compact/IDEA_o1_v03/IDEA_o1_v03.xml --runType=batch -G -N=1 --outputFile=testIDEA_o1_v03.slcio ) -SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION "Exception;EXCEPTION;ERROR;Error" TIMEOUT 700) +SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION " Exception; EXCEPTION;ERROR;Error" TIMEOUT 700) endif() #-------------------------------------------------- @@ -108,7 +108,7 @@ if(DCH_INFO_H_EXIST) SET( test_name "test_ALLEGRO_o1_v03" ) ADD_TEST( t_${test_name} "${CMAKE_INSTALL_PREFIX}/bin/run_test_${PackageName}.sh" ddsim --compactFile=${CMAKE_CURRENT_SOURCE_DIR}/../FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/ALLEGRO_o1_v03.xml --runType=batch -G -N=1 --outputFile=testALLEGRO_o1_v03.root ) -SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION "Exception;EXCEPTION;ERROR;Error" ) +SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION " Exception; EXCEPTION;ERROR;Error" ) endif() #--------------------------------------------------