.gitlab-ci.yml

 image: eicweb.phy.anl.gov:4567/eic/juggler/juggler:latest
 
+variables:
+  DETECTOR_EVENT_VIEWS: "ON"
+
 workflow:
   rules:
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'

athena.xml

@@ -118,7 +118,7 @@
 
   <include ref="compact/solenoid.xml"/>
   <include ref="compact/ecal.xml"/>
-  <include ref="compact/hcal.xml"/>
+  <include ref="compact/hcal_klm.xml"/>
   <!--include ref="compact/ce_GEM.xml"/-->
   <!--include ref="compact/gem_tracker_endcap.xml"/-->
   <include ref="compact/ce_mrich.xml"/>

compact/definitions.xml

@@ -588,27 +588,6 @@
     <constant name="HcalEndcapN_zmin"          value="EcalEndcapN_zmin + EcalEndcapN_length "/>
     <constant name="HcalBarrelLength"          value="HcalEndcapP_zmin + HcalEndcapN_zmin "/>
 
-    <comment> Material Thickness </comment>
-    <constant name="HcalSteelThickness"       value="1.89 * cm"/>
-    <constant name="HcalPyrexThickness"       value="1.10 * mm"/>
-    <constant name="HcalRPCGasThickness"      value="1.20 * mm"/>
-    <constant name="HcalG10Thickness"         value="3.00 * mm"/>
-    <constant name="HcalAirThickness"         value="1.60 * mm"/>
-
-    <comment> Single Layer Thickness (for both barrel and endcap)</comment>
-    <constant name="HcalSingleLayerThickness"
-      value="HcalSteelThickness + (2 * HcalPyrexThickness) + HcalRPCGasThickness + HcalG10Thickness + HcalAirThickness"/>
-
-    <comment> Hcal Barrel Layers and computed Thickness </comment>
-    <constant name="HcalBarrelLayer_NRepeat" value="floor(HcalBarrelAvailThickness / HcalSingleLayerThickness)"/>
-    <constant name="HcalBarrelThickness" value="HcalBarrelLayer_NRepeat * HcalSingleLayerThickness"/>
-
-    <comment> Hcal Endcap Layers and computed Thickness </comment>
-    <constant name="HcalEndcapPLayer_NRepeat" value="floor(HcalEndcapP_length / HcalSingleLayerThickness)"/>
-    <constant name="HcalEndcapNLayer_NRepeat" value="floor(HcalEndcapN_length / HcalSingleLayerThickness)"/>
-    <constant name="HcalEndcapP_thickness" value="HcalEndcapPLayer_NRepeat * HcalSingleLayerThickness"/>
-    <constant name="HcalEndcapN_thickness" value="HcalEndcapNLayer_NRepeat * HcalSingleLayerThickness"/>
-
     <comment>
       ----------------------
       DIRC parameters

compact/hcal.xml

@@ -2,6 +2,27 @@
 
   <define>
     <constant name="HcalBarrel_offset"              value="(HcalEndcapP_zmin-HcalEndcapN_zmin)/2.0" />
+
+    <comment> Material Thickness </comment>
+    <constant name="HcalSteelThickness"       value="1.89 * cm"/>
+    <constant name="HcalPyrexThickness"       value="1.10 * mm"/>
+    <constant name="HcalRPCGasThickness"      value="1.20 * mm"/>
+    <constant name="HcalG10Thickness"         value="3.00 * mm"/>
+    <constant name="HcalAirThickness"         value="1.60 * mm"/>
+
+    <comment> Single Layer Thickness (for both barrel and endcap)</comment>
+    <constant name="HcalSingleLayerThickness"
+      value="HcalSteelThickness + (2 * HcalPyrexThickness) + HcalRPCGasThickness + HcalG10Thickness + HcalAirThickness"/>
+
+    <comment> Hcal Barrel Layers and computed Thickness </comment>
+    <constant name="HcalBarrelLayer_NRepeat" value="floor(HcalBarrelAvailThickness / HcalSingleLayerThickness)"/>
+    <constant name="HcalBarrelThickness" value="HcalBarrelLayer_NRepeat * HcalSingleLayerThickness"/>
+
+    <comment> Hcal Endcap Layers and computed Thickness </comment>
+    <constant name="HcalEndcapPLayer_NRepeat" value="floor(HcalEndcapP_length / HcalSingleLayerThickness)"/>
+    <constant name="HcalEndcapNLayer_NRepeat" value="floor(HcalEndcapN_length / HcalSingleLayerThickness)"/>
+    <constant name="HcalEndcapP_thickness" value="HcalEndcapPLayer_NRepeat * HcalSingleLayerThickness"/>
+    <constant name="HcalEndcapN_thickness" value="HcalEndcapNLayer_NRepeat * HcalSingleLayerThickness"/>
   </define>
 
   <limits>

