diff --git a/Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01-onlyTracker.xml b/Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01-onlyTracker.xml index 402afae0084d41f838c34bfab3720bbeb49563c8..a3cbc62d119d29f48d4bc07b52a2c166f725f946 100644 --- a/Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01-onlyTracker.xml +++ b/Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01-onlyTracker.xml @@ -29,16 +29,15 @@ <!--TODO: vertex cooling--> <!--include ref="../CRD_common_v02/Beampipe_v01_03.xml"/--> <!--preliminary vertex and tracker, to update/--> - <!--include ref="../CRD_common_v02/VXD_StaggeredLadder_v02_01.xml"/> + <include ref="../CRD_common_v02/VXD_StaggeredLadder_v02_01.xml"/> <include ref="../CRD_common_v02/FTD_SkewRing_v01_05.xml"/> <include ref="../CRD_common_v02/SIT_SimplePixel_v01_03.xml"/> - <include ref="../CRD_common_v01/TPC_Simple_v10_02.xml"/> - <include ref="../CRD_common_v01/SET_SimplePixel_v01_01.xml"/--> - <include ref="./TPC_ModularEndcap_TDR_o1_v01.xml"/> + <!--include ref="../CRD_common_v01/TPC_Simple_v10_02.xml"/--> + <include ref="../CRD_common_v01/SET_SimplePixel_v01_01.xml"/> <!--prepare for update, need check first--> - <!--include ref="../CRD_common_v02/TPC_ModularEndcap_o1_v01.xml"/--> - <include ref="../CRD_common_v01/SET_SimplePixel_v01_01.xml"/> + <include ref="../CRD_common_v02/TPC_ModularEndcap_o1_v01.xml"/> + <!--include ref="../CRD_common_v01/SET_SimplePixel_v01_01.xml"/--> <fields> <field name="InnerSolenoid" type="solenoid" diff --git a/Detector/DetCRD/src/Tracker/TPC_ModularEndcap_o1_v01.cpp b/Detector/DetCRD/src/Tracker/TPC_ModularEndcap_o1_v01.cpp index 2ec03997d42456baa56bd5fb57ca6bb90101e7ca..616c7e1accb60baa67112164d64444a1a0c41423 100644 --- a/Detector/DetCRD/src/Tracker/TPC_ModularEndcap_o1_v01.cpp +++ b/Detector/DetCRD/src/Tracker/TPC_ModularEndcap_o1_v01.cpp @@ -371,7 +371,7 @@ static Ref_t create_element(Detector& theDetector, xml_h e, SensitiveDetector se double phi_end = 2*M_PI; Tube ringSolid(rCursor, r_end, dz_Alframe/2., phi_start, phi_end) ; Volume ringLog( layerName+"Log", ringSolid, materialAlframe) ; - pv = endcapLog.placeVolume( ringLog, Position(0., 0., -dz_Endpaltelength/2. + dz_Alframe) ) ; + pv = endcapLog.placeVolume( ringLog, Position(0., 0., -dz_Endpaltelength/2. + dz_Alframe/2.) ) ; tpc.setVisAttributes(theDetector,"GrayVis",ringLog); } if(layerType == "Module")