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

Fall back to working detectors from dd4hep/topside 

	modified:   compact/ecal.xml
	modified:   reference_detector.xml
parent 97d790a8
No related branches found
No related tags found
1 merge request!7Resolve "Translate cb_EMCAL"
Pipeline #7551 failed
Stage: config
Stage: build
Stage: docs
Stage: test
Stage: finalize
Stage: deploy
This commit is part of merge request !7. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
compact/ecal.xml
+ 15
− 75
View file @ 902975fb
<lccdd> <lccdd>
<define> <define>
<constant name="cb_EMCAL_ID" value="20"/> <constant name="CrystalEndcap_rmin" value="VertexTrackerInnerRadius"/>
<comment> <constant name="CrystalEndcap_rmax" value="EcalEndcapN_rmin"/>
------------ <constant name="CrystalBox_x_length" value="20.0*mm"/>
Calorimeters <constant name="CrystalBox_y_length" value="20.0*mm"/>
------------ <constant name="CrystalBox_z_length" value="200.0*mm"/>
</comment> <constant name="CrystalBox_offset" value="0.000001*mm"/>
<constant name="EcalBarrel_rmin" value="1000*mm"/> <constant name="CrystalEndcap_x_pos" value="0.0*m"/>
<constant name="HcalBarrel_rmax" value="Solenoid_rmin - 5.0 *cm "/> <constant name="CrystalEndcap_y_pos" value="0.0*m"/>
<constant name="AvailTotalBarrelCalorimetryThickness" value="HcalBarrel_rmax - EcalBarrel_rmin"/> <constant name="CrystalEndcap_z_pos" value="-EcalEndcap_zmin"/>
<constant name="CalBarrelDivider" value="0.5"/> <comment> Ecal and Hcal have the same thickness </comment>
<constant name="EcalBarrelAvailTotalThickness" value="AvailTotalBarrelCalorimetryThickness * CalBarrelDivider"/>
<constant name="HcalBarrelAvailTotalThickness" value="AvailTotalBarrelCalorimetryThickness * (1.0 - CalBarrelDivider)"/>
<constant name="EcalBarrelLength" value="SiliconTrackerOuterBarrelLength+50.0*cm"/>
<constant name="EcalEndcap_zmin" value="EcalBarrelLength/2.0"/>
<constant name="AvailTotalEndcapCalorimetryThickness" value="(SolenoidYokeEndcap_zmin - 10.0 * mm) - (EcalEndcap_zmin + 10.0 * mm)"/>
<constant name="CalEndcapDivider" value="0.5"/> <comment> Ecal and Hcal have the same thickness </comment>
<constant name="EcalEndcapAvailTotalThickness" value="AvailTotalEndcapCalorimetryThickness * CalEndcapDivider"/>
<constant name="HcalEndcapAvailTotalThickness" value="AvailTotalEndcapCalorimetryThickness * (1.0 - CalEndcapDivider)"/>
<comment> These need to be set in sync with the forward and backward detectors </comment>
<constant name="EcalEndcapP_rmin" value="250.0*mm"/>
<constant name="EcalEndcapN_rmin" value="350.0*mm"/>
<constant name="HcalEndcapP_rmin" value="250.0 * mm"/>
<constant name="HcalEndcapN_rmin" value="350.0 * mm"/>
<comment>
-------------------------
EM Calorimeter Parameters
-------------------------
</comment>
<constant name="CaloSides" value="12"/>
<comment>Material Thickness</comment>
<constant name="EcalSiliconThickness" value="9.00 * mm"/>
<constant name="EcalCopperThickness" value="0.05 * mm"/>
<constant name="EcalKaptonThickness" value="0.30 * mm"/>
<constant name="EcalAir1Thickness" value="0.33 * mm"/>
<constant name="EcalAir2Thickness" value="0.25 * mm"/>
<constant name="EcalThinTungstenThickness" value="2.50 * mm"/>
<constant name="EcalThickTungstenThickness" value="5.00 * mm"/>
<comment> Layer Thickness </comment>
<constant name="EcalFirstLayerThickness"
value="EcalSiliconThickness + EcalCopperThickness + EcalKaptonThickness + EcalAir1Thickness"/>
<constant name="EcalThinOneLayerThickness"
value="EcalThinTungstenThickness + EcalAir2Thickness + EcalSiliconThickness + EcalCopperThickness + EcalKaptonThickness + EcalAir1Thickness"/>
<constant name="EcalThickOneLayerThickness"
value="EcalThickTungstenThickness + EcalAir2Thickness + EcalSiliconThickness + EcalCopperThickness + EcalKaptonThickness + EcalAir1Thickness"/>
<comment> EM Barrel N Layer; same number of layers for EcalThin and EcalThick</comment>
<constant name="EcalBarrelLayers"
value="floor((EcalBarrelAvailTotalThickness - EcalFirstLayerThickness) / (EcalThinOneLayerThickness + EcalThickOneLayerThickness))"/>
<constant name="EcalBarrelThinLayers" value="EcalBarrelLayers"/>
<constant name="EcalBarrelThickLayers" value="EcalBarrelLayers"/>
<comment> EM Barrel Thickness </comment>
<constant name="EcalBarrelThickness"
value="EcalFirstLayerThickness + (EcalBarrelThinLayers * EcalThinOneLayerThickness) + (EcalBarrelThickLayers * EcalThickOneLayerThickness)"/>
<constant name="EcalBarrel_rmax" value="EcalBarrel_rmin + EcalBarrelThickness"/>
<comment> EM Endcap N Layer; same number of layers for EcalThin and EcalThick </comment>
<constant name="EcalEndcapLayers"
value="floor((EcalEndcapAvailTotalThickness - EcalFirstLayerThickness) / (EcalThinOneLayerThickness + EcalThickOneLayerThickness))"/>
<constant name="EcalEndcapThinLayers" value="EcalEndcapLayers"/>
<constant name="EcalEndcapThickLayers" value="EcalEndcapLayers"/>
<comment> EM Endcap Thickness </comment>
<constant name="EcalEndcapThickness"
value="EcalFirstLayerThickness + (EcalEndcapThinLayers * EcalThinOneLayerThickness) + (EcalEndcapThickLayers * EcalThickOneLayerThickness)"/>
</define> </define>
<limits> <limits>
</limits> </limits>
...@@ -95,9 +34,9 @@ ...@@ -95,9 +34,9 @@
A layered EM calorimeter with tungsten and silicon (or scintillator) strips A layered EM calorimeter with tungsten and silicon (or scintillator) strips
</comment> </comment>
<detector <detector
id="cb_EMCAL_ID" id="ECalBarrel_ID"
name="cb_EMCAL" name="EcalBarrel"
type="DD4hep_PolyhedraEndcapCalorimeter2" type="DD4hep_EcalBarrel"
readout="EcalBarrelHits" readout="EcalBarrelHits"
calorimeterType="EM_BARREL"> calorimeterType="EM_BARREL">
<dimensions <dimensions
...@@ -138,6 +77,7 @@ ...@@ -138,6 +77,7 @@
<detector id="ECalEndcapP_ID" <detector id="ECalEndcapP_ID"
name="EcalEndcapP" name="EcalEndcapP"
reflect="false" reflect="false"
type="DD4hep_PolyhedraEndcapCalorimeter2"
readout="EcalEndcapHits" readout="EcalEndcapHits"
vis="EcalEndcapVis" vis="EcalEndcapVis"
calorimeterType="EM_ENDCAP" > calorimeterType="EM_ENDCAP" >
...@@ -221,11 +161,11 @@ ...@@ -221,11 +161,11 @@
<segmentation type="CartesianGridXY" grid_size_x="20.0*mm" grid_size_y="20.0*mm" /> <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> <id>system:5,module:4,x:32:-16,y:-16</id>
</readout> </readout>
-->
<readout name="CrystalEcalHits"> <readout name="CrystalEcalHits">
<segmentation type="CartesianGridXY" grid_size_x="CrystalBox_x_length" grid_size_y="CrystalBox_y_length" /> <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> <id>system:8,sector:4,module:20,x:48:-8,y:-8</id>
</readout> </readout>
-->
<readout name="EcalBarrelHits"> <readout name="EcalBarrelHits">
<segmentation type="CartesianGridXY" grid_size_x="3.5 * mm" grid_size_y="3.5 * mm"/> <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> <id>system:8,barrel:3,module:4,layer:6,slice:5,x:32:-16,y:-16</id>
......
reference_detector.xml
+ 1
− 1
View file @ 902975fb
...@@ -115,8 +115,8 @@ ...@@ -115,8 +115,8 @@
<include ref="compact/silicon_tracker.xml"/> <include ref="compact/silicon_tracker.xml"/>
--> -->
<include ref="compact/solenoid.xml"/> <include ref="compact/solenoid.xml"/>
<!--
<include ref="compact/ecal.xml"/> <include ref="compact/ecal.xml"/>
<!--
<include ref="compact/solenoid.xml"/> <include ref="compact/solenoid.xml"/>
<include ref="compact/hcal.xml"/> <include ref="compact/hcal.xml"/>
<include ref="compact/reference_detector_rich.xml"/> <include ref="compact/reference_detector_rich.xml"/>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment