integration of SCEPCal into IDEA_o2_v01 xml and steering files

key4hep · Dec 13, 2024 · ff0ddd9 · ff0ddd9
1 parent 8282598
commit ff0ddd9
Show file tree

Hide file tree

Showing 9 changed files with 75 additions and 1,246 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -136,9 +136,6 @@ add_library(lcgeo ALIAS k4geo)
 target_include_directories(${PackageName}   PRIVATE ${PROJECT_SOURCE_DIR}/detector/include )
 target_include_directories(${PackageName}G4 PRIVATE ${PROJECT_SOURCE_DIR}/detector/include )
 
-# target_include_directories(${PackageName}   PRIVATE ${PROJECT_SOURCE_DIR}/detectorSegmentations/include )
-# target_include_directories(${PackageName}G4 PRIVATE ${PROJECT_SOURCE_DIR}/detectorSegmentations/include )
-
 target_include_directories(${PackageName}   PRIVATE ${PROJECT_SOURCE_DIR}/detector/calorimeter/dual-readout/include )
 target_include_directories(${PackageName}G4 PRIVATE ${PROJECT_SOURCE_DIR}/detector/calorimeter/dual-readout/include )
 

diff --git a/FCCee/IDEA/compact/IDEA_o2_v01/DectDimensions_IDEA_o2_v01.xml b/FCCee/IDEA/compact/IDEA_o2_v01/DectDimensions_IDEA_o2_v01.xml
@@ -269,7 +269,7 @@
     <vis name="AirVis"          alpha="0.1" r="0.1"     g="0.1"     b="1.0"   showDaughters="false" visible="true"/>
     <!-- Dual-Readout Endcap Tubes vis-->
     <vis name="DRETAssemblyVis" alpha="0.05" r="1.0" g="0.0" b="0.0" showDaughters="true" visible="false"/>
-    <vis name="DRETStaveVis" alpha="0.1" r="0" g="0.0" b="1.0" showDaughters="true" visible="true"/>
+    <vis name="DRETStaveVis" alpha="0.1" r="0" g="0.0" b="1.0" showDaughters="true" visible="false"/>
     <vis name="DRETTowerVis" alpha="0.5" r="1.0" g="0.624" b="0.0" showDaughters="false" visible="true"/>
     <vis name="DRETtube_S_Vis" alpha="1.0" r="1.0" g="0.0" b="0.0" showDaughters="true" visible="true"/>
     <vis name="DRETtube_C_Vis" alpha="1.0" r="0.0" g="0.0" b="1.0" showDaughters="true" visible="true"/>

diff --git a/FCCee/IDEA/compact/IDEA_o2_v01/IDEA_o2_v01.xml b/FCCee/IDEA/compact/IDEA_o2_v01/IDEA_o2_v01.xml
@@ -58,6 +58,9 @@
   <!-- Import Endcap plate absorber -->
   <include ref="../IDEA_o1_v03/EndPlateAbsorber_o1_v01.xml"/>
 
+  <!-- Import Segmented crystal ECAL-->
+  <include ref="SCEPCal.xml"/>
+
   <!-- Import tubes-based dual-readout calorimeter -->
   <include ref="DREndcapTubes_o1_v01.xml"/>
 

diff --git a/FCCee/IDEA/compact/IDEA_o2_v01/SCEPCal.xml b/FCCee/IDEA/compact/IDEA_o2_v01/SCEPCal.xml
@@ -980,8 +980,8 @@
   </readouts>
 
   <display>
-    <vis name="projectiveFillFVis"  alpha="1"   r="0.5"  g="0.0"  b="1.0"  showDaughters="true"  visible="true"/>
-    <vis name="projectiveFillRVis"  alpha="1"   r="0.5"  g="0.5"  b="0.0"  showDaughters="true"  visible="true"/>
+    <vis name="projectiveFillFVis"  alpha="1"   r="0.0"  g="0.0"  b="1.0"  showDaughters="true"  visible="true"/>
+    <vis name="projectiveFillRVis"  alpha="1"   r="0.0"  g="0.5"  b="1.0"  showDaughters="true"  visible="true"/>
     <vis name="crystalFVis"  alpha="1"   r="0.0"  g="0.0"  b="1.0"  showDaughters="true"  visible="true"/>
     <vis name="crystalRVis"  alpha="1"   r="0.0"  g="0.5"  b="1.0"  showDaughters="true"  visible="true"/>
     <vis name="timingVisTr"  alpha="1"   r="0.0"  g="1.0"  b="0.1"  showDaughters="true"  visible="true"/>
@@ -1006,7 +1006,7 @@
   </define>
 
   <detectors>
-    <detector id="1"
+    <detector id="4"
               name="SCEPCal"
               type="SegmentedCrystalECAL" 
               readout="SCEPCal_readout"
@@ -1018,8 +1018,8 @@
       <barrel construct="true" phistart="0" phiend="128"/>
       <endcap construct="true" phistart="0" phiend="128" thetastart="10"/>
 
-      <dim    barrelHalfZ="2.25*m"
-              barrelInnerR="2*m" 
+      <dim    barrelHalfZ="1.8*m"
+              barrelInnerR="2.25*m" 
               crystalFaceWidthNominal="10*mm"
               crystalFlength="50*mm"
               crystalRlength="150*mm"