diff --git a/Detector/DetCRD/CMakeLists.txt b/Detector/DetCRD/CMakeLists.txt
index 5a8f34df05586ec5fab8c7205466c6b14af380c2..9b8942ee0781a16a2f7c7bb0a5313d5e12334f11 100644
--- a/Detector/DetCRD/CMakeLists.txt
+++ b/Detector/DetCRD/CMakeLists.txt
@@ -15,7 +15,7 @@ gaudi_add_module(DetCRD
src/Calorimeter/Lumical_v01_geo.cpp
src/Other/Lumical_v01_geo_beampipe.cpp
src/Other/CRDBeamPipe_v01_geo.cpp
- src/Muon/Muon_Barrel_v01_03.cpp
+ src/Muon/Muon_Barrel_v01_04.cpp
src/Muon/Muon_Endcap_v01_02.cpp
src/Tracker/SiTrackerSkewRing_v01_geo.cpp
src/Tracker/SiTrackerStitching_v01_geo.cpp
diff --git a/Detector/DetCRD/compact/CRD_common_v01/Muon_Barrel_v01_04.xml b/Detector/DetCRD/compact/CRD_common_v01/Muon_Barrel_v01_04.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3e054f86c6dd62f537209cb5e24cb8457cddec5f
--- /dev/null
+++ b/Detector/DetCRD/compact/CRD_common_v01/Muon_Barrel_v01_04.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lccdd>
+
+ <info name="Muon_Barrel"
+ title="Test with A Single Muon Barrel"
+ author="Zibing Bai"
+ url="http://cepcgit.ihep.ac.cn"
+ status="development"
+ version="v01">
+ <comment>Test with A Single Muon Barrel</comment>
+ </info>
+
+ <define>
+ <!--Muon Barrel-->
+ <constant name="Muon_barrel_superlayer_num" value="6"/>
+ <constant name="Muon_barrel_strip_num_0" value="26"/>
+ <constant name="Muon_barrel_strip_num_1" value="38"/>
+ <constant name="Muon_barrel_strip_num_2" value="50"/>
+ <constant name="Muon_barrel_strip_num_3" value="62"/>
+ <constant name="Muon_barrel_strip_num_4" value="74"/>
+ <constant name="Muon_barrel_strip_num_5" value="86"/>
+ <!--constant name="Muon_barrel_strip_num_6" value="89"/>
+ <constant name="Muon_barrel_strip_num_7" value="101"/-->
+ <constant name="Muon_barrel_strip_num_fixed_0" value="106"/>
+ <constant name="Muon_barrel_strip_num_fixed_1" value="115"/>
+
+ <!--constant name="Muon_barrel_iron_x1" value="Muon_standard_scale"/-->
+ <constant name="Muon_barrel_iron_y" value="Muon_total_length"/>
+ <constant name="Muon_barrel_iron_z" value="Muon_standard_scale"/>
+ <constant name="Muon_barrel_iron_posx" value="-1*Muon_standard_scale"/>
+
+ <constant name="Muon_barrel_barrel_y" value="Muon_barrel_iron_y"/>
+ <constant name="Muon_barrel_barrel_posy" value="0.5*Muon_barrel_barrel_y"/>
+
+ <constant name="Muon_barrel_superlayer_init" value="-35*cm"/>
+ <constant name="Muon_barrel_superlayer_gap" value="14*cm"/>
+ <constant name="Muon_barrel_superlayer_endcap_gap" value="10*cm"/>
+ <constant name="Muon_barrel_superlayer_air_gap" value="1*cm"/>
+
+ <constant name="Muon_barrel_superlayer_length_0" value="4275*mm"/>
+ <constant name="Muon_barrel_superlayer_length_1" value="4625*mm"/>
+
+ <constant name="Muon_barrel_strip_width_fixed" value="20*mm"/>
+
+ <constant name="Muon_barrel_superlayer_y" value="2*Muon_strip_y+Muon_barrel_superlayer_air_gap"/>
+ <!--constant name="Muon_barrel_superlayer_z" value="Muon_strip_z+2*Muon_strip_surf+2*Muon_barrel_superlayer_air_gap"/-->
+
+ <!--Checkout-->
+ <!--constant name="Muon_barrel_inner_radius" value="4245*mm"/-->
+ <constant name="Muon_barrel_barrel_num" value="2"/>
+ <constant name="Muon_barrel_iron_part_num" value="12"/>
+
+ </define>
+
+ <detectors>
+ <detector id="DetID_MUON" name="MuonBarrel" type="Muon_Barrel_v01_04" readout="MuonBarrelCollection" vis="WhiteVis">
+ <position x="0" y="0" z="0"/>
+ <barrel id="Muon_barrel_iron_part_num" name="Muon_barrel_barrel" type="Muon_barrel_barrel" vis="SeeThrough">
+ <position x="0" y="Muon_barrel_barrel_posy" z="0"/>
+ <iron id="0" name="Muon_barrel_iron_part" type="Muon_barrel_iron_part" vis="GrayVis" material="Iron">
+ <material name="Iron"/>
+ <position x="Muon_barrel_iron_posx" y="0"/>
+ <dimensions x1="0.5*Muon_barrel_iron_x1" y1="0.5*Muon_barrel_iron_y" y2="0.5*Muon_barrel_iron_y" dz="0.5*Muon_barrel_iron_z"/>
+ <superlayer id="Muon_barrel_superlayer_num" name="Muon_barrel_superlayer" type="Muon_barrel_superlayer" vis="BlueVis" material="Air">
+ <stripe id="0" name="Muon_stripe" type="Muon_stripe" vis="GreenVis" material="Air">
+ <material name="Air"/>
+ <dimensions dx="0.5*Muon_strip_x" dy="0.5*Muon_strip_y" dz="0.5*Muon_strip_z+Muon_strip_SiPM_z"/>
+ <component id="0" type="Muon_strip_surface" name="Muon_strip_surface" vis="GreenVis" material="BC420">
+ <position x="0" y="0" z="0"/>
+ <dimensions dx="0.5*Muon_strip_surface_x" dy="0.5*Muon_strip_surface_y" dz="0.5*Muon_strip_surface_z"/>
+ <!--cut name="Muon_strip_cut1" vis="GreenVis" material="Air">
+ <position x="Muon_strip_cut1_posx" y="Muon_strip_cut1_posy" z="Muon_strip_cut1_posz"/>
+ <dimensions dx="0.5*Muon_strip_cut1_x" dy="0.5*Muon_strip_cut1_y" dz="0.5*Muon_strip_cut1_z"/>
+ </cut-->
+ </component>
+ <component id="1" type="Muon_strip_scintillator" name="Muon_strip_scintillator" vis="GreenVis" material="BC420">
+ <position x="0" y="0" z="0"/>
+ <dimensions dx="0.5*Muon_strip_scintillator_x" dy="0.5*Muon_strip_scintillator_y" dz="0.5*Muon_strip_scintillator_z"/>
+ <cut name="Muon_strip_cut3" vis="GreenVis" material="Air">
+ <!--position x="Muon_strip_cut3_posx" y="Muon_strip_cut3_posy" z="Muon_strip_cut3_posz"/-->
+ <position x="0" y="0" z="0"/>
+ <dimensions rmin="0" rmax="Muon_strip_cut3_rmax" dz="0.5*Muon_strip_cut3_z"/>
+ <!--comb name="Muon_strip_cut2" vis="GreenVis" material="Air">
+ <position x="Muon_strip_cut2_posx" y="Muon_strip_cut2_posy" z="Muon_strip_cut2_posz"/>
+ <dimensions dx="0.5*Muon_strip_cut2_x" dy="0.5*Muon_strip_cut2_y" dz="0.5*Muon_strip_cut2_z"/>
+ </comb-->
+ </cut>
+ </component>
+ <component id="2" type="Muon_strip_SiPM" name="Muon_strip_SiPM" vis="GreenVis" material="Air">
+ <position x="Muon_strip_SiPM_posx" y="Muon_strip_SiPM_posy" z="Muon_strip_SiPM_posz"/>
+ <dimensions dx="0.5*Muon_strip_SiPM_x" dy="0.5*Muon_strip_SiPM_y" dz="0.5*Muon_strip_SiPM_z"/>
+ </component>
+ </stripe>
+ </superlayer>
+ </iron>
+ </barrel>
+ </detector>
+ </detectors>
+
+ <readouts>
+ <readout name="MuonBarrelCollection">
+ <segmentation type="NoSegmentation"/>
+ <id>system:5,Env:5,Fe:5,Superlayer:5,Layer:5,Stripe:9</id>
+ </readout>
+ </readouts>
+
+</lccdd>
diff --git a/Detector/DetCRD/compact/TDR_o1_v01/TDR_Dimensions_v01_01.xml b/Detector/DetCRD/compact/TDR_o1_v01/TDR_Dimensions_v01_01.xml
index 07863eea09dd6c56633575cd70c7d16afe7caebf..6141a55826c934d94f1965a19606867f23630449 100644
--- a/Detector/DetCRD/compact/TDR_o1_v01/TDR_Dimensions_v01_01.xml
+++ b/Detector/DetCRD/compact/TDR_o1_v01/TDR_Dimensions_v01_01.xml
@@ -263,7 +263,7 @@
<!--standard scale-->
<constant name="Muon_standard_scale" value="94*cm"/>
<!--constant name="Muon_total_length" value="8950*mm"/--><!--overlap with coil and hcal-->
- <constant name="Muon_total_length" value="Yoke_endcap_zmin*2"/>
+ <constant name="Muon_total_length" value="9150*mm"/>
<!--Muon Barrel>
<constant name="Muon_barrel_barrel_num" value="2"/>
diff --git a/Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01.xml b/Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01.xml
index 6aa3193e1834f7028ce828a89cf9f4ac3cdb1c7b..c92582589828e3b3d87e572ea0ca4d400e6e442d 100644
--- a/Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01.xml
+++ b/Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01.xml
@@ -55,7 +55,7 @@
<include ref="../CRD_common_v02/Yoke_Polyhedra_Endcaps_v01_01.xml"/-->
<!--muon detector-->
- <include ref="../CRD_common_v01/Muon_Barrel_v01_03.xml"/>
+ <include ref="../CRD_common_v01/Muon_Barrel_v01_04.xml"/>
<include ref="../CRD_common_v01/Muon_Endcap_v01_02.xml"/>
<include ref="../CRD_common_v01/ParaffinEndcap_v01_01.xml"/>
diff --git a/Detector/DetCRD/src/Muon/Muon_Barrel_v01_04.cpp b/Detector/DetCRD/src/Muon/Muon_Barrel_v01_04.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..454bba1625d2a079aeacc419cf1db16fd0a8e468
--- /dev/null
+++ b/Detector/DetCRD/src/Muon/Muon_Barrel_v01_04.cpp
@@ -0,0 +1,215 @@
+#include "DD4hep/DetFactoryHelper.h"
+#include "DD4hep/OpticalSurfaces.h"
+#include "XML/Utilities.h"
+#include "DDRec/DetectorData.h"
+#include "DDSegmentation/Segmentation.h"
+#include <cmath>
+
+#define MYDEBUG(x) std::cout << __FILE__ << ":" << __LINE__ << ": " << x << std::endl;
+#define MYDEBUGVAL(x) std::cout << __FILE__ << ":" << __LINE__ << ": " << #x << ": " << x << std::endl;
+
+using dd4hep::rec::LayeredCalorimeterData;
+static dd4hep::Ref_t create_detector(dd4hep::Detector& theDetector,
+ xml_h e,
+ dd4hep::SensitiveDetector sens) {
+
+ xml_det_t x_det = e;
+
+ std::string det_name = x_det.nameStr();
+ std::string det_type = x_det.typeStr();
+ MYDEBUGVAL(det_name);
+ MYDEBUGVAL(det_type);
+ xml_dim_t pos (x_det.child(_U(position)));
+
+ dd4hep::DetElement sdet(det_name, x_det.id());
+
+ dd4hep::Assembly envelope(det_name);
+
+ dd4hep::xml::setDetectorTypeFlag( e, sdet ) ;
+
+ dd4hep::Volume motherVol = theDetector.pickMotherVolume(sdet);
+
+ sens.setType("muonbarrel");
+
+// dd4hep::Readout readout = sens.readout();
+// dd4hep::Segmentation seg = readout.segmentation();
+ xml_coll_t dcEnv(x_det,Unicode("barrel"));
+ xml_comp_t x_env = dcEnv;
+ xml_coll_t dcFe(x_env,Unicode("iron"));
+ xml_comp_t x_Fe = dcFe;
+
+ std::string Fe_name = x_Fe.nameStr();
+ dd4hep::Material Fe_mat(theDetector.material(x_Fe.materialStr()));
+ xml_dim_t Fe_pos(x_Fe.child(_U(position)));
+ xml_dim_t Fe_dim(x_Fe.child(_U(dimensions)));
+ //double Fe_halfX1 = 0.5 * theDetector.constant<double>("Muon_standard_scale");
+ // double Fe_halfX2 = Fe_halfX1 + theDetector.constant<double>("Muon_barrel_iron_z") * std::sqrt(3);
+
+ // dd4hep::Trd2 Fe_solid(Fe_halfX1,Fe_halfX2,Fe_dim.y1(),Fe_dim.y2(),Fe_dim.dz());
+ // dd4hep::Volume Fe_vol(Fe_name, Fe_solid, Fe_mat);
+ // Fe_vol.setVisAttributes(theDetector.visAttributes(x_Fe.visStr()));
+
+ xml_coll_t dcSuperlayer(x_Fe,Unicode("superlayer"));
+ xml_comp_t x_superlayer = dcSuperlayer;
+
+ int strip_type_num_total = 8;
+ dd4hep::Box strip_solid[strip_type_num_total], strip_solid_fixed[strip_type_num_total];//, surface_solid[strip_type_num_total], BC420_solid[strip_type_num_total];
+ //dd4hep::Tube cut3_solid[strip_type_num_total];
+ dd4hep::Volume strip_vol[strip_type_num_total], strip_vol_fixed[strip_type_num_total];//, surface_vol[strip_type_num_total], BC420_vol[strip_type_num_total], cut3_vol[strip_type_num_total];
+
+ xml_coll_t dcStrip(x_superlayer,Unicode("stripe"));
+ xml_comp_t x_strip = dcStrip;
+ std::string strip_name = x_strip.nameStr();
+ dd4hep::Material strip_mat(theDetector.material(x_strip.materialStr()));
+ xml_dim_t strip_dim(x_strip.child(_U(dimensions)));
+ double fixed_width = theDetector.constant<double>("Muon_barrel_strip_width_fixed");
+
+ for (int i = 0; i < strip_type_num_total; i++ )
+ {
+ int type_num = i;
+ double strip_halfZ;
+ if ( i < 6 )
+ {
+ std::string num_name = "Muon_barrel_strip_num" + dd4hep::_toString(i,"_%d");
+ int strip_num = theDetector.constant<int>(num_name);
+ strip_halfZ = 0.5 * strip_num * theDetector.constant<double>("Muon_strip_x") + theDetector.constant<double>("Muon_strip_surf");
+ }
+
+ if ( i >= 6)
+ {
+ int fixed_num = i - 6;
+ std::string num_name = "Muon_barrel_strip_num_fixed" + dd4hep::_toString( fixed_num, "_%d");
+ int strip_num = theDetector.constant<int>(num_name);
+ strip_halfZ = 0.5 * fixed_width + 0.5 * strip_num * theDetector.constant<double>("Muon_strip_x") + theDetector.constant<double>("Muon_strip_surf");
+ }
+ //double surface_halfZ, BC420_halfZ, fiber_halfZ, cut_halfZ;
+
+ //surface_halfZ = BC420_halfZ = fiber_halfZ = cut_halfZ = strip_halfZ - theDetector.constant<double>("Muon_strip_surf");
+
+ std::string strip_name = x_strip.nameStr() + dd4hep::_toString( i, "_%d");
+ std::string strip_name_fixed = x_strip.nameStr() + dd4hep::_toString( i, "_%d");
+
+ strip_solid[type_num] = dd4hep::Box(strip_dim.dx(),strip_dim.dy(),strip_halfZ);
+ strip_solid_fixed[type_num] = dd4hep::Box(fixed_width, strip_dim.dy(), strip_halfZ);
+ strip_vol[type_num] = dd4hep::Volume(strip_name,strip_solid[type_num],strip_mat);
+ strip_vol_fixed[type_num] = dd4hep::Volume(strip_name_fixed,strip_solid_fixed[type_num],strip_mat);
+ strip_vol[type_num].setVisAttributes(theDetector.visAttributes(x_strip.visStr()));
+ //strip_vol[type_num].setSensitiveDetector(sens);
+ /*surface_solid[type_num] = dd4hep::Box(surface_dim.dx(),surface_dim.dy(),surface_halfZ);
+ BC420_solid[type_num] = dd4hep::Box(BC420_dim.dx(),BC420_dim.dy(),BC420_halfZ);
+ cut3_solid[type_num] = dd4hep::Tube(cut3_dim.rmin(),cut3_dim.rmax(),cut_halfZ);
+ surface_vol[type_num] = dd4hep::Volume(surface_name, surface_solid[type_num], surface_mat);
+ surface_vol[type_num].setVisAttributes(theDetector.visAttributes(surface_vis));
+
+ cut3_vol[type_num] = dd4hep::Volume(cut3_name, cut3_solid[type_num], cut3_mat);
+ cut3_vol[type_num].setVisAttributes(theDetector.visAttributes(cut3_vis));
+
+ BC420_vol[type_num] = dd4hep::Volume(BC420_name,BC420_solid[type_num],BC420_mat);
+ BC420_vol[type_num].setVisAttributes(theDetector.visAttributes(BC420_vis));
+ BC420_vol[type_num].setSensitiveDetector(sens); */
+ }
+
+ for(int i0 = 0; i0 < x_env.id(); i0++)
+ {
+ std::string env_name = x_env.nameStr() + dd4hep::_toString(i0,"_%d");
+ xml_dim_t env_pos(x_env.child(_U(position)));
+
+ /*std::string Fe_name = x_Fe.nameStr() + dd4hep::_toString(i0,"_%d");
+ dd4hep::Material Fe_mat(theDetector.material(x_Fe.materialStr()));
+ xml_dim_t Fe_pos(x_Fe.child(_U(position)));
+ xml_dim_t Fe_dim(x_Fe.child(_U(dimensions)));*/
+ double Fe_halfX1 = 0.5 * theDetector.constant<double>("Muon_standard_scale");
+ double Fe_halfX2 = Fe_halfX1 + theDetector.constant<double>("Muon_barrel_iron_z") * std::sqrt(3);
+ double Fe_posZ = -1 * theDetector.constant<double>("Muon_standard_scale") * ( 2.5 + 1.5 * std::sqrt(3) );
+ dd4hep::Assembly env_vol(env_name);
+ double env_rot = i0 * 360 * dd4hep::degree / x_env.id();
+ dd4hep::Transform3D env_transform(dd4hep::Rotation3D(dd4hep::RotationY(env_rot)),dd4hep::Position(env_pos.x(), 0,env_pos.z()));
+
+ dd4hep::Trd2 Fe_solid(Fe_halfX1,Fe_halfX2,Fe_dim.y1(),Fe_dim.y2(),Fe_dim.dz());
+ dd4hep::Volume Fe_vol(Fe_name, Fe_solid, Fe_mat);
+ Fe_vol.setVisAttributes(theDetector.visAttributes(x_Fe.visStr()));
+ dd4hep::Transform3D Fe_transform(dd4hep::Rotation3D(),dd4hep::Position(Fe_pos.x(),Fe_pos.y(),Fe_posZ));
+ for(int i1 = 0; i1 < theDetector.constant<int>("Muon_barrel_barrel_num"); i1++ )
+ {
+ xml_coll_t dcSuperlayer(x_Fe,Unicode("superlayer"));
+ xml_comp_t x_superlayer = dcSuperlayer;
+ for(int i2 = 0; i2 < x_superlayer.id(); i2++) // FIXME:: 8 layers start from 0
+ {
+ std::string superlayer_name = x_superlayer.nameStr() + dd4hep::_toString(i1,"_%d") + dd4hep::_toString(i2,"_%d");
+ std::string num_name = "Muon_barrel_strip_num" + dd4hep::_toString(i2,"_%d");
+
+ int strip_num = theDetector.constant<int>(num_name);
+ int superlayer_posy_num = ( (2 * i1 - 1 ) * (2 * ( i2 % 2 ) - 1 ) + 1 ) / 2;
+ std::string superlayer_posy_name = "Muon_barrel_strip_num_fixed" + dd4hep::_toString( superlayer_posy_num, "_%d");
+ std::string superlayer_length_name = "Muon_barrel_superlayer_length" + dd4hep::_toString( superlayer_posy_num, "_%d");
+ double superlayer_length = theDetector.constant<double>(superlayer_length_name);
+
+ double superlayer_halfX = 0.5 * strip_num * theDetector.constant<double>("Muon_strip_x") + theDetector.constant<double>("Muon_barrel_superlayer_air_gap");
+ double superlayer_halfY = 0.5 * theDetector.constant<double>("Muon_barrel_superlayer_y");
+ double superlayer_halfZ = 0.5 * superlayer_length;
+
+ double superlayer_posy = ( 2 * i1 - 1 ) * ( 0.5 * theDetector.constant<double>("Muon_total_length") - theDetector.constant<double>("Muon_barrel_superlayer_endcap_gap") - superlayer_halfZ);
+ double superlayer_posZ = i2 * theDetector.constant<double>("Muon_barrel_superlayer_gap") + theDetector.constant<double>("Muon_barrel_superlayer_init");
+ dd4hep::Assembly superlayer_vol(superlayer_name);
+ dd4hep::Transform3D superlayer_transform(dd4hep::Rotation3D(dd4hep::RotationX(90*dd4hep::degree)),dd4hep::Position(0, superlayer_posy, superlayer_posZ));
+
+ for (int i3 = 0; i3 < 2; i3++ )
+ {
+ int num;
+ int type;
+ if ( i3 == 0 )
+ {
+ num = strip_num;
+ }
+ if ( i3 == 1 )
+ {
+ num = theDetector.constant<int>(superlayer_posy_name);
+ strip_vol_fixed[i2].setSensitiveDetector(sens);
+ dd4hep::Transform3D strip_transform_fixed(dd4hep::Rotation3D(dd4hep::RotationY(90*dd4hep::degree)), dd4hep::Position(0, -0.5 * theDetector.constant<double>("Muon_strip_y"), theDetector.constant<double>("Muon_strip_x") * ( num - 0.5 ) - 0.5 * theDetector.constant<int>(superlayer_posy_name) * theDetector.constant<double>("Muon_strip_x")));
+ dd4hep::PlacedVolume strip_place_fixed = superlayer_vol.placeVolume(strip_vol_fixed[i2],strip_transform_fixed);
+ strip_place_fixed.addPhysVolID("Stripe", num+1).addPhysVolID("Layer",i3+1).addPhysVolID("Superlayer",i2+1).addPhysVolID("Env",i1+1);
+ }
+ for ( int i4 = 0; i4 < num; i4++ )
+ {
+ double strip_posX, strip_posY, strip_posZ;
+ dd4hep::Rotation3D strip_rot;
+ if ( i3 == 0 )
+ {
+ type = superlayer_posy_num + 6;
+ strip_posX = theDetector.constant<double>("Muon_strip_x") * ( i4 + 0.5 * (1 - strip_num));
+ strip_posY = 0.5 * theDetector.constant<double>("Muon_strip_y");
+ strip_posZ = 0;
+ }
+ if ( i3 == 1 )
+ {
+ type = i2;
+ strip_rot = dd4hep::Rotation3D(dd4hep::RotationY( 90 * dd4hep::degree ));
+ strip_posX = 0;
+ strip_posY = -0.5 * theDetector.constant<double>("Muon_strip_y");
+ strip_posZ = theDetector.constant<double>("Muon_strip_x") * ( i4 + 0.5 ) - 0.5 * theDetector.constant<int>(superlayer_posy_name) * theDetector.constant<double>("Muon_strip_x") - 0.5 * fixed_width;
+ }
+ strip_vol[type].setSensitiveDetector(sens);
+
+ dd4hep::Transform3D strip_transform(strip_rot,dd4hep::Position(strip_posX,strip_posY,strip_posZ));
+ dd4hep::PlacedVolume strip_place = superlayer_vol.placeVolume(strip_vol[type],strip_transform);
+ strip_place.addPhysVolID("Stripe",i4+1).addPhysVolID("Layer",i3+1).addPhysVolID("Superlayer",i2+1).addPhysVolID("Env",i1+1);
+ }
+ }
+
+ dd4hep::PlacedVolume Superlayer_place = Fe_vol.placeVolume(superlayer_vol,superlayer_transform);
+ }
+ }
+ dd4hep::PlacedVolume Fe_place = env_vol.placeVolume(Fe_vol,Fe_transform);
+ Fe_place.addPhysVolID("Fe",i0+1);
+ envelope.placeVolume(env_vol,env_transform);
+ }
+ dd4hep::Transform3D pv(dd4hep::Rotation3D(dd4hep::RotationX(90*dd4hep::degree)),dd4hep::Position(0,0,0));
+ dd4hep::PlacedVolume phv = motherVol.placeVolume(envelope,pv);
+ phv.addPhysVolID("system",x_det.id());
+ sdet.setPlacement(phv);
+
+ MYDEBUG("create_detector DONE. ");
+ return sdet;
+}
+
+DECLARE_DETELEMENT(Muon_Barrel_v01_04, create_detector)
diff --git a/Detector/DetCRD/src/Muon/Muon_Endcap_v01_01.cpp b/Detector/DetCRD/src/Muon/Muon_Endcap_v01_01.cpp
index bccdf7cdfe2dc91388bc83de2769cc66f7942a82..f40dd3b5a148ac25aed2d994ea1ad2555d21b7f4 100644
--- a/Detector/DetCRD/src/Muon/Muon_Endcap_v01_01.cpp
+++ b/Detector/DetCRD/src/Muon/Muon_Endcap_v01_01.cpp
@@ -269,7 +269,7 @@ static dd4hep::Ref_t create_detector(dd4hep::Detector& theDetector,
superlayer_place.addPhysVolID("Superlayer",i+1);
}
dd4hep::PlacedVolume pv;
- dd4hep::DetElement both_endcap(det_name,2000);
+ dd4hep::DetElement both_endcap(det_name,x_det.id());
dd4hep::Volume motherVol = theDetector.pickMotherVolume(both_endcap);
dd4hep::DetElement sdetA = sdet;
dd4hep::Ref_t(sdetA)->SetName((det_name+"_A").c_str());
diff --git a/Detector/DetCRD/src/Muon/Muon_Endcap_v01_02.cpp b/Detector/DetCRD/src/Muon/Muon_Endcap_v01_02.cpp
index 06b539ecbb516eaa691bb73cd8ad866824b0e325..38c75e022454304b0f809701d21b9da30a71d161 100644
--- a/Detector/DetCRD/src/Muon/Muon_Endcap_v01_02.cpp
+++ b/Detector/DetCRD/src/Muon/Muon_Endcap_v01_02.cpp
@@ -460,7 +460,7 @@ static dd4hep::Ref_t create_detector(dd4hep::Detector& theDetector,
superlayer_place.addPhysVolID("Superlayer",i+1);
}
dd4hep::PlacedVolume pv;
- dd4hep::DetElement both_endcap(det_name,2000);
+ dd4hep::DetElement both_endcap(det_name,x_det.id());
dd4hep::Volume motherVol = theDetector.pickMotherVolume(both_endcap);
dd4hep::DetElement sdetA = sdet;
dd4hep::Ref_t(sdetA)->SetName((det_name+"_A").c_str());