From 16d06df25dbedda3a6b1444aef0288b9dbbac489 Mon Sep 17 00:00:00 2001
From: miguelignacio <miguel.arratia@ucr>
Date: Sat, 5 Jun 2021 10:55:31 -0700
Subject: [PATCH] adding Fe/Sc HCal model (barrel, both endcaps); moving the
HCal display parameters from display.xml to hcal.xml
---
compact/display.xml | 6 +++---
compact/hcal.xml | 35 ++++++++++++++---------------------
2 files changed, 17 insertions(+), 24 deletions(-)
diff --git a/compact/display.xml b/compact/display.xml
index 62752578..d2b13a0b 100644
--- a/compact/display.xml
+++ b/compact/display.xml
@@ -38,9 +38,9 @@
<vis name="EcalVis" alpha="0.1" r="0.0" g="0.75" b="0.1" showDaughters="false"/>
<vis name="EcalEndcapVis" alpha="1.0" r="0.0" g="0.99" b="0.0" showDaughters="false" visible="true" />
<vis name="EcalBarrelVis" alpha="1.0" r="0.0" g="0.99" b="0.0" showDaughters="false" visible="true" />
- <vis name="HcalVis" alpha="0.9" r="0.75" g="0.0" b="0.0" showDaughters="false"/>
- <vis name="HcalBarrelVis" alpha="1.0" r="0.0" g="0.0" b="0.99" showDaughters="false" visible="true" />
- <vis name="HcalEndcapVis" alpha="1.0" r="0.0" g="0.0" b="0.99" showDaughters="false" visible="true" />
+
+
+
<vis name="SolenoidCoilVis" alpha="1.0" r="0.55" g="0.55" b="0.7" showDaughters="true" visible="true" lineStyle="solid" drawingStyle="solid" />
<vis name="SolenoidCryostatVis" alpha="0.4" r="0.55" g="0.55" b="0.7" showDaughters="true" visible="true" lineStyle="solid" drawingStyle="solid" />
diff --git a/compact/hcal.xml b/compact/hcal.xml
index 64c43a70..95390bd8 100644
--- a/compact/hcal.xml
+++ b/compact/hcal.xml
@@ -11,6 +11,11 @@
</regions>
<display>
+ <vis name="HcalVis" alpha="0.9" r="0.75" g="0.0" b="0.0" showDaughters="false"/>
+ <vis name="HcalBarrelVis" alpha="0.9" r="0.0" g="0.3" b="0.8" showDaughters="true" visible="true" />
+ <vis name="HcalEndcapVis" alpha="0.9" r="0.0" g="0.3" b="0.8" showDaughters="true" visible="true" />
+ <vis name="HcalSensorVis" alpha="0.9" r="1.0" g="0.0" b="0.2" showDaughters="true" visible="true" />
+ <vis name="HcalAbsorberVis" alpha="0.9" r="0.4" g="0.4" b="0.6" showDaughters="true" visible="true" />
</display>
<!-- Define detector -->
@@ -31,12 +36,8 @@
z="HcalBarrelLength"/>
<staves vis="HcalBarrelVis"/>
<layer repeat="HcalBarrelLayer_NRepeat">
- <slice material="Steel235" thickness="HcalSteelThickness"/>
- <slice material="PyrexGlass" thickness="HcalPyrexThickness"/>
- <slice material="RPCGasDefault" thickness="HcalRPCGasThickness" sensitive="yes" limits="cal_limits"/>
- <slice material="PyrexGlass" thickness="HcalPyrexThickness"/>
- <slice material="G10" thickness="HcalG10Thickness"/>
- <slice material="Air" thickness="HcalAirThickness"/>
+ <slice material="Steel235" thickness="2.0*cm" vis="HcalAbsorberVis"/>
+ <slice material="Polystyrene" thickness="0.5*cm" vis="HcalSensorVis" sensitive="yes" limits="cal_limits"/>
</layer>
</detector>
@@ -54,13 +55,9 @@
zmin="HcalEndcapP_zmin"
rmin="HcalEndcapP_rmin"
rmax="HcalBarrel_rmax"/>
- <layer repeat="HcalEndcapPLayer_NRepeat" vis="HcalEndcapVis" >
- <slice material="Steel235" thickness="HcalSteelThickness"/>
- <slice material="PyrexGlass" thickness="HcalPyrexThickness"/>
- <slice material="RPCGasDefault" thickness="HcalRPCGasThickness" sensitive="yes" limits="cal_limits"/>
- <slice material="PyrexGlass" thickness="HcalPyrexThickness"/>
- <slice material="G10" thickness="HcalG10Thickness"/>
- <slice material="Air" thickness="HcalAirThickness"/>
+ <layer repeat="51" vis="HcalEndcapVis" >
+ <slice material="Steel235" thickness="2.0" vis="HcalAbsorberVis"/>
+ <slice material="Polystyrene" thickness="0.3*cm" vis="HcalSensorVis" sensitive="yes" limits="cal_limits"/>
</layer>
</detector>
@@ -78,12 +75,8 @@
rmin="HcalEndcapN_rmin"
rmax="HcalBarrel_rmax"/>
<layer repeat="HcalEndcapNLayer_NRepeat" vis="HcalEndcapVis" >
- <slice material="Steel235" thickness="HcalSteelThickness"/>
- <slice material="PyrexGlass" thickness="HcalPyrexThickness"/>
- <slice material="RPCGasDefault" thickness="HcalRPCGasThickness" sensitive="yes" limits="cal_limits"/>
- <slice material="PyrexGlass" thickness="HcalPyrexThickness"/>
- <slice material="G10" thickness="HcalG10Thickness"/>
- <slice material="Air" thickness="HcalAirThickness"/>
+ <slice material="Steel235" thickness="HcalSteelThickness" vis="HcalAbsorberVis"/>
+ <slice material="Polystyrene" thickness="0.5*cm" vis="HcalSensorVis" sensitive="yes" limits="cal_limits"/>
</layer>
</detector>
@@ -91,11 +84,11 @@
<!-- Definition of the readout segmentation/definition -->
<readouts>
<readout name="HcalBarrelHits">
- <segmentation type="CartesianGridXY" grid_size_x="10 * mm" grid_size_y="10 * mm"/>
+ <segmentation type="CartesianGridXY" grid_size_x="100* mm" grid_size_y="100 * mm"/>
<id>system:6,barrel:3,module:4,layer:8,slice:5,x:32:-16,y:-16</id>
</readout>
<readout name="HcalEndcapHits">
- <segmentation type="CartesianGridXY" grid_size_x="10 * mm" grid_size_y="10 * mm"/>
+ <segmentation type="CartesianGridXY" grid_size_x="100 * mm" grid_size_y="100 * mm"/>
<id>system:6,barrel:3,module:4,layer:8,slice:5,x:32:-16,y:-16</id>
</readout>
</readouts>
--
GitLab