From b1430d163bb8ae97e75d9fdac1e613b74fde79ce Mon Sep 17 00:00:00 2001 From: Frank Gaede <frank.gaede@desy.de> Date: Mon, 12 Aug 2013 13:20:35 +0000 Subject: [PATCH] - switched to use RotationX,Y,Z (Sh.Lu) --- .../ILDExDet/src/compact/AhcalBarrelCalorimeter_geo.cpp | 4 ++-- .../ILDExDet/src/compact/AhcalEndcapCalorimeter_geo.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DDExamples/ILDExDet/src/compact/AhcalBarrelCalorimeter_geo.cpp b/DDExamples/ILDExDet/src/compact/AhcalBarrelCalorimeter_geo.cpp index 38926058b..03af52f73 100644 --- a/DDExamples/ILDExDet/src/compact/AhcalBarrelCalorimeter_geo.cpp +++ b/DDExamples/ILDExDet/src/compact/AhcalBarrelCalorimeter_geo.cpp @@ -194,7 +194,7 @@ static Ref_t create_detector(LCDD& lcdd, xml_h element, SensitiveDetector sens) { layer_pos_z = (module_num==0)?layer_pos_z:-layer_pos_z; PlacedVolume layer_phv = envelopeVol.placeVolume(layer_vol, - Transform3D(Rotation(delte_phi,0.,0.), + Transform3D(RotationZ(delte_phi), Translation3D(layer_pos_x*std::cos(delte_phi), layer_pos_x*std::sin(delte_phi), layer_pos_z))); @@ -238,7 +238,7 @@ static Ref_t create_detector(LCDD& lcdd, xml_h element, SensitiveDetector sens) // ========================================================================== // Place Hcal Barrel volume into the world volume - PlacedVolume env_phv = motherVol.placeVolume(envelopeVol,Rotation(0.,0.,Hcal_Barrel_rotation)); + PlacedVolume env_phv = motherVol.placeVolume(envelopeVol,Transform3D( RotationZ(Hcal_Barrel_rotation) )); // registry the system id env_phv.addPhysVolID("system", sdet.id()); diff --git a/DDExamples/ILDExDet/src/compact/AhcalEndcapCalorimeter_geo.cpp b/DDExamples/ILDExDet/src/compact/AhcalEndcapCalorimeter_geo.cpp index 8c1948276..0610f4241 100644 --- a/DDExamples/ILDExDet/src/compact/AhcalEndcapCalorimeter_geo.cpp +++ b/DDExamples/ILDExDet/src/compact/AhcalEndcapCalorimeter_geo.cpp @@ -259,7 +259,7 @@ static Ref_t create_detector(LCDD& lcdd, xml_h element, SensitiveDetector sens) EndcapModule_pos_z = (module_num==0)?EndcapModule_pos_z:-EndcapModule_pos_z; PlacedVolume env_phv = motherVol.placeVolume(envelopeVol, - Transform3D(Rotation(0.,0.,rot_EM), + Transform3D(RotationX(rot_EM), Translation3D(EndcapModule_pos_x, EndcapModule_pos_y, EndcapModule_pos_z))); -- GitLab