compact/hcal_klm.xml

+<lccdd>
+
+  <define>
+    <constant name="HcalBarrel_offset"              value="(HcalEndcapP_zmin-HcalEndcapN_zmin)/2.0" />
+
+    <constant name="HcalSteelThickness"             value="1.89 * cm" />
+
+    <comment>
+      Scintillator light detection in the strip
+      Figure 10.20 (b), Belle II Technical Design Report,
+      https://docs.belle2.org/record/329/files/BELLE2-REPORT-2016-001.pdf
+      4 cm wide scintillator strips are read out along WLS fibers
+      strips are oriented z-phi in barrel, x-y in endcaps
+    </comment>
+    <constant name="HcalScintillatorNbLayers"       value="2" />
+    <constant name="HcalScintillatorPSThickness"    value="300*um" />
+    <constant name="HcalScintillatorWidth"          value="40*mm" />
+    <constant name="HcalScintillatorThickness"      value="10*mm" />
+
+    <comment> Single Layer Thickness (for both barrel and endcap)</comment>
+    <constant name="HcalScintillatorSingleLayerThickness"
+      value="HcalSteelThickness + 2 * (HcalScintillatorThickness + 2 * HcalScintillatorPSThickness)"/>
+
+    <comment> All Scintillator Layers Thickness (for both barrel and endcap)</comment>
+    <constant name="HcalScintillatorAllLayerThickness" value="HcalScintillatorNbLayers * HcalScintillatorSingleLayerThickness"/>
+
+    <comment>
+      Exploded cross-section of an RPC superlayer
+      Figure 10.2, Belle II Technical Design Report, 
+      https://docs.belle2.org/record/329/files/BELLE2-REPORT-2016-001.pdf
+      RPC layers are read out on 5 cm wide strips
+      strips are oriented along z-phi in barrel, r-phi in endcaps
+    </comment>
+    <constant name="HcalRPCMylarThickness"          value="0.25*mm" />
+    <constant name="HcalRPCCopperThickness"         value="0.035*mm" />
+    <constant name="HcalRPCPSFoamThickness"         value="7.0*mm" />
+    <constant name="HcalRPCGlassThickness"          value="3.0*mm" />
+    <constant name="HcalRPCGasThickness"            value="2.0*mm" />
+
+    <comment> Single Layer Thickness (for both barrel and endcap)</comment>
+    <constant name="HcalRPCSingleLayerThickness"
+      value="HcalSteelThickness + 2 * (2 * (HcalRPCMylarThickness + HcalRPCCopperThickness) + HcalRPCPSFoamThickness + 2 * HcalRPCGlassThickness + HcalRPCGasThickness) + HcalRPCMylarThickness"/>
+
+    <comment> Hcal Barrel Layers and computed Thickness </comment>
+    <constant name="HcalBarrelAvailThicknessForRPC" value="HcalBarrelAvailThickness - HcalScintillatorAllLayerThickness"/>
+    <constant name="HcalBarrelLayerRPC_NRepeat" value="floor(HcalBarrelAvailThicknessForRPC / HcalRPCSingleLayerThickness)"/>
+    <constant name="HcalBarrelThickness" value="HcalScintillatorAllLayerThickness + HcalBarrelLayerRPC_NRepeat * HcalRPCSingleLayerThickness"/>
+
+    <comment> Hcal Endcap Layers and computed Thickness </comment>
+    <constant name="HcalEndcapP_AvailLengthRPC" value="HcalEndcapP_length - HcalScintillatorAllLayerThickness"/>
+    <constant name="HcalEndcapN_AvailLengthRPC" value="HcalEndcapN_length - HcalScintillatorAllLayerThickness"/>
+    <constant name="HcalEndcapPLayer_NRepeat" value="floor(HcalEndcapP_AvailLengthRPC / HcalRPCSingleLayerThickness)"/>
+    <constant name="HcalEndcapNLayer_NRepeat" value="floor(HcalEndcapN_AvailLengthRPC / HcalRPCSingleLayerThickness)"/>
+    <constant name="HcalEndcapP_thickness" value="HcalEndcapPLayer_NRepeat * HcalRPCSingleLayerThickness"/>
+    <constant name="HcalEndcapN_thickness" value="HcalEndcapNLayer_NRepeat * HcalRPCSingleLayerThickness"/>
+  </define>
+
+  <limits>
+  </limits>
+
+  <regions>
+  </regions>
+
+  <display>
+  </display>
+
+  <!-- Define detector -->
+  <detectors>
+
+    <detector 
+      id="HCalBarrel_ID" 
+      name="HcalBarrel"
+      type="athena_EcalBarrel"
+      readout="HcalBarrelHits"
+      calorimeterType="HAD_BARREL"
+      offset="HcalBarrel_offset"
+      gap="0.*cm"
+      material="Steel235">
+      <dimensions 
+        numsides="CaloSides" 
+        rmin="HcalBarrel_rmin" 
+        z="HcalBarrelLength"/>
+      <staves vis="HcalBarrelVis"/>
+      <layer repeat="HcalScintillatorNbLayers">
+        <slice material="Steel235"     thickness="HcalSteelThickness" vis="AnlGray"/>
+        <slice material="Polystyrene"  thickness="HcalScintillatorPSThickness"/>
+        <slice material="PlasticScint" thickness="HcalScintillatorThickness" sensitive="yes" limits="cal_limits"/>
+        <slice material="Polystyrene"  thickness="HcalScintillatorPSThickness"/>
+        <slice material="Polystyrene"  thickness="HcalScintillatorPSThickness"/>
+        <slice material="PlasticScint" thickness="HcalScintillatorThickness" sensitive="yes" limits="cal_limits"/>
+        <slice material="Polystyrene"  thickness="HcalScintillatorPSThickness"/>
+      </layer>
+      <layer repeat="HcalBarrelLayerRPC_NRepeat - HcalScintillatorNbLayers">
+        <slice material="Steel235"        thickness="HcalSteelThickness" vis="AnlGray"/>
+        <slice material="Mylar"           thickness="HcalRPCMylarThickness"/>
+        <slice material="Copper"          thickness="HcalRPCCopperThickness" vis="AnlGreen"/>
+        <slice material="PolystyreneFoam" thickness="HcalRPCPSFoamThickness"/>
+        <slice material="Copper"          thickness="HcalRPCCopperThickness" sensitive="yes" limits="cal_limits" vis="AnlGreen"/>
+        <slice material="Mylar"           thickness="HcalRPCMylarThickness"/>
+        <slice material="PyrexGlass"      thickness="HcalRPCGlassThickness"/>
+        <slice material="RPCGasDefault"   thickness="HcalRPCGasThickness"/>
+        <slice material="PyrexGlass"      thickness="HcalRPCGlassThickness"/>
+        <slice material="Mylar"           thickness="HcalRPCMylarThickness"/>
+        <slice material="PyrexGlass"      thickness="HcalRPCGlassThickness"/>
+        <slice material="RPCGasDefault"   thickness="HcalRPCGasThickness"/>
+        <slice material="PyrexGlass"      thickness="HcalRPCGlassThickness"/>
+        <slice material="Mylar"           thickness="HcalRPCMylarThickness"/>
+        <slice material="Copper"          thickness="HcalRPCCopperThickness" sensitive="yes" limits="cal_limits" vis="AnlGreen"/>
+        <slice material="PolystyreneFoam" thickness="HcalRPCPSFoamThickness"/>
+        <slice material="Copper"          thickness="HcalRPCCopperThickness" vis="AnlGreen"/>
+        <slice material="Mylar"           thickness="HcalRPCMylarThickness"/>
+      </layer>
+    </detector>
+
+    <detector 
+      id="HCalEndcapP_ID" 
+      name="HcalEndcapP" 
+      type="refdet_PolyhedraEndcapCalorimeter2" 
+      readout="HcalEndcapHits" 
+      vis="HcalEndcapVis" 
+      calorimeterType="HAD_ENDCAP"
+      reflect="false">
+      <position x="0" y="0" z="0"/>
+      <dimensions 
+        numsides="CaloSides" 
+        zmin="HcalEndcapP_zmin" 
+        rmin="HcalEndcapP_rmin"
+        rmax="HcalBarrel_rmax"/>
+      <layer repeat="HcalScintillatorNbLayers" vis="HcalEndcapVis">
+        <slice material="Steel235"     thickness="HcalSteelThickness"/>
+        <slice material="Polystyrene"  thickness="HcalScintillatorPSThickness"/>
+        <slice material="PlasticScint" thickness="HcalScintillatorThickness" sensitive="yes" limits="cal_limits"/>
+        <slice material="Polystyrene"  thickness="HcalScintillatorPSThickness"/>
+        <slice material="Polystyrene"  thickness="HcalScintillatorPSThickness"/>
+        <slice material="PlasticScint" thickness="HcalScintillatorThickness" sensitive="yes" limits="cal_limits"/>
+        <slice material="Polystyrene"  thickness="HcalScintillatorPSThickness"/>
+      </layer>
+      <layer repeat="HcalEndcapPLayer_NRepeat - HcalScintillatorNbLayers" vis="HcalEndcapVis">
+        <slice material="Steel235"        thickness="HcalSteelThickness"/>
+        <slice material="Mylar"           thickness="HcalRPCMylarThickness"/>
+        <slice material="Copper"          thickness="HcalRPCCopperThickness"/>
+        <slice material="PolystyreneFoam" thickness="HcalRPCPSFoamThickness"/>
+        <slice material="Copper"          thickness="HcalRPCCopperThickness" sensitive="yes" limits="cal_limits"/>
+        <slice material="Mylar"           thickness="HcalRPCMylarThickness"/>
+        <slice material="PyrexGlass"      thickness="HcalRPCGlassThickness"/>
+        <slice material="RPCGasDefault"   thickness="HcalRPCGasThickness"/>
+        <slice material="PyrexGlass"      thickness="HcalRPCGlassThickness"/>
+        <slice material="Mylar"           thickness="HcalRPCMylarThickness"/>
+        <slice material="PyrexGlass"      thickness="HcalRPCGlassThickness"/>
+        <slice material="RPCGasDefault"   thickness="HcalRPCGasThickness"/>
+        <slice material="PyrexGlass"      thickness="HcalRPCGlassThickness"/>
+        <slice material="Mylar"           thickness="HcalRPCMylarThickness"/>
+        <slice material="Copper"          thickness="HcalRPCCopperThickness" sensitive="yes" limits="cal_limits"/>
+        <slice material="PolystyreneFoam" thickness="HcalRPCPSFoamThickness"/>
+        <slice material="Copper"          thickness="HcalRPCCopperThickness"/>
+        <slice material="Mylar"           thickness="HcalRPCMylarThickness"/>
+      </layer>
+    </detector>
+
+    <detector 
+      id="HCalEndcapN_ID" 
+      name="HcalEndcapN" 
+      type="refdet_PolyhedraEndcapCalorimeter2" 
+      readout="HcalEndcapHits" 
+      vis="HcalEndcapVis" 
+      calorimeterType="HAD_ENDCAP" reflect="true">
+      <position x="0" y="0" z="0"/>
+      <dimensions 
+        numsides="CaloSides" 
+        zmin="HcalEndcapN_zmin" 
+        rmin="HcalEndcapN_rmin" 
+        rmax="HcalBarrel_rmax"/>
+      <layer repeat="HcalScintillatorNbLayers" vis="HcalEndcapVis">
+        <slice material="Steel235"     thickness="HcalSteelThickness"/>
+        <slice material="Polystyrene"  thickness="HcalScintillatorPSThickness"/>
+        <slice material="PlasticScint" thickness="HcalScintillatorThickness" sensitive="yes" limits="cal_limits"/>
+        <slice material="Polystyrene"  thickness="HcalScintillatorPSThickness"/>
+        <slice material="Polystyrene"  thickness="HcalScintillatorPSThickness"/>
+        <slice material="PlasticScint" thickness="HcalScintillatorThickness" sensitive="yes" limits="cal_limits"/>
+        <slice material="Polystyrene"  thickness="HcalScintillatorPSThickness"/>
+      </layer>
+      <layer repeat="HcalEndcapNLayer_NRepeat - HcalScintillatorNbLayers" vis="HcalEndcapVis">
+        <slice material="Steel235"        thickness="HcalSteelThickness"/>
+        <slice material="Mylar"           thickness="HcalRPCMylarThickness"/>
+        <slice material="Copper"          thickness="HcalRPCCopperThickness"/>
+        <slice material="PolystyreneFoam" thickness="HcalRPCPSFoamThickness"/>
+        <slice material="Copper"          thickness="HcalRPCCopperThickness" sensitive="yes" limits="cal_limits"/>
+        <slice material="Mylar"           thickness="HcalRPCMylarThickness"/>
+        <slice material="PyrexGlass"      thickness="HcalRPCGlassThickness"/>
+        <slice material="RPCGasDefault"   thickness="HcalRPCGasThickness"/>
+        <slice material="PyrexGlass"      thickness="HcalRPCGlassThickness"/>
+        <slice material="Mylar"           thickness="HcalRPCMylarThickness"/>
+        <slice material="PyrexGlass"      thickness="HcalRPCGlassThickness"/>
+        <slice material="RPCGasDefault"   thickness="HcalRPCGasThickness"/>
+        <slice material="PyrexGlass"      thickness="HcalRPCGlassThickness"/>
+        <slice material="Mylar"           thickness="HcalRPCMylarThickness"/>
+        <slice material="Copper"          thickness="HcalRPCCopperThickness" sensitive="yes" limits="cal_limits"/>
+        <slice material="PolystyreneFoam" thickness="HcalRPCPSFoamThickness"/>
+        <slice material="Copper"          thickness="HcalRPCCopperThickness"/>
+        <slice material="Mylar"           thickness="HcalRPCMylarThickness"/>
+      </layer>
+    </detector>
+
+  </detectors>
+  <!--  Definition of the readout segmentation/definition  -->
+  <readouts>
+    <readout name="HcalBarrelHits">
+      <segmentation type="CartesianGridXY" grid_size_x="5 * cm" grid_size_y="5 * cm"/>
+      <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="5 * cm" grid_size_y="5 * cm"/>
+      <id>system:6,barrel:3,module:4,layer:8,slice:5,x:32:-16,y:-16</id>
+    </readout>
+  </readouts>
+
+  <plugins>
+  </plugins>
+
+  <fields>
+  </fields>
+</lccdd>

views/view1.yml

@@ -14,6 +14,30 @@ dawn_view_01:ev002:
     - if: '$DETECTOR_EVENT_VIEWS == "ON"'
   script:
     - ./bin/make_dawn_views -t view01_ev002 -d scripts/view1 -s 2
+dawn_view_01:ev003:
+  extends: .views
+  rules:
+    - if: '$DETECTOR_EVENT_VIEWS == "ON"'
+  script:
+    - ./bin/make_dawn_views -t view01_ev003 -d scripts/view1 -s 3
+dawn_view_01:ev004:
+  extends: .views
+  rules:
+    - if: '$DETECTOR_EVENT_VIEWS == "ON"'
+  script:
+    - ./bin/make_dawn_views -t view01_ev004 -d scripts/view1 -s 4
+dawn_view_01:ev005:
+  extends: .views
+  rules:
+    - if: '$DETECTOR_EVENT_VIEWS == "ON"'
+  script:
+    - ./bin/make_dawn_views -t view01_ev005 -d scripts/view1 -s 5
+dawn_view_01:ev006:
+  extends: .views
+  rules:
+    - if: '$DETECTOR_EVENT_VIEWS == "ON"'
+  script:
+    - ./bin/make_dawn_views -t view01_ev006 -d scripts/view1 -s 6
 
 view_01:
   stage: test
@@ -26,6 +50,14 @@ view_01:
       optional: true
     - job: dawn_view_01:ev002
       optional: true
+    - job: dawn_view_01:ev003
+      optional: true
+    - job: dawn_view_01:ev004
+      optional: true
+    - job: dawn_view_01:ev005
+      optional: true
+    - job: dawn_view_01:ev006
+      optional: true
   script:
     - ls -lrth *
     - ls -lrth images/*