Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions compact/ecal/backward_PbWO4.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
name="EcalEndcapN"
type="epic_HomogeneousCalorimeter"
readout="EcalEndcapNHits">
<type_flags type="DetType_CALORIMETER + DetType_ENDCAP + DetType_ELECTROMAGNETIC"/>
<position x="0" y="0" z="-(EcalEndcapN_zmin + EcalEndcapN_envelope_length / 2.)"/>
<rotation x="0" y="0." z="0"/>
<placements>
Expand Down
1 change: 1 addition & 0 deletions compact/ecal/bic/bic.xml
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,7 @@
calorimeterType="EM_BARREL"
vis="EcalBarrelEnvelopeVis"
offset="EcalBarrel_Calorimeter_offset">
<type_flags type="DetType_CALORIMETER + DetType_BARREL + DetType_ELECTROMAGNETIC"/>
<dimensions numsides="EcalBarrel_SectorRepeat"
rmin="EcalBarrel_rmin"
z="EcalBarrel_Calorimeter_length"/>
Expand Down
1 change: 1 addition & 0 deletions compact/far_backward/beamline_electron.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
type="BeamPipeChain"
wall_thickness="1 * mm"
vis="BeamPipeVis">
<type_flags type="DetType_ENDCAP + DetType_BEAMPIPE"/>
<pipe id="0" name="Pipe_to_Q1eR"
xcenter="0" zcenter="(Center_Beampipe_End + Q1eR_CenterPosition+Q1eR_Length/2)/2"
length="Center_Beampipe_End - (Q1eR_CenterPosition+Q1eR_Length/2)" theta="0"
Expand Down
1 change: 1 addition & 0 deletions compact/far_backward/beamline_extension_electron.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
name="Pipe_Q3eR_to_B7eR"
type="BeamPipeChain"
wall_thickness="2*mm">
<type_flags type="DetType_ENDCAP + DetType_BEAMPIPE"/>
<pipe id="0" name="Pipe_in_Q3eR"
xcenter="Q3eR_XPosition" zcenter="Q3eR_CenterPosition"
length="Q3eR_Length" theta="Q3eR_Theta"
Expand Down
1 change: 1 addition & 0 deletions compact/far_backward/beamline_extension_hadron.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
name="Pipe_Q1APR_to_B1PR"
type="BeamPipeChain"
wall_thickness="2*mm">
<type_flags type="DetType_ENDCAP + DetType_BEAMPIPE"/>
<pipe id="0" name="Pipe_to_Q1APR"
xcenter="(Hadron_Beampipe_End*sin(CrossingAngle)+Q1APR_StartX)/2." zcenter="(Hadron_Beampipe_End*cos(CrossingAngle)+Q1APR_StartZ)/2."
length="sqrt((Hadron_Beampipe_End*sin(CrossingAngle)-Q1APR_StartX)^2+(Hadron_Beampipe_End*cos(CrossingAngle)-Q1APR_StartZ)^2)" theta="CrossingAngle"
Expand Down
2 changes: 2 additions & 0 deletions compact/far_backward/beamline_tracking.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
name="Pipe_tracker"
readout="BackwardsBeamlineHits">

<type_flags type="DetType_TRACKER + DetType_ENDCAP + DetType_BEAMPIPE"/>

<slice
pipe_id="0"
grandmother="Pipe_Q1eR_to_B2BeR"
Expand Down
1 change: 1 addition & 0 deletions compact/far_backward/lumi/spec_ScFi_cal.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

<detectors>
<detector id="LumiSpecCAL_ID" name="LumiSpecCAL" type="EcalLumiSpecWScFi" vis="LumiSpecCAL_LayerVis" readout="EcalLumiSpecHits" sizeXY="LumiSpecCAL_DXY" sizeZ="LumiSpecCAL_DZ" nmod_perlayer="LumiSpecCAL_XYLayers" nlayer="LumiSpecCAL_ZLayers" >
<type_flags type="DetType_CALORIMETER + DetType_ENDCAP + DetType_ELECTROMAGNETIC"/>
<position x="0.0*cm" y="0.0*cm" z="0.0*cm"/>
<rotation x="0.0*rad" y="0.0*rad" z="0.0*rad"/>

Expand Down
1 change: 1 addition & 0 deletions compact/far_backward/lumi/spec_homo_cal.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

<detectors>
<detector id="LumiSpecCAL_ID" name="LumiSpecCAL" type="LumiSpecHomoCAL" vis="FFPreVis" readout="LumiSpecCALHits" sizeXY="LumiSpecCAL_DXY">
<type_flags type="DetType_CALORIMETER + DetType_ENDCAP + DetType_ELECTROMAGNETIC"/>
<module sizex="LumiSpecCALTower_DXY" sizey="LumiSpecCALTower_DXY" sizez="LumiSpecCALTower_DZ" frameSize="0.0*mm" material="PbWO4" vis="FFPreModuleVis"/>
<sector id="0">
<position x="0.0*cm" y="LumiSpecCAL_Y" z="LumiSpecCAL_Z"/>
Expand Down
1 change: 1 addition & 0 deletions compact/far_backward/lumi/spec_tracker.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
materialCu="Copper"
thicknessSi="LumiSpecTracker_Si_DZ/2.0"
thicknessCu="LumiSpecTracker_Cu_DZ/2.0">
<type_flags type="DetType_TRACKER + DetType_ENDCAP"/>
<module id="0">
<sector id="0" name="Top1">
<position x="0" y="Pos_Y1" z="Pos_Z1"/>
Expand Down
1 change: 1 addition & 0 deletions compact/far_backward/taggers.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<detectors>

<detector id="TaggerTracker_ID" name="BackwardsTaggerStation" type="BackwardsTagger" readout="TaggerTrackerHits">
<type_flags type="DetType_TRACKER + DetType_ENDCAP"/>

<comment> Tagger stations </comment>
<module id="1" name="Tagger1">
Expand Down
1 change: 1 addition & 0 deletions compact/far_forward/B0_ECal.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
name="B0ECal"
type="B0_ECAL"
readout="B0ECalHits">
<type_flags type="DetType_CALORIMETER + DetType_ENDCAP + DetType_ELECTROMAGNETIC"/>
<position x="B0ECal_xcenter" y="0" z="B0ECal_zcenter"/>
<rotation x="0" y="180*deg+B0ECal_rotation" z="0"/>
<placements>
Expand Down
1 change: 1 addition & 0 deletions compact/far_forward/B0_preshower.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
readout="B0PreshowerHits"
vis="FFPreVis"
reflect="false">
<type_flags type="DetType_CALORIMETER + DetType_ENDCAP + DetType_ELECTROMAGNETIC"/>
<position x="B0PreshowerCenter_xpos" y="0" z="B0PreshowerCenter_zpos"/>
<rotation x="0*rad" y="B0Preshower_rotation" z="0*rad"/>
<module name="Module1" vis="FFPreModuleVis">
Expand Down
1 change: 1 addition & 0 deletions compact/far_forward/ZDC_1stSilicon.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
type="ZDC_ImagingCal"
vis="ZDC_SiliconPix_Vis"
readout="ZDC_SiliconPix_Hits">
<type_flags type="DetType_TRACKER + DetType_ENDCAP"/>
<position x="ZDC_1stSilicon_x_pos" y="ZDC_1stSilicon_y_pos" z="ZDC_1stSilicon_z_pos"/>
<rotation x="ZDC_1stSilicon_rotateX_angle" y="ZDC_1stSilicon_rotateY_angle" z="ZDC_1stSilicon_rotateZ_angle"/>
<dimensions x="ZDC_1stSilicon_x" y="ZDC_1stSilicon_y" z="ZDC_1stSilicon_z"/>
Expand Down
1 change: 1 addition & 0 deletions compact/far_forward/ZDC_Crystal.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
type="ZDC_Crystal"
vis="ZDC_Crystal_Vis"
readout="ZDCEcalHits">
<type_flags type="DetType_CALORIMETER + DetType_ENDCAP + DetType_ELECTROMAGNETIC"/>
<position x="ZDC_Crystal_x_pos" y="ZDC_Crystal_y_pos" z="ZDC_Crystal_z_pos"/>
<rotation x="ZDC_Crystal_rotateX_angle" y="ZDC_Crystal_rotateY_angle" z="ZDC_Crystal_rotateZ_angle"/>
<dimensions x="ZDC_Crystal_nx * (ZDC_Crystal_cell_width + ZDC_Crystal_frame_thickness) + ZDC_Crystal_frame_thickness"
Expand Down
1 change: 1 addition & 0 deletions compact/far_forward/ZDC_Crystal_LYSO.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
type="ZDC_Crystal"
vis="ZDC_Crystal_Vis"
readout="EcalFarForwardZDCHits">
<type_flags type="DetType_CALORIMETER + DetType_ENDCAP + DetType_ELECTROMAGNETIC"/>
<position x="ZDC_Crystal_x_pos" y="ZDC_Crystal_y_pos" z="ZDC_Crystal_z_pos"/>
<rotation x="ZDC_Crystal_rotateX_angle" y="ZDC_Crystal_rotateY_angle" z="ZDC_Crystal_rotateZ_angle"/>
<dimensions x="ZDC_Crystal_nx * (ZDC_Crystal_cell_width + ZDC_Crystal_frame_thickness) + ZDC_Crystal_frame_thickness"
Expand Down
1 change: 1 addition & 0 deletions compact/far_forward/ZDC_Ecal.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
</comment>

<detectors>
<type_flags type="DetType_CALORIMETER + DetType_ENDCAP + DetType_ELECTROMAGNETIC"/>
<detector id="ZDCEcal_ID" name="ZDCEcal" type="ZDC_Sampling" readout="ZDCEcal_Hits" vis="ZDCEcal_Vis">
<position x="ZDCEcal_x_pos" y="ZDCEcal_y_pos" z="ZDCEcal_z_pos"/>
<rotation x="ZDCEcal_rotateX_angle" y="ZDCEcal_rotateY_angle" z="ZDCEcal_rotateZ_angle"/>
Expand Down
1 change: 1 addition & 0 deletions compact/far_forward/ZDC_Ecal_WSciFi.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
type="ZDCEcalScFiCalorimeter"
vis="ZDC_Ecal_Vis"
readout="ZDCEcalHits">
<type_flags type="DetType_CALORIMETER + DetType_ENDCAP + DetType_ELECTROMAGNETIC"/>
<position x="ZDCEcal_x_pos" y="ZDCEcal_y_pos" z="ZDCEcal_z_pos"/>
<rotation x="ZDCEcal_rotateX_angle" y="ZDCEcal_rotateY_angle" z="ZDCEcal_rotateZ_angle"/>
<dimensions x="ZDCEcal_width" z="ZDCEcal_length"/>
Expand Down
1 change: 1 addition & 0 deletions compact/far_forward/ZDC_Hcal.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
</comment>

<detectors>
<type_flags type="DetType_CALORIMETER + DetType_ENDCAP + DetType_HADRONIC"/>
<detector id="ZDCHcal_ID" name="ZDCHcal" type="ZDC_Sampling" readout="ZDCHcalHits" vis="ZDC_Hcal_Vis">
<position x="ZDCHcal_x_pos" y="ZDCHcal_y_pos" z="ZDCHcal_z_pos"/>
<rotation x="ZDCHcal_rotateX_angle" y="ZDCHcal_rotateY_angle" z="ZDCHcal_rotateZ_angle"/>
Expand Down
1 change: 1 addition & 0 deletions compact/far_forward/ZDC_PbScinti.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
type="ZDC_SamplingCal"
vis="ZDC_PbSci_Vis"
readout="ZDCHcalHits">
<type_flags type="DetType_CALORIMETER + DetType_ENDCAP + DetType_HADRONIC"/>
<position x="ZDC_PbSci_x_pos" y="ZDC_PbSci_y_pos" z="ZDC_PbSci_z_pos"/>
<rotation x="ZDC_PbSci_rotateX_angle" y="ZDC_PbSci_rotateY_angle" z="ZDC_PbSci_rotateZ_angle"/>
<dimensions x="ZDC_PbSci_x" y="ZDC_PbSci_y" z="ZDC_PbSci_z"/>
Expand Down
1 change: 1 addition & 0 deletions compact/far_forward/ZDC_PbSi.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
type="ZDC_ImagingCal"
vis="ZDC_PbSi_Vis"
readout="ZDC_PbSi_Hits">
<type_flags type="DetType_CALORIMETER + DetType_ENDCAP + DetType_HADRONIC"/>
<position x="ZDC_PbSi_x_pos" y="ZDC_PbSi_y_pos" z="ZDC_PbSi_z_pos"/>
<rotation x="ZDC_PbSi_rotateX_angle" y="ZDC_PbSi_rotateY_angle" z="ZDC_PbSi_rotateZ_angle"/>
<dimensions x="ZDC_PbSi_x" y="ZDC_PbSi_y" z="ZDC_PbSi_z"/>
Expand Down
1 change: 1 addition & 0 deletions compact/far_forward/ZDC_SiPMonTile.xml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
readout="HcalFarForwardZDCHits"
vis="InvisibleWithDaughters"
>
<type_flags type="DetType_CALORIMETER + DetType_ENDCAP + DetType_HADRONIC"/>
<position x="HcalFarForwardZDC_SiPMonTile_x_pos" y="HcalFarForwardZDC_SiPMonTile_y_pos" z="HcalFarForwardZDC_SiPMonTile_z_pos"/>
<rotation x="HcalFarForwardZDC_SiPMonTile_rotateX_angle" y="HcalFarForwardZDC_SiPMonTile_rotateY_angle" z="HcalFarForwardZDC_SiPMonTile_rotateZ_angle"/>
<dimensions
Expand Down
1 change: 1 addition & 0 deletions compact/far_forward/ZDC_WSi.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
type="ZDC_ImagingCal"
vis="ZDC_WSi_Vis"
readout="ZDC_WSi_Hits">
<type_flags type="DetType_CALORIMETER + DetType_ENDCAP + DetType_ELECTROMAGNETIC"/>
<position x="ZDC_WSi_x_pos" y="ZDC_WSi_y_pos" z="ZDC_WSi_z_pos"/>
<rotation x="ZDC_WSi_rotateX_angle" y="ZDC_WSi_rotateY_angle" z="ZDC_WSi_rotateZ_angle"/>
<dimensions x="ZDC_WSi_x" y="ZDC_WSi_y" z="ZDC_WSi_z"/>
Expand Down
2 changes: 2 additions & 0 deletions compact/far_forward/beam_orbit_tracker.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
insideTrackingVolume="true"
reflect="false"
vis="RedVis">
<type_flags type="DetType_TRACKER + DetType_ENDCAP"/>
<position x="-217.98*mm" y="0" z="8498.952*mm"/> <!-- end of B0apf + 1mm -->
<rotation x="0*rad" y="-25.0*0.001*rad" z="0*rad"/>
<module name="Module1" vis="AnlProcess_Blue">
Expand All @@ -41,6 +42,7 @@
insideTrackingVolume="true"
reflect="false"
vis="RedVis">
<type_flags type="DetType_TRACKER + DetType_ENDCAP"/>
<position x="-631.65*mm" y="0" z="22062.85*mm"/> <!-- end of B1apf + 1mm -->
<rotation x="0*rad" y="-25.0*0.001*rad" z="0*rad"/>
<module name="Module1" vis="AnlProcess_Blue">
Expand Down
1 change: 1 addition & 0 deletions compact/far_forward/beampipe_hadron_B0.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<detectors>

<detector id="BeamPipeB0_ID" name="BeamPipeB0" type="forwardBeamPipeBrazil" vis="BeamPipeVis">
<type_flags type="DetType_ENDCAP + DetType_BEAMPIPE"/>
<position x="-0.165*m" y="0*m" z="B0PF_CenterPosition" />
<rotation x="0*rad" y="0*rad" z="0*rad" />
</detector>
Expand Down
1 change: 1 addition & 0 deletions compact/far_forward/electron_beamline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
type="BeamPipeChain"
wall_thickness="Beampipe_cen_pos_Thickness">

<type_flags type="DetType_ENDCAP + DetType_BEAMPIPE"/>
<pipe id="0" name="Pipe_FWD_electron"
xcenter="0" zcenter="(Beampipe_fwd_pos_EndZ+Beampipe_cen_pos_EndZ)/2."
length="Beampipe_fwd_pos_EndZ-Beampipe_cen_pos_EndZ" theta="0"
Expand Down
1 change: 1 addition & 0 deletions compact/far_forward/offM_tracker.xml
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@
readout="ForwardOffMTrackerHits"
vis="FFTrackerVis"
reflect="false">
<type_flags type="DetType_TRACKER + DetType_ENDCAP"/>
<position x="-1032.0*mm" y="0" z="27020*mm"/>
<rotation x="0*rad" y="-0.047*rad" z="0*rad"/>
<module name="OMD4Mod1" vis="FFTrackerShieldedModuleVis">
Expand Down
2 changes: 2 additions & 0 deletions compact/far_forward/roman_pots_eRD24_design.xml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
type="ip6_ForwardRomanPot"
insideTrackingVolume="true"
reflect="false" vis="FFTrackerVis">
<type_flags type="DetType_TRACKER + DetType_ENDCAP"/>
<position x="ForwardRomanPotStation1_xpos" y="0" z="ForwardRomanPotStation1_zpos" />
<rotation x="0" y="ForwardRomanPotStation1_rotation" z="0" />
<module name="ModuleRP1" vis="FFTrackerShieldedModuleVis" nx="1" ny="1" width="ForwardRomanPot_ModuleWidth" height="ForwardRomanPot_ModuleHeight">
Expand Down Expand Up @@ -161,6 +162,7 @@
insideTrackingVolume="true"
reflect="false"
vis="FFTrackerVis">
<type_flags type="DetType_TRACKER + DetType_ENDCAP"/>
<position x="ForwardRomanPotStation2_xpos" y="0" z="ForwardRomanPotStation2_zpos" />
<rotation x="0" y="ForwardRomanPotStation1_rotation" z="0" />
<module name="ModuleRP2" vis="FFTrackerShieldedModuleVis" nx="1" ny="1" width="ForwardRomanPot_ModuleWidth" height="ForwardRomanPot_ModuleHeight">
Expand Down
1 change: 1 addition & 0 deletions compact/hcal/backward_template.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
calorimeterType="HAD_ENDCAP"
allSensitive="HcalEndcapN_allSensitive"
>
<type_flags type="DetType_CALORIMETER + DetType_ENDCAP + DetType_HADRONIC"/>
<position x="0" y="0" z="0"/>
<dimensions
numsides="HcalEndcapN_CaloSides"
Expand Down
1 change: 1 addition & 0 deletions compact/hcal/barrel_gdml.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
z1="HcalBarrel_length1"
z2="HcalBarrel_length2"
calorimeterType="HAD_BARREL">
<type_flags type="DetType_CALORIMETER + DetType_BARREL + DetType_HADRONIC"/>
<sec_gdmlfile file="gdml/barrel_hcal_steel_sector_nocombs.gdml" url="https://github.com/eic/epic-data/raw/c1ef9dca1781047fe9485eec6c0f986ec7d27f41/barrel_HCAL_gdml/barrel_hcal_steel_sector_nocombs.gdml" cache="$DETECTOR_PATH:/opt/detector" material="Steel1020"/>
<csec_gdmlfile file="gdml/barrel_hcal_steel_chimneysector_nocombs.gdml" url="https://github.com/eic/epic-data/raw/c1ef9dca1781047fe9485eec6c0f986ec7d27f41/barrel_HCAL_gdml/barrel_hcal_steel_chimneysector_nocombs.gdml" cache="$DETECTOR_PATH:/opt/detector" material="Steel1020"/>
<er_gdmlfile file="gdml/barrel_hcal_steel_endring.gdml" url="https://github.com/eic/epic-data/raw/c1ef9dca1781047fe9485eec6c0f986ec7d27f41/barrel_HCAL_gdml/barrel_hcal_steel_endring.gdml" cache="$DETECTOR_PATH:/opt/detector" material="Steel1020"/>
Expand Down
1 change: 1 addition & 0 deletions compact/hcal/lfhcal.xml
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@
renderComponents="0"
allSensitive="0"
>
<type_flags type="DetType_CALORIMETER + DetType_ENDCAP + DetType_HADRONIC"/>

<position x="0" y="0" z="LFHCAL_zmin"/>
<dimensions
Expand Down
1 change: 1 addition & 0 deletions compact/pid/dirc.xml
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@

<detectors>
<detector id="BarrelDIRC_ID" name="cb_DIRC" type="epic_DIRC" readout="DIRCBarHits" vis="DIRCTube">
<type_flag type="DetType_CHERENKOV + DetType_Barrel"/>
<dimensions rmin="DIRCBar_center - DIRCBar_height/2" rmax="DIRCBar_center + DIRCBar_height/2" length="DIRC_length"/>
<position x="0" y="0" z="DIRC_offset"/>
<module name="DIRCBox" repeat="DIRCBox_count" width="DIRCPrism_width + 1*mm" height="DIRCPrism_height*2" length="DIRCBarAssm_length + 550*mm" vis="DIRCBox">
Expand Down
2 changes: 1 addition & 1 deletion compact/pid/drich.xml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
vis_vessel="DRICH_vessel_vis"
vis_gas="DRICH_gas_vis"
>

<type_flags type="DetType_CHERENKOV + DetType_ENDCAP"/>

<!-- /detectors/detector/dimensions -->
<documentation level="10">
Expand Down
1 change: 1 addition & 0 deletions compact/pid/pfrich.xml
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@
vis_vessel="PFRICH_vessel_vis"
vis_gas="DRICH_gas_vis"
>
<type_flags type="DetType_CHERENKOV + DetType_ENDCAP"/>

<parent name="/world_volume"/>

Expand Down
4 changes: 4 additions & 0 deletions src/B0ECal_geo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include "DDRec/Surface.h"
#include "Math/Point2D.h"
#include <XML/Helper.h>
#include <XML/Utilities.h>

//////////////////////////////////////////////////
// Far Forward B0 Electromagnetic Calorimeter
Expand All @@ -36,6 +37,9 @@ static Ref_t createDetector(Detector& desc, xml_h e, SensitiveDetector sens) {
DetElement det(detName, detID);
sens.setType("calorimeter");

// apply any detector type flags set in XML
dd4hep::xml::setDetectorTypeFlag(x_det, det);

// assembly
Assembly detVol(detName);

Expand Down
9 changes: 9 additions & 0 deletions src/B0Preshower_geo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Copyright (C) 2022 Whitney Armstrong

#include "DD4hep/DetFactoryHelper.h"
#include "XML/Utilities.h"
#include <map>

using namespace std;
Expand All @@ -26,6 +27,9 @@ static Ref_t create_B0Preshower(Detector& description, xml_h e, SensitiveDetecto
xml::Component pos = x_det.position();
xml::Component rot = x_det.rotation();

// apply any detector type flags set in XML
dd4hep::xml::setDetectorTypeFlag(x_det, sdet);

// Material air = description.material("Air");
// Volume assembly (det_name,Box(10000,10000,10000),vacuum);
Volume motherVol = description.pickMotherVolume(sdet);
Expand Down Expand Up @@ -151,6 +155,7 @@ static Ref_t create_B0Preshower(Detector& description, xml_h e, SensitiveDetecto
}
DetElement layer_element(sdet, layer_name, l_id);
layer_element.setPlacement(layer_pv);
layer_element.setTypeFlag(sdet.typeFlag()); // make sure type flags are propagated

for (xml_coll_t ri(x_layer, _U(ring)); ri; ++ri) {
xml_comp_t x_ring = ri;
Expand All @@ -177,21 +182,25 @@ static Ref_t create_B0Preshower(Detector& description, xml_h e, SensitiveDetecto
Position(x, y, zstart + dz)));
pv.addPhysVolID("barrel", 1).addPhysVolID("layer", l_id).addPhysVolID("module", mod_num);
module.setPlacement(pv);
module.setTypeFlag(sdet.typeFlag());
for (size_t ic = 0; ic < sensVols.size(); ++ic) {
PlacedVolume sens_pv = sensVols[ic];
DetElement comp_elt(module, sens_pv.volume().name(), mod_num);
comp_elt.setPlacement(sens_pv);
comp_elt.setTypeFlag(sdet.typeFlag());
}
} else {
pv = layer_vol.placeVolume(m_vol, Transform3D(RotationZYX(0, -M_PI / 2 - phi, -M_PI / 2),
Position(x, y, -zstart - dz)));
pv.addPhysVolID("barrel", 2).addPhysVolID("layer", l_id).addPhysVolID("module", mod_num);
DetElement r_module(layer_element, m_base + "_neg", det_id);
r_module.setPlacement(pv);
r_module.setTypeFlag(sdet.typeFlag()); // make sure type flags are propagated
for (size_t ic = 0; ic < sensVols.size(); ++ic) {
PlacedVolume sens_pv = sensVols[ic];
DetElement comp_elt(r_module, sens_pv.volume().name(), mod_num);
comp_elt.setPlacement(sens_pv);
comp_elt.setTypeFlag(sdet.typeFlag());
}
}
dz = -dz;
Expand Down
3 changes: 3 additions & 0 deletions src/B0Tracker_geo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ static Ref_t create_B0Tracker(Detector& description, xml_h e, SensitiveDetector
layer_name += "_P";
DetElement layer_element(sdet, layer_name, l_id);
layer_element.setPlacement(layer_pv);
layer_element.setTypeFlag(sdet.typeFlag()); // make sure type flags are propagated

auto& layerParams =
DD4hepDetectorHelper::ensureExtension<dd4hep::rec::VariantParameters>(layer_element);
Expand All @@ -207,6 +208,7 @@ static Ref_t create_B0Tracker(Detector& description, xml_h e, SensitiveDetector

// if (!reflect) {
DetElement module(layer_element, m_base + "_pos", det_id);
module.setTypeFlag(sdet.typeFlag()); // make sure type flags are propagated
pv = layer_vol.placeVolume(m_vol, Transform3D(RotationZYX(0, -M_PI / 2 - phi, -M_PI / 2),
Position(x, y, zstart + dz)));
pv.addPhysVolID("layer", l_id).addPhysVolID("module", mod_num);
Expand All @@ -215,6 +217,7 @@ static Ref_t create_B0Tracker(Detector& description, xml_h e, SensitiveDetector
PlacedVolume sens_pv = sensVols[ic];
DetElement comp_elt(module, sens_pv.volume().name(), mod_num);
comp_elt.setPlacement(sens_pv);
comp_elt.setTypeFlag(sdet.typeFlag()); // make sure type flags are propagated
auto& comp_elt_params =
DD4hepDetectorHelper::ensureExtension<dd4hep::rec::VariantParameters>(comp_elt);
comp_elt_params.set<std::string>("axis_definitions", "XZY");
Expand Down
Loading
Loading