Skip to content

Incorporating prototype and other improvements into main #1

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

Merged
matclim merged 5 commits into from
Dec 16, 2025
Merged

Incorporating prototype and other improvements into main #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4abc03d
prototype ready
Dec 16, 2025
057abcf
prototype ready
Dec 16, 2025
b6a17f2
fixed the main detector setup as well
Dec 16, 2025
d08fefc
forgot to add the prototype main xml
Dec 16, 2025
8135c5d
forgot to add the prototype main xml
Dec 16, 2025
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
53 changes: 53 additions & 0 deletions DDDetectors/shipdetectors/Caloprototype.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<!-- ====================================================================== -->
<!-- -->
<!-- XML description of the 2025 Prototype SHiP Split Calorimeter -->
<!-- -->
<!-- -->
<!-- Contained are the required -->
<!-- ++ global constants used uniquely by this module -->
<!-- ++ visualization attributes -->
<!-- ++ the definition of the readout structure and the -->
<!-- readout segmentation (if necessary) -->
<!-- ++ the include statements for the sensitive detectors and -->
<!-- the corresponding support structure(s) -->
<!-- -->
<!-- -->
<!-- @author M.Climescu -->
<!-- @date 26/10/2015 -->
<!-- -->
<!-- ====================================================================== -->

<lccdd>

<includes>
<file ref="elements.xml"/>
<file ref="materials.xml"/>
</includes>

<define>
<include ref="SHiPConstants.xml"/>
</define>

<regions>
<region name="Downstream" eunit="MeV" lunit="cm" cut="0.001" threshold="0.001">
<limitsetref name="PlaceHolderLimit"/>
</region>
</regions>

<!-- Common Generic visualization attributes -->
<display>
<vis name="InvisibleNoDaughters" showDaughters="false" visible="false"/>
<vis name="InvisibleWithDaughters" showDaughters="true" visible="false"/>
<vis name="GreenVis" alpha="1" r="0.0" g="1.0" b="0.0" showDaughters="true" visible="true"/>
<vis name="RedVis" alpha="1" r="1.0" g="0.0" b="0.0" showDaughters="true" visible="true"/>
<vis name="BlueVis" alpha="1" r="0.0" g="0.0" b="1.0" showDaughters="true" visible="true"/>
<vis name="Debugbox" alpha="0.3" r="0.4" g="0.3" b="0.3" showDaughters="true" visible="true"/>
</display>


<comment>Calorimeters</comment>
<include ref="Detectors/PID/Prototypes/ProtoECAL.xml"/>
<include ref="Detectors/PID/Prototypes/ProtoHCAL.xml"/>


</lccdd>
0 ...shipdetectors/Detectors/ECAL/SplitCal.xml → ...detectors/Detectors/PID/ECAL/SplitCal.xml
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions ...detectors/Detectors/ECAL/SplitCalBars.xml → ...ctors/Detectors/PID/ECAL/SplitCalBars.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
<comment>SplitCal test</comment>
<box x="216*cm" y="216*cm" z="1.7*m" repeat="1" vis="InvisibleWithDaughters" >
</box>
<widebar x="6*cm" y="2.16*m" z="1*cm" num_x="36" x_extra_spacing="0*cm" z_spacing="2.56*cm" extrazgap="0*cm" vis="SplitCalWideSensitiveVis" >
<widebar x="6*cm" y="2.16*m" z="1*cm" num_x="36" x_extra_spacing="0*cm" z_spacing="2.56*cm" extrazgap="0*cm" x_offset="0*cm" y_offset="0*cm" vis="SplitCalWideSensitiveVis" >
<material name = "PVT" sensitive = "true">
</material>
</widebar>
<thinbar x="1*cm" y="2.16*m" z="1*cm" num_x="216" x_extra_spacing="0*cm" z_spacing="2.56*cm" extrazgap="0*cm" vis="SplitCalThinSensitiveVis">
<thinbar x="1*cm" y="2.16*m" z="1*cm" num_x="216" x_extra_spacing="0*cm" z_spacing="2.56*cm" x_offset="0*cm" y_offset="0*cm" extrazgap="0*cm" vis="SplitCalThinSensitiveVis">
<material name = "PVT" sensitive = "true">
</material>
</thinbar>
Expand Down Expand Up @@ -49,11 +49,11 @@
<comment>SplitCal test</comment>
<box x="216*cm" y="216*cm" z="1.7*m" repeat="1" vis="InvisibleWithDaughters" >
</box>
<widebar x="6*cm" y="2.16*m" z="1*cm" num_x="36" x_extra_spacing="0*cm" z_spacing="2.56*cm" extrazgap="0*cm" vis="SplitCalWideSensitiveVis" >
<widebar x="6*cm" y="2.16*m" z="1*cm" num_x="36" x_extra_spacing="0*cm" z_spacing="2.56*cm" extrazgap="0*cm" x_offset="0*cm" y_offset="0*cm" vis="SplitCalWideSensitiveVis" >
<material name = "PVT" sensitive = "true">
</material>
</widebar>
<thinbar x="1*cm" y="2.16*m" z="1*cm" num_x="216" x_extra_spacing="0*cm" z_spacing="2.56*cm" extrazgap="0*cm" vis="SplitCalThinSensitiveVis">
<thinbar x="1*cm" y="2.16*m" z="1*cm" num_x="216" x_extra_spacing="0*cm" z_spacing="2.56*cm" extrazgap="0*cm" x_offset="0*cm" y_offset="0*cm" vis="SplitCalThinSensitiveVis">
<material name = "PVT" sensitive = "true">
</material>
</thinbar>
Expand Down
0 ...ectors/Detectors/ECAL/SplitCalBars_bu.xml → ...rs/Detectors/PID/ECAL/SplitCalBars_bu.xml
View file
Open in desktop
File renamed without changes.
0 ...detectors/Detectors/ECAL/SplitCalTest.xml → ...ctors/Detectors/PID/ECAL/SplitCalTest.xml
View file
Open in desktop
File renamed without changes.
0 ...detectors/Detectors/ECAL/SplitCal_old.xml → ...ctors/Detectors/PID/ECAL/SplitCal_old.xml
View file
Open in desktop
File renamed without changes.
0 ...ors/shipdetectors/Detectors/HCAL/HCAL.xml → ...shipdetectors/Detectors/PID/HCAL/HCAL.xml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...shipdetectors/Detectors/HCAL/HCALBars.xml → ...detectors/Detectors/PID/HCAL/HCALBars.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<material name = "Iron" sensitive = "false">
</material>
</passive_layer>
<position x="0*cm" y="0*cm" z="0*cm">
<position x="0*cm" y="0*cm" z="220*cm">
</position>
<rotation x="0" y="0" z="0">
</rotation>
Expand Down
54 changes: 54 additions & 0 deletions DDDetectors/shipdetectors/Detectors/PID/Prototypes/ProtoECAL.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<!-- ====================================================================== -->
<!-- -->
<!-- XML description of the complete SiD tracker detector -->
<!-- of the SiD linear collider detector design. -->
<!-- -->
<!-- Contained are the required -->
<!-- ++ global constants used uniquely by this module -->
<!-- ++ visualization attributes -->
<!-- ++ the definition of the readout structure and the -->
<!-- readout segmentation (if necessary) -->
<!-- ++ the include statements for the sensitive detectors and -->
<!-- the corresponding support structure(s) -->
<!-- -->
<!-- -->
<!-- @author M.Frank -->
<!-- @date 14/11/2014 -->
<!-- -->
<!-- ====================================================================== -->

<lccdd>
<!-- Definition of global dictionary constants -->
<define>
</define>

<!-- Definition of the used visualization attributes -->
<display>
<vis name="SplitCalWideSensitiveVis" alpha="0.8" r="0.0" g="0.0" b="1.0" showDaughters="true" visible="true"/>
<vis name="SplitCalThinSensitiveVis" alpha="0.8" r="1.0" g="0.5" b="0.0" showDaughters="true" visible="true"/>
<vis name="SplitCalHPLVis" alpha="0.8" r="0.0" g="0.6" b="0.0" showDaughters="true" visible="true"/>
<vis name="SplitCalAbsorberVis" alpha="1.0" r="1.0" g="0.0" b="0.0" showDaughters="true" visible="true"/>
<vis name="TransparentVis" alpha="0.0" r="0.4" g="0.4" b="0.0" showDaughters="true" visible="false"/>
</display>

<!-- Definition of the readout segmentation/definition -->
<readouts>
<readout name="SplitCalWideBarHits">
<segmentation type="CartesianGridXY" grid_size_x="6*cm" grid_size_y="6*cm" offset_x="-108*cm" offset_y="-108*cm"/>
<id>system:8,splitcal_bar:6,splitcal_layer:6,x:22,y:22</id>
</readout>
<readout name="SplitCalThinBarHits">
<segmentation type="CartesianGridXY" grid_size_x="1*cm" grid_size_y="1*cm" offset_x="-108*cm" offset_y="-108*cm"/>
<id>system:8,splitcal_bar:8,splitcal_layer:8,x:20,y:20</id>
</readout>
<readout name="SplitCalHPLHits">
<segmentation type="CartesianGridXY" grid_size_x="0.1*mm" grid_size_y="0.1*mm" offset_x="-108*cm" offset_y="-108*cm"/>
<id>system:8,splitcal_layer:4,splitcal_hpl_layer:4,splitcal_hplfibre:12,x:16,y:16</id>
</readout>
</readouts>

<!-- Includes for sensitives and support -->
<include ref="ProtoECALBars.xml"/>
<!--
-->
</lccdd>
85 changes: 85 additions & 0 deletions DDDetectors/shipdetectors/Detectors/PID/Prototypes/ProtoECALBars.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
<!-- ====================================================================== -->
<!-- -->
<!-- XML description of the SHiP Split Calorimeter scintillator bars -->
<!-- and passive layers -->
<!-- Author: M.Climescu -->
<!-- Date: 28/10/2025 -->
<!-- -->
<!-- ====================================================================== -->

<detectors>
<detector id=0 name="SplitCalTest_Base_and_wide_bars" type="DD4hep_SplitCalWideBars_and_Basis" reflect="true" readout="SplitCalWideBarHits" vis="SplitCalVis" calorimeterType="EM" layer_codes="74777777177777477777727777747777771777774777777287777747777771777774777777277777477777717777747777772777774" hpln_fibre_layers="0">
<comment>SplitCal test</comment>
<box x="56*cm" y="56*cm" z="1.2*m" repeat="1" vis="Debugbox" >
</box>
<widebar x="6*cm" y="36*cm" z="1*cm" num_x="6" x_extra_spacing="0*cm" z_spacing="2.56*cm" extrazgap="0.5*cm" x_offset="0*cm" y_offset="0*cm" vis="SplitCalWideSensitiveVis" >
<material name = "PVT" sensitive = "true">
</material>
</widebar>
<thinbar x="1*cm" y="2.16*m" z="1*cm" num_x="216" x_extra_spacing="0*cm" z_spacing="2.56*cm" extrazgap="0.5*cm" vis="SplitCalThinSensitiveVis">
<material name = "PVT" sensitive = "true">
</material>
</thinbar>
<hplbox x="2.16*m" y="2.16*m" z="1*cm" extrazgap="0*cm" vis="SplitCalHPLVis">
<material name = "Aluminium" sensitive = "false">
</material>
</hplbox>
<hplfibre rmax="0.6*mm" y="2.16*m" z="3.6*mm" thickness="0.1*mm" extrazgap="0*cm" vis="SplitCalHPLVis">
<material name = "Polysterene" sensitive = "false">
</material>
</hplfibre>
<hplcore rmax="0.6*mm" y="2.16*m" z="3.6*mm" thickness="0.1*mm" extrazgap="0*cm" vis="SplitCalHPLVis">
<material name = "Polysterene" sensitive = "true">
</material>
</hplcore>
<passive_layer x="56*cm" y="56*cm" z="0.4*cm" vis="SplitCalPassiveVis" >
<material name = "IronPlate" sensitive = "false">
</material>
</passive_layer>
<split x="56*cm" y="56*cm" z="20*cm" vis="InvisibleWithDaughters" >
<material name = "Air" sensitive = "false">
</material>
</split>
<position x="0*cm" y="0*cm" z="0">
</position>
<rotation x="0" y="0" z="0">
</rotation>
</detector>
<detector id=1 name="SplitCalTest_Thin" type="DD4hep_SplitCalThinBars" reflect="true" readout="SplitCalThinBarHits" vis="SplitCalVis" calorimeterType="EM" layer_codes="74777777177777477777727777747777771777774777777287777747777771777774777777277777477777717777747777772777774" hpln_fibre_layers="3">
<comment>SplitCal test</comment>
<box x="56*cm" y="56*cm" z="1.2*m" repeat="1" vis="Debugbox" >
</box>
<widebar x="6*cm" y="2.16*m" z="1*cm" num_x="36" x_extra_spacing="0*cm" z_spacing="2.56*cm" extrazgap="0.5*cm" vis="SplitCalWideSensitiveVis" >
<material name = "PVT" sensitive = "true">
</material>
</widebar>
<thinbar x="1*cm" y="20*cm" z="1*cm" num_x="20" x_extra_spacing="0*cm" z_spacing="2.56*cm" extrazgap="0.5*cm" x_offset="0*cm" y_offset="0*cm" vis="SplitCalThinSensitiveVis">
<material name = "PVT" sensitive = "true">
</material>
</thinbar>
<hplbox x="2.16*m" y="2.16*m" z="1*cm" extrazgap="0*cm" vis="SplitCalHPLVis">
<material name = "Aluminium" sensitive = "false">
</material>
</hplbox>
<hplfibre rmax="0.6*mm" y="2.16*m" z="3.6*mm" thickness="0.1*mm" extrazgap="0*cm" vis="SplitCalHPLVis">
<material name = "Polysterene" sensitive = "false">
</material>
</hplfibre>
<hplcore rmax="0.6*mm" y="2.16*m" z="3.6*mm" thickness="0.1*mm" extrazgap="0*cm" vis="SplitCalHPLVis">
<material name = "Polysterene" sensitive = "true">
</material>
</hplcore>
<passive_layer x="2.16*m" y="2.16*m" z="0.4*cm" vis="SplitCalPassiveVis" >
<material name = "IronPlate" sensitive = "false">
</material>
</passive_layer>
<split x="2.16*m" y="2.16*m" z="20*cm" vis="InvisibleWithDaughters" >
<material name = "Air" sensitive = "false">
</material>
</split>
<position x="0*cm" y="0*cm" z="0">
</position>
<rotation x="0" y="0" z="0">
</rotation>
</detector>
</detectors>
43 changes: 43 additions & 0 deletions DDDetectors/shipdetectors/Detectors/PID/Prototypes/ProtoHCAL.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<!-- ====================================================================== -->
<!-- -->
<!-- XML description of the complete SiD tracker detector -->
<!-- of the SiD linear collider detector design. -->
<!-- -->
<!-- Contained are the required -->
<!-- ++ global constants used uniquely by this module -->
<!-- ++ visualization attributes -->
<!-- ++ the definition of the readout structure and the -->
<!-- readout segmentation (if necessary) -->
<!-- ++ the include statements for the sensitive detectors and -->
<!-- the corresponding support structure(s) -->
<!-- -->
<!-- -->
<!-- @author M.Frank -->
<!-- @date 14/11/2014 -->
<!-- -->
<!-- ====================================================================== -->

<lccdd>
<!-- Definition of global dictionary constants -->
<define>
</define>

<!-- Definition of the used visualization attributes -->
<display>
<vis name="HCALSensitiveVis" alpha="0.8" r="0.0" g="0.0" b="1.0" showDaughters="true" visible="true"/>
<vis name="HCALAbsorberVis" alpha="1.0" r="1.0" g="0.0" b="0.0" showDaughters="true" visible="true"/>
</display>

<!-- Definition of the readout segmentation/definition -->
<readouts>
<readout name="SHiPHCALHits">
<segmentation type="CartesianGridXY" grid_size_x="2.65*cm" grid_size_y="2.65*cm" offset_x="-108*cm" offset_y="-108*cm" />
<id>system:8,hcal_layer:4,widebar:10,hcal_passivelayer:1,x:16,y:16</id>
</readout>
</readouts>

<!-- Includes for sensitives and support -->
<include ref="ProtoHCALBars.xml"/>
<!--
-->
</lccdd>
28 changes: 28 additions & 0 deletions DDDetectors/shipdetectors/Detectors/PID/Prototypes/ProtoHCALBars.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<!-- ====================================================================== -->
<!-- -->
<!-- XML description of the SHiP HCAL scintillator bars -->
<!-- and passive layers -->
<!-- Author: M.Climescu -->
<!-- Date: 28/10/2025 -->
<!-- -->
<!-- ====================================================================== -->

<detectors>
<detector id=4 name="HCAL_module" type="DD4hep_SHiPHCAL" reflect="true" readout="SHiPHCALHits" vis="SplitCalVis" calorimeterType="HCAL" layer_codes="7171717171">
<comment>HCAL test</comment>
<box x="36*cm" y="36*cm" z="1.4*m" repeat="1" vis="Debugbox" >
</box>
<bar x="6*cm" y="36*cm" z="1*cm" num_x="6" x_extra_spacing="0*cm" z_spacing="0*m" extrazgap="4*cm" vis="HCALSensitiveVis" >
<material name = "PVT" sensitive = "true">
</material>
</bar>
<passive_layer x="36*cm" y="36*cm" z="17.0*cm" x_spacing="12*cm" vis="SplitCalPassiveVis" >
<material name = "IronPlate" sensitive = "false">
</material>
</passive_layer>
<position x="0*cm" y="0*cm" z="120*cm">
</position>
<rotation x="0" y="0" z="0">
</rotation>
</detector>
</detectors>
2 changes: 1 addition & 1 deletion DDDetectors/shipdetectors/SHiPCalo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@


<comment>Calorimeters</comment>
<include ref="Detectors/ECAL/SplitCal.xml"/>
<include ref="Detectors/PID/ECAL/SplitCal.xml"/>


</lccdd>
7 changes: 7 additions & 0 deletions DDDetectors/shipdetectors/materials.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@
<composite n="1" ref="Pb"/>
</material>


<material name="IronPlate">
<D value="7.874" unit="g/cm3" />
<composite n="1" ref="Fe"/>
</material>


<material name="AluminiumPlate">
<D value="2.7" unit="g/cm3" />
<composite n="1" ref="Al"/>
Expand Down
Loading
Loading