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
8 changes: 4 additions & 4 deletions compact/hcal/barrel_gdml.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
<tile6_gdmlfile file="gdml/Tile06_Reduced.gdml" url="https://github.com/eic/epic-data/raw/2edf54d71b069acb81d969a75717427a0bf77217/barrel_HCAL_gdml/tiles/Tile06_Reduced.gdml" cache="$DETECTOR_PATH:/opt/detector" material="PlasticScint"/>
<tile7_gdmlfile file="gdml/Tile07_Reduced.gdml" url="https://github.com/eic/epic-data/raw/2edf54d71b069acb81d969a75717427a0bf77217/barrel_HCAL_gdml/tiles/Tile07_Reduced.gdml" cache="$DETECTOR_PATH:/opt/detector" material="PlasticScint"/>
<tile8_gdmlfile file="gdml/Tile08_Reduced.gdml" url="https://github.com/eic/epic-data/raw/582c777d1f17886da4619b1a2b047c507db43672/barrel_HCAL_gdml/tiles/Tile08_Reduced.gdml" cache="$DETECTOR_PATH:/opt/detector" material="PlasticScint"/>
<tile9_gdmlfile file="gdml/Tile09_Reduced.gdml" url="https://github.com/eic/epic-data/raw/2edf54d71b069acb81d969a75717427a0bf77217/barrel_HCAL_gdml/tiles/Tile09_Reduced.gdml" cache="$DETECTOR_PATH:/opt/detector" material="PlasticScint"/>
<tile10_gdmlfile file="gdml/Tile10_Reduced.gdml" url="https://github.com/eic/epic-data/raw/2edf54d71b069acb81d969a75717427a0bf77217/barrel_HCAL_gdml/tiles/Tile10_Reduced.gdml" cache="$DETECTOR_PATH:/opt/detector" material="PlasticScint"/>
<tile11_gdmlfile file="gdml/Tile11_Reduced.gdml" url="https://github.com/eic/epic-data/raw/2edf54d71b069acb81d969a75717427a0bf77217/barrel_HCAL_gdml/tiles/Tile11_Reduced.gdml" cache="$DETECTOR_PATH:/opt/detector" material="PlasticScint"/>
<tile12_gdmlfile file="gdml/Tile12_Reduced.gdml" url="https://github.com/eic/epic-data/raw/2edf54d71b069acb81d969a75717427a0bf77217/barrel_HCAL_gdml/tiles/Tile12_Reduced.gdml" cache="$DETECTOR_PATH:/opt/detector" material="PlasticScint"/>
<tile9_gdmlfile file="gdml/Tile09_Reduced.gdml" url="https://github.com/eic/epic-data/raw/66733a76b758ce9d85d270e59fdd560f84bc70ec/barrel_HCAL_gdml/tiles/Tile09_Reduced.gdml" cache="$DETECTOR_PATH:/opt/detector" material="PlasticScint"/>
<tile10_gdmlfile file="gdml/Tile10_Reduced.gdml" url="https://github.com/eic/epic-data/raw/66733a76b758ce9d85d270e59fdd560f84bc70ec/barrel_HCAL_gdml/tiles/Tile10_Reduced.gdml" cache="$DETECTOR_PATH:/opt/detector" material="PlasticScint"/>
<tile11_gdmlfile file="gdml/Tile11_Reduced.gdml" url="https://github.com/eic/epic-data/raw/66733a76b758ce9d85d270e59fdd560f84bc70ec/barrel_HCAL_gdml/tiles/Tile11_Reduced.gdml" cache="$DETECTOR_PATH:/opt/detector" material="PlasticScint"/>
<tile12_gdmlfile file="gdml/Tile12_Reduced.gdml" url="https://github.com/eic/epic-data/raw/66733a76b758ce9d85d270e59fdd560f84bc70ec/barrel_HCAL_gdml/tiles/Tile12_Reduced.gdml" cache="$DETECTOR_PATH:/opt/detector" material="PlasticScint"/>
<ctile9_gdmlfile file="gdml/CTile09_Reduced.gdml" url="https://github.com/eic/epic-data/raw/2edf54d71b069acb81d969a75717427a0bf77217/barrel_HCAL_gdml/tiles/CTile09_Reduced.gdml" cache="$DETECTOR_PATH:/opt/detector" material="PlasticScint"/>
<ctile10_gdmlfile file="gdml/CTile10_Reduced.gdml" url="https://github.com/eic/epic-data/raw/2edf54d71b069acb81d969a75717427a0bf77217/barrel_HCAL_gdml/tiles/CTile10_Reduced.gdml" cache="$DETECTOR_PATH:/opt/detector" material="PlasticScint"/>
<ctile11_gdmlfile file="gdml/CTile11_Reduced.gdml" url="https://github.com/eic/epic-data/raw/2edf54d71b069acb81d969a75717427a0bf77217/barrel_HCAL_gdml/tiles/CTile11_Reduced.gdml" cache="$DETECTOR_PATH:/opt/detector" material="PlasticScint"/>
Expand Down
17 changes: 11 additions & 6 deletions src/BarrelHCalCalorimeter_geo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -255,18 +255,23 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
Transform3D(RotationZ(-k * sec_rot_angle * dd4hep::deg) * RotationY(180.0 * dd4hep::deg),
Translation3D(0, 0, 0)));
}

