Skip to content
Snippets Groups Projects
Commit 0cf421bc authored by Whitney Armstrong's avatar Whitney Armstrong
Browse files

Resolve "Adjust ecal parameterization with max number of layers"

parent 359a1539
Branches
No related tags found
1 merge request!117Resolve "Adjust ecal parameterization with max number of layers"
Pipeline #9685 failed
......@@ -65,21 +65,12 @@ common:detector:
- mkdir -p config
- print_env.sh
compile:
stage: build
rules:
- if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"'
needs:
- ["common:detector"]
script:
- echo "Build successful."
.views:
stage: docs
rules:
- if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"'
needs:
- ["compile"]
- ["common:detector"]
include:
- local: 'views/view1.yml'
......@@ -133,7 +124,7 @@ overlap_check:
rules:
- if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"'
needs:
- ["compile"]
- ["common:detector"]
script:
- checkOverlaps -c ${DETECTOR_PATH}/topside.xml | tee doc/overlap_check.out
- echo "$(cat doc/overlap_check.out | grep ovlp | wc -l) overlaps..."
......@@ -144,7 +135,7 @@ topside:config_testing:
rules:
- if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"'
needs:
- ["compile"]
- ["common:detector"]
script:
- checkOverlaps -c ${DETECTOR_PATH}/topside.xml | tee doc/overlap_check.out | wc -l
- cat doc/overlap_check.out
......
......@@ -110,8 +110,7 @@
-->
<include ref="topside/beampipe.xml"/>
<include ref="topside/silicon_tracker.xml"/>
<!--<include ref="topside/ecal.xml"/>--> <comment> old version of em barrel - SiW sampling design </comment>
<include ref="topside/ecal_wAstroPixSiW.xml"/> <comment> new version of em barrel - SiW AstroPix sampling design </comment>
<include ref="topside/ecal.xml"/>
<include ref="topside/hcal.xml"/>
<include ref="topside/solenoid.xml"/>
<include ref="topside/forward_rich.xml"/>
......
......@@ -23,25 +23,15 @@
<display>
</display>
<detectors>
<include ref="ecal_barrel.xml"/>
<detectors>
<comment>
-------------------
Dummy Plane Tracker
-------------------
Plane tracker that gives momentum of incident particles before crystal endcap calorimeter (backward)
</comment>
<!--
<detector
id = "100"
name = "DummyPlaneTracker"
type = "PlaneTracker"
readout ="PlaneTrackerHits"
vis = "GreenVis">
<dimensions x = "700.0*mm" y = "700.0*mm" z= "1.0*mm" rmin= "VertexTrackerInnerRadius+5.0*mm" rmax="EcalEndcapN_rmin+10.0*mm"/>
<position x ="0.0*m" y ="0.0*m" z="CrystalEndcap_z_pos/2.0 + 10.0*mm"/>
</detector>
-->
<comment>
-------------------
......@@ -59,46 +49,6 @@
<dimensions rmin="CrystalEndcap_rmin" rmax="CrystalEndcap_rmax" x="CrystalBox_x_length" y="CrystalBox_y_length" z="CrystalBox_z_length" delta="CrystalBox_offset"/>
</detector>
<comment>
---------------------
Barrel EM Calorimeter
---------------------
A layered EM calorimeter with tungsten and silicon (or scintillator) strips
</comment>
<detector
id="ECalBarrel_ID"
name="EcalBarrel"
type="DD4hep_EcalBarrel"
readout="EcalBarrelHits"
calorimeterType="EM_BARREL">
<dimensions
numsides="CaloSides"
rmin="EcalBarrel_rmin"
z="EcalBarrelLength"/>
<staves vis="EcalBarrelVis"/>
<layer repeat="1">
<slice material="Silicon" thickness="EcalSiliconThickness" sensitive="yes" limits="cal_limits"/>
<slice material="Copper" thickness="EcalCopperThickness"/>
<slice material="Kapton" thickness="EcalKaptonThickness"/>
<slice material="Air" thickness="EcalAir1Thickness"/>
</layer>
<layer repeat="EcalBarrelThinLayers">
<slice material="TungstenDens24" thickness="EcalThinTungstenThickness"/>
<slice material="Air" thickness="EcalAir2Thickness"/>
<slice material="Silicon" thickness="EcalSiliconThickness" sensitive="yes" limits="cal_limits"/>
<slice material="Copper" thickness="EcalCopperThickness"/>
<slice material="Kapton" thickness="EcalKaptonThickness"/>
<slice material="Air" thickness="EcalAir1Thickness"/>
</layer>
<layer repeat="EcalBarrelThickLayers">
<slice material="TungstenDens24" thickness="EcalThickTungstenThickness"/>
<slice material="Air" thickness="EcalAir2Thickness"/>
<slice material="Silicon" thickness="EcalSiliconThickness" sensitive="yes" limits="cal_limits"/>
<slice material="Copper" thickness="EcalCopperThickness"/>
<slice material="Kapton" thickness="EcalKaptonThickness"/>
<slice material="Air" thickness="EcalAir1Thickness"/>
</layer>
</detector>
<comment>
-----------------------------
......@@ -198,10 +148,6 @@
<segmentation type="CartesianGridXY" grid_size_x="CrystalBox_x_length" grid_size_y="CrystalBox_y_length" />
<id>system:8,sector:4,module:20,x:48:-8,y:-8</id>
</readout>
<readout name="EcalBarrelHits">
<segmentation type="CartesianGridXY" grid_size_x="3.5 * mm" grid_size_y="3.5 * mm"/>
<id>system:8,barrel:3,module:4,layer:6,slice:5,x:32:-16,y:-16</id>
</readout>
<readout name="EcalEndcapHits">
<segmentation type="CartesianGridXY" grid_size_x="3.5 * mm" grid_size_y="3.5 * mm"/>
<id>system:8,barrel:3,module:4,layer:6,slice:5,x:32:-16,y:-16</id>
......
<lccdd>
<define>
<constant name="EcalBarrelLayers_nMax" value="20"/>
</define>
<limits>
</limits>
<regions>
</regions>
<display>
</display>
<detectors>
<comment>
---------------------
Barrel EM Calorimeter
---------------------
A layered EM calorimeter with tungsten and silicon (AstroPix)
</comment>
<detector
id="ECalBarrelAstroPix_ID"
name="EcalBarrel"
type="DD4hep_EcalBarrel"
readout="EcalBarrelHits"
calorimeterType="EM_BARREL">
<dimensions numsides="EcalBarrelAstroPix_ModRepeat" rmin="EcalBarrelAstroPix_RMin" z="EcalBarrelAstroPix_Length"/>
<staves vis="EcalBarrelVis"/>
<layer repeat="EcalBarrelAstroPix_ReadoutLayerNumber">
<slice material="Silicon" thickness="EcalBarrelAstroPix_SiliconThickness" sensitive="yes" limits="cal_limits"/>
<slice material="Silicon" thickness="EcalBarrelAstroPix_ElectronicsThickness"/>
<slice material="Copper" thickness="EcalBarrelAstroPix_CopperThickness"/>
<slice material="Kapton" thickness="EcalBarrelAstroPix_KaptonThickness"/>
<slice material="Epoxy" thickness="EcalBarrelAstroPix_EpoxyThickness"/>
<slice material="CarbonFiber" thickness="EcalBarrelAstroPix_CarbonThickness"/>
<slice material="TungstenDens24" thickness="EcalBarrelAstroPix_TungstenThickness"/>
<slice material="Air" thickness="EcalBarrelAstroPix_LayerSpacing - EcalBarrelAstroPix_TungstenThickness"/>
</layer>
</detector>
</detectors>
<readouts>
<readout name="EcalBarrelHits">
<segmentation type="CartesianGridXY" grid_size_x="0.5 * mm" grid_size_y="0.5 * mm"/>
<id>system:8,barrel:3,module:4,layer:10,slice:5,x:32:-16,y:-16</id>
</readout>
</readouts>
</lccdd>
<lccdd>
<define>
<constant name="CrystalEndcap_rmin" value="VertexTrackerInnerRadius"/>
<constant name="CrystalEndcap_rmax" value="EcalEndcapN_rmin"/>
<constant name="CrystalBox_x_length" value="20.0*mm"/>
<constant name="CrystalBox_y_length" value="20.0*mm"/>
<constant name="CrystalBox_z_length" value="200.0*mm"/>
<constant name="CrystalBox_offset" value="0.000001*mm"/>
<constant name="CrystalEndcap_x_pos" value="0.0*m"/>
<constant name="CrystalEndcap_y_pos" value="0.0*m"/>
<constant name="CrystalEndcap_z_pos" value="-EcalEndcap_zmin"/>
</define>
<limits>
</limits>
<regions>
</regions>
<!-- Common Generic visualization attributes -->
<comment>Common Generic visualization attributes</comment>
<display>
</display>
<detectors>
<comment>
-------------------
Dummy Plane Tracker
-------------------
Plane tracker that gives momentum of incident particles before crystal endcap calorimeter (backward)
</comment>
<!--
<detector
id = "100"
name = "DummyPlaneTracker"
type = "PlaneTracker"
readout ="PlaneTrackerHits"
vis = "GreenVis">
<dimensions x = "700.0*mm" y = "700.0*mm" z= "1.0*mm" rmin= "VertexTrackerInnerRadius+5.0*mm" rmax="EcalEndcapN_rmin+10.0*mm"/>
<position x ="0.0*m" y ="0.0*m" z="CrystalEndcap_z_pos/2.0 + 10.0*mm"/>
</detector>
-->
<comment>
-------------------
Crystal Calorimeter
-------------------
Backward (negative pseudorapidity) angle electron detector
</comment>
<detector
id="CrystalEndcap_ID"
name="ElectronECAL"
type="CrystalCalorimeterEndcap"
readout="CrystalEcalHits"
vis="GreenVis">
<position x="CrystalEndcap_x_pos" y="CrystalEndcap_y_pos" z="CrystalEndcap_z_pos" />
<dimensions rmin="CrystalEndcap_rmin" rmax="CrystalEndcap_rmax" x="CrystalBox_x_length" y="CrystalBox_y_length" z="CrystalBox_z_length" delta="CrystalBox_offset"/>
</detector>
<comment>
---------------------
Barrel EM Calorimeter
---------------------
A layered EM calorimeter with tungsten and silicon (AstroPix)
</comment>
<detector
id="ECalBarrelAstroPix_ID"
name="EcalBarrel"
type="DD4hep_EcalBarrel"
readout="EcalBarrelHits"
calorimeterType="EM_BARREL">
<dimensions numsides="EcalBarrelAstroPix_ModRepeat" rmin="EcalBarrelAstroPix_RMin" z="EcalBarrelAstroPix_Length"/>
<staves vis="EcalBarrelVis"/>
<layer repeat="EcalBarrelAstroPix_ReadoutLayerNumber">
<slice material="Silicon" thickness="EcalBarrelAstroPix_SiliconThickness" sensitive="yes" limits="cal_limits"/>
<slice material="Silicon" thickness="EcalBarrelAstroPix_ElectronicsThickness"/>
<slice material="Copper" thickness="EcalBarrelAstroPix_CopperThickness"/>
<slice material="Kapton" thickness="EcalBarrelAstroPix_KaptonThickness"/>
<slice material="Epoxy" thickness="EcalBarrelAstroPix_EpoxyThickness"/>
<slice material="CarbonFiber" thickness="EcalBarrelAstroPix_CarbonThickness"/>
<slice material="TungstenDens24" thickness="EcalBarrelAstroPix_TungstenThickness"/>
<slice material="Air" thickness="EcalBarrelAstroPix_LayerSpacing - EcalBarrelAstroPix_TungstenThickness"/>
</layer>
</detector>
<comment>
-----------------------------
Forward Endcap EM Calorimeter
-----------------------------
A layered EM calorimeter with tungsten and silicon (or scintillator) strips
</comment>
<detector id="ECalEndcapP_ID"
name="EcalEndcapP"
type="DD4hep_PolyhedraEndcapCalorimeter2"
reflect="false"
readout="EcalEndcapHits"
vis="EcalEndcapVis"
calorimeterType="EM_ENDCAP" >
<dimensions
numsides="CaloSides"
zmin="EcalEndcap_zmin"
rmin="EcalEndcapP_rmin"
rmax="EcalBarrel_rmax " />
<layer repeat="1">
<slice material="Silicon" thickness="EcalSiliconThickness" sensitive="yes" limits="cal_limits"/>
<slice material="Copper" thickness="EcalCopperThickness"/>
<slice material="Kapton" thickness="EcalKaptonThickness"/>
<slice material="Air" thickness="EcalAir1Thickness"/>
</layer>
<layer repeat="EcalEndcapThinLayers">
<slice material="TungstenDens24" thickness="EcalThinTungstenThickness"/>
<slice material="Air" thickness="EcalAir2Thickness"/>
<slice material="Silicon" thickness="EcalSiliconThickness" sensitive="yes" limits="cal_limits"/>
<slice material="Copper" thickness="EcalCopperThickness"/>
<slice material="Kapton" thickness="EcalKaptonThickness"/>
<slice material="Air" thickness="EcalAir1Thickness"/>
</layer>
<layer repeat="EcalEndcapThickLayers">
<slice material="TungstenDens24" thickness="EcalThickTungstenThickness"/>
<slice material="Air" thickness="EcalAir2Thickness"/>
<slice material="Silicon" thickness="EcalSiliconThickness" sensitive="yes" limits="cal_limits"/>
<slice material="Copper" thickness="EcalCopperThickness"/>
<slice material="Kapton" thickness="EcalKaptonThickness"/>
<slice material="Air" thickness="EcalAir1Thickness"/>
</layer>
</detector>
<comment>
-------------------------------
Backwards Endcap EM Calorimeter
-------------------------------
A layered EM calorimeter with tungsten and silicon (or scintillator) strips
</comment>
<detector id="ECalEndcapN_ID"
name="EcalEndcapN"
type="topside_PolyhedraEndcapCalorimeter2"
reflect="true"
readout="EcalEndcapHits"
vis="EcalEndcapVis"
calorimeterType="EM_ENDCAP">
<dimensions
numsides="CaloSides"
zmin="EcalEndcap_zmin"
rmin="EcalEndcapN_rmin"
rmax="EcalBarrel_rmax " />
<layer repeat="1">
<slice material="Silicon" thickness="EcalSiliconThickness" sensitive="yes" limits="cal_limits"/>
<slice material="Copper" thickness="EcalCopperThickness"/>
<slice material="Kapton" thickness="EcalKaptonThickness"/>
<slice material="Air" thickness="EcalAir1Thickness"/>
</layer>
<layer repeat="EcalEndcapThinLayers">
<slice material="TungstenDens24" thickness="EcalThinTungstenThickness"/>
<slice material="Air" thickness="EcalAir2Thickness"/>
<slice material="Silicon" thickness="EcalSiliconThickness" sensitive="yes" limits="cal_limits"/>
<slice material="Copper" thickness="EcalCopperThickness"/>
<slice material="Kapton" thickness="EcalKaptonThickness"/>
<slice material="Air" thickness="EcalAir1Thickness"/>
</layer>
<layer repeat="EcalEndcapThickLayers">
<slice material="TungstenDens24" thickness="EcalThickTungstenThickness"/>
<slice material="Air" thickness="EcalAir2Thickness"/>
<slice material="Silicon" thickness="EcalSiliconThickness" sensitive="yes" limits="cal_limits"/>
<slice material="Copper" thickness="EcalCopperThickness"/>
<slice material="Kapton" thickness="EcalKaptonThickness"/>
<slice material="Air" thickness="EcalAir1Thickness"/>
</layer>
</detector>
</detectors>
<!-- Definition of the readout segmentation/definition -->
<readouts>
<!--
<readout name="PlaneTrackerHits">
<segmentation type="CartesianGridXY" grid_size_x="20.0*mm" grid_size_y="20.0*mm" />
<id>system:5,module:4,x:32:-16,y:-16</id>
</readout>
-->
<readout name="CrystalEcalHits">
<segmentation type="CartesianGridXY" grid_size_x="CrystalBox_x_length" grid_size_y="CrystalBox_y_length" />
<id>system:8,sector:4,module:20,x:48:-8,y:-8</id>
</readout>
<readout name="EcalBarrelHits">
<segmentation type="CartesianGridXY" grid_size_x="0.5 * mm" grid_size_y="0.5 * mm"/>
<id>system:8,barrel:3,module:4,layer:10,slice:5,x:32:-16,y:-16</id>
</readout>
<readout name="EcalEndcapHits">
<segmentation type="CartesianGridXY" grid_size_x="3.5 * mm" grid_size_y="3.5 * mm"/>
<id>system:8,barrel:3,module:4,layer:6,slice:5,x:32:-16,y:-16</id>
</readout>
</readouts>
<plugins>
</plugins>
<fields>
</fields>
</lccdd>
......@@ -38,8 +38,6 @@ view_11:
rules:
- if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"'
needs:
- job: compile
optional: false
- job: dawn_view_11:detector
optional: false
- job: dawn_view_11:ev001
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment