Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • 101-north-ecal-add-modules-around-beampipe
  • 104-add-realistic-cooling-for-gridpix
  • 116-fix-the-detector-views
  • 12-job-failed-106994
  • 126-improved-gem-rings
  • 131-update-tof-for-canyonlands
  • 134-make-new-3d-views-of-ff-region-and-detectors
  • 144-irt-geometry
  • 147-fix-dirc-overlaps-and-make-it-great-again
  • 21-electron-endcap-ecal-glass-outer-ring-implementation-needed-2
  • 23-add-barrel-tof
  • 24-tweak-zdc-longitudinal-size
  • 37-place-sifi-fibers-in-the-assembly-in-ecal-barrel
  • 38-mm-tracker-implementation
  • 40-quick-viz
  • 42-grid-pix-pid-detector
  • 53-acts-geometry-bug-outer-tracker-barrel
  • 54-dirc-better-parametrization
  • 56-astropix-sampling-fraction-test-2
  • 59-detailed-forward-gem-trd
  • 7-central-tracker-endcap-detail
  • 81-add-barrel-ecal-projection-at-positive-eta
  • 9-detector-plugin-for-w-scfi-calorimeter-layers
  • 98-update-barrel-and-endcap-tof
  • AllieWeary-master-patch-33350
  • acadia
  • acts_surface_binning
  • acts_vertex_barrel
  • add_segmentation
  • b0_acts
  • backward_ecal_cleanup
  • barrel-tracker-simplified
  • baseline-dimensions-rich-thickness
  • calibrations-ecal-hcal
  • calo-digitization-json
  • canyonlands
  • cherry-pick-85aaf29d
  • cherry-pick-ee231e50
  • deathvalley
  • deathvalley-1.5T
  • debug-vis
  • default_visibilities
  • documentation_tag
  • drich-optics-tests
  • drich-space-update
  • drich-two-mirrors
  • ecal-hcal-endcap-bore-and-length
  • hcal
  • hcal-klm
  • irt-erich
  • irt-init-v01
  • lengthen_ecalbarrel
  • line_drawing
  • master
  • module_frame
  • optional_full_overlap_check
  • outer_tracker_fix
  • overlap_child_pipeline
  • remove_comment
  • rich-photos
  • sly2j-master-patch-62318
  • sphere-issue
  • sphere_tests
  • test
  • test-drich-tracker
  • testBranchRobin
  • test_tof_zy
  • tmp_view
  • tmp_viz
  • update_becal_nlayers
  • vis_check
  • vis_dirc
  • vis_ref
  • zdc_prim_fix
  • zji-ScFiCal
  • acadia-v1.0
  • acadia-v1.0-alpha
  • acadia-v1.1
  • acadia-v2.0
  • acadia-v2.1
  • canyonlands-v1.0
  • canyonlands-v1.1
  • canyonlands-v1.2
  • canyonlands-v2.0
  • canyonlands-v2.1
  • canyonlands-v2.2
  • deathvalley-v1.0
  • deathvalley-v1.0-1.5T
  • deathvalley-v1.1
  • v0.1.0
  • v0.2.0
91 results

Target

Select target project
  • EIC/detectors/athena
  • zwzhao/athena
  • FernandoTA/athena
  • palspeic/athena
4 results
Select Git revision
  • 101-north-ecal-add-modules-around-beampipe
  • 104-add-realistic-cooling-for-gridpix
  • 116-fix-the-detector-views
  • 12-job-failed-106994
  • 126-improved-gem-rings
  • 131-update-tof-for-canyonlands
  • 134-make-new-3d-views-of-ff-region-and-detectors
  • 144-irt-geometry
  • 144-test-small-sensor-overlap
  • 147-fix-dirc-overlaps-and-make-it-great-again
  • 148-hcal-geometry-development
  • 148-hcal-geometry-development-wdconinc-suggestion
  • 149-dump-geometry-ci-job-should-also-produce-ff-geometry-separately
  • 21-electron-endcap-ecal-glass-outer-ring-implementation-needed-2
  • 23-add-barrel-tof
  • 24-tweak-zdc-longitudinal-size
  • 37-place-sifi-fibers-in-the-assembly-in-ecal-barrel
  • 38-mm-tracker-implementation
  • 40-quick-viz
  • 42-grid-pix-pid-detector
  • 53-acts-geometry-bug-outer-tracker-barrel
  • 54-dirc-better-parametrization
  • 56-astropix-sampling-fraction-test-2
  • 59-detailed-forward-gem-trd
  • 59-detailed-forward-gem-trd-2
  • 7-central-tracker-endcap-detail
  • 81-add-barrel-ecal-projection-at-positive-eta
  • 9-detector-plugin-for-w-scfi-calorimeter-layers
  • 98-update-barrel-and-endcap-tof
  • AllieWeary-master-patch-33350
  • WorkingGemTrd_MLmodel_andAnalysis
  • acadia
  • acts_surface_binning
  • acts_vertex_barrel
  • add_segmentation
  • adjust-barrel-emcalo-geometry
  • b0_acts
  • backward_ecal_cleanup
  • barrel-tracker-simplified
  • baseline-dimensions-rich-thickness
  • calibrations-ecal-hcal
  • calo-digitization-json
  • canyonlands
  • canyonlands-acts-dd4hep-plugin
  • cherry-pick-85aaf29d
  • cherry-pick-ee231e50
  • deathvalley
  • deathvalley-1.5T
  • deathvalley-acts-dd4hep-plugin
  • debug-vis
  • default_visibilities
  • documentation_tag
  • drich-optics-tests
  • drich-space-update
  • drich-two-mirrors
  • ecal-hcal-endcap-bore-and-length
  • hcal
  • hcal-klm
  • irt-erich
  • irt-init-v01
  • lengthen_ecalbarrel
  • line_drawing
  • lkosarzew-master-patch-25029
  • master
  • mlavinsky-master-patch-10431
  • module_frame
  • mriganka-branch02
  • niveditharam-master-patch-05822
  • optional_full_overlap_check
  • outer_tracker_fix
  • overlap_child_pipeline
  • remove_comment
  • rich-photos
  • shyam.kumar-master-patch-48113
  • sly2j-master-patch-62318
  • sphere-issue
  • sphere_tests
  • swapneshkhade-master-patch-16755
  • test
  • test-drich-tracker
  • testBranchRobin
  • test_tof_zy
  • tmp_view
  • tmp_viz
  • update_becal_nlayers
  • vanekjan-master-patch-74522
  • vdesai-master-patch-09582
  • vis_check
  • vis_dirc
  • vis_ref
  • wdconinc-master-patch-02076
  • weibin-master-patch-37475
  • zdc_prim_fix
  • zdemirog-master-patch-64142
  • zji-ScFiCal
  • acadia-v1.0
  • acadia-v1.0-alpha
  • acadia-v1.1
  • acadia-v2.0
  • acadia-v2.1
  • canyonlands-v1.0
  • canyonlands-v1.1
  • canyonlands-v1.2
  • canyonlands-v2.0
  • canyonlands-v2.1
  • canyonlands-v2.2
  • deathvalley-v1.0
  • deathvalley-v1.0-1.5T
  • deathvalley-v1.1
  • v0.1.0
  • v0.2.0
111 results
Show changes
Commits on Source (2)
Hide whitespace changes
Inline Side-by-side
athena.xml
View file @ 84c613d1
......@@ -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
View file @ 84c613d1
......@@ -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
View file @ 84c613d1
......@@ -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 0 → 100644
View file @ 84c613d1
<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"/>
<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"/>
<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="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>