BarrelHCAL.placeVolume(
barrel_csector_vol, 0,
Transform3D(RotationZ(sec_rot_angle * dd4hep::deg) * RotationY(180.0 * dd4hep::deg),
Translation3D(0, 0, 0)));

BarrelHCAL.placeVolume(barrel_csector_vol, 1,
Transform3D(RotationY(180.0 * dd4hep::deg), Translation3D(0, 0, 0)));

BarrelHCAL.placeVolume(
barrel_csector_vol, 2,
Transform3D(RotationZ(-sec_rot_angle * dd4hep::deg) * RotationY(180.0 * dd4hep::deg),
Translation3D(0, 0, 0)));

BarrelHCAL.placeVolume(barrel_er_vol, 0,
Transform3D(RotationY(180.0 * dd4hep::deg), Translation3D(0, 0, 0)));

BarrelHCAL.placeVolume(barrel_er_vol, 1,
Transform3D(RotationY(0.0 * dd4hep::deg), Translation3D(0, 0, 0)));

Expand Down Expand Up @@ -424,8 +429,8 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
RotationY(90.0 * dd4hep::deg),
Translation3D(xposOuter[0] * dd4hep::mm, yposOuter[0] * dd4hep::mm, 0.0)) *
RotationX(-tilePlaneRotate * dd4hep::deg) *
Translation3D((xposTile[tnum] + (tnum + 1) * tile_tolerance) * dd4hep::mm,
yposTile[tnum] * dd4hep::mm, zposTile[tnum] * dd4hep::mm));
Translation3D(-(xposTile[tnum] + (tnum + 1) * tile_tolerance) * dd4hep::mm,
yposTile[tnum] * dd4hep::mm, -zposTile[tnum] * dd4hep::mm));

phv1.addPhysVolID("eta", i_eta).addPhysVolID("phi", i_phi);
DetElement sd1 = tile_det.clone(_toString(i_eta, "eta%d ") + _toString(i_phi, "phi%d"));
Expand All @@ -441,8 +446,8 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
RotationX(-tilePlaneRotate * dd4hep::deg) *
Transform3D(
RotationY(180.0 * dd4hep::deg),
Translation3D(-(xposTile[tnum] + (tnum + 1) * tile_tolerance) * dd4hep::mm,
yposTile[tnum] * dd4hep::mm, -zposTile[tnum] * dd4hep::mm)));
Translation3D((xposTile[tnum] + (tnum + 1) * tile_tolerance) * dd4hep::mm,
yposTile[tnum] * dd4hep::mm, zposTile[tnum] * dd4hep::mm)));

phv0.addPhysVolID("eta", (12 + tnum)).addPhysVolID("phi", i_phi);
DetElement sd0 =
Expand Down Expand Up @@ -479,8 +484,8 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
RotationY(90.0 * dd4hep::deg),
Translation3D(xposOuter[0] * dd4hep::mm, yposOuter[0] * dd4hep::mm, 0.0)) *
RotationX(-tilePlaneRotate * dd4hep::deg) *
Translation3D((xposTile[tnum] + (tnum + 1) * tile_tolerance) * dd4hep::mm,
yposTile[tnum] * dd4hep::mm, zposTile[tnum] * dd4hep::mm));
Translation3D(-(xposTile[tnum] + (tnum + 1) * tile_tolerance) * dd4hep::mm,
yposTile[tnum] * dd4hep::mm, -zposTile[tnum] * dd4hep::mm));

phv0.addPhysVolID("eta", i_eta).addPhysVolID("phi", i_phi);
DetElement sd0 = tile_det.clone(_toString(i_eta, "eta%d ") + _toString(i_phi, "phi%d"));
Expand Down
Loading