diff --git a/Detector/DetCRD/compact/CRD_common_v02/VXD_StaggeredLadder_v02_02.xml b/Detector/DetCRD/compact/CRD_common_v02/VXD_StaggeredLadder_v02_02.xml index b161b0bb71c29aa1d8a79f07d4868c2895456b6f..7b97e4101a6a3dc24b759baea87b87df063facdc 100644 --- a/Detector/DetCRD/compact/CRD_common_v02/VXD_StaggeredLadder_v02_02.xml +++ b/Detector/DetCRD/compact/CRD_common_v02/VXD_StaggeredLadder_v02_02.xml @@ -83,7 +83,7 @@ <slice length="VXDLayer2_length" thickness="12.5*um" width="16.8*mm" mat="Acrylicglue"/> <!--glue between flex and sensor/support--> </flex> <sensor n_sensors="10" gap="0.1*mm" thickness="50*um" active_length="25.6*mm" active_width="12.8*mm" dead_width="2*mm" sensor_mat="G4_Si" - deadwire_length="(19*(25.6+0.1)-0.1)*mm" deadwire_width="2*mm" deadwire_thickness="(50/10)*um" deadwire_mat="G4_Al"/> + deadwire_length="(10*(25.6+0.1)-0.1)*mm" deadwire_width="2*mm" deadwire_thickness="(50/10)*um" deadwire_mat="G4_Al"/> </ladder> </layer> <layer layer_id="2" ladder_radius="48*mm" ladder_offset="(8.4+10.213840)*mm" n_ladders="24" n_sensors_per_side="0"> diff --git a/Detector/DetCRD/compact/CRD_o1_v01/CRD_o1_v01.xml b/Detector/DetCRD/compact/CRD_o1_v01/CRD_o1_v01.xml index dda851d69ee604bbd25b5b1a68c63c879ab246fc..cf923ffbc67b73ed8fcbf3df7a222df598890dda 100644 --- a/Detector/DetCRD/compact/CRD_o1_v01/CRD_o1_v01.xml +++ b/Detector/DetCRD/compact/CRD_o1_v01/CRD_o1_v01.xml @@ -31,7 +31,7 @@ <include ref="../CRD_common_v01/VXD_v01_01.xml"/> <include ref="../CRD_common_v01/FTD_SkewRing_v01_01.xml"/> <include ref="../CRD_common_v01/SIT_SimplePixel_v01_01.xml"/> - <include ref="../CRD_common_v01/DC_Simple_v01_02.xml"/> + <include ref="../CRD_common_v01/DC_Simple_v01_05.xml"/> <include ref="../CRD_common_v01/SET_SimplePixel_v01_01.xml"/> <include ref="../CRD_common_v01/Ecal_Crystal_Barrel_v01_01.xml"/> <!--include ref="../CRD_common_v01/Ecal_Crystal_Endcap_v01_01.xml"/--> diff --git a/Detector/DetCRD/compact/CRD_o1_v02/CRD_o1_v02-onlyTracker.xml b/Detector/DetCRD/compact/CRD_o1_v02/CRD_o1_v02-onlyTracker.xml index e0a91d1715723fb00976597c31290b225cfeb852..1c41fb6de1078954aeeaa947dc35d4edb0cdfc3a 100644 --- a/Detector/DetCRD/compact/CRD_o1_v02/CRD_o1_v02-onlyTracker.xml +++ b/Detector/DetCRD/compact/CRD_o1_v02/CRD_o1_v02-onlyTracker.xml @@ -31,7 +31,7 @@ <include ref="../CRD_common_v01/VXD_v01_01.xml"/> <include ref="../CRD_common_v01/FTD_SkewRing_v01_01.xml"/> <include ref="../CRD_common_v01/SIT_SimplePixel_v01_01.xml"/> - <include ref="../CRD_common_v01/DC_Simple_v01_02.xml"/> + <include ref="../CRD_common_v01/DC_Simple_v01_05.xml"/> <include ref="../CRD_common_v01/SET_SimplePlanar_v01_01.xml"/> <fields> diff --git a/Detector/DetCRD/compact/CRD_o1_v02/CRD_o1_v02.xml b/Detector/DetCRD/compact/CRD_o1_v02/CRD_o1_v02.xml index a508958484d0bd9cce4c894bd6d520d1ad15124e..b39a915a8bd817ab37f2c55ae75be8bd22fced6c 100644 --- a/Detector/DetCRD/compact/CRD_o1_v02/CRD_o1_v02.xml +++ b/Detector/DetCRD/compact/CRD_o1_v02/CRD_o1_v02.xml @@ -31,7 +31,7 @@ <include ref="../CRD_common_v01/VXD_v01_01.xml"/> <include ref="../CRD_common_v01/FTD_SkewRing_v01_01.xml"/> <include ref="../CRD_common_v01/SIT_SimplePixel_v01_01.xml"/> - <include ref="../CRD_common_v01/DC_Simple_v01_02.xml"/> + <include ref="../CRD_common_v01/DC_Simple_v01_05.xml"/> <include ref="../CRD_common_v01/SET_SimplePlanar_v01_01.xml"/> <include ref="../CRD_common_v01/Ecal_Crystal_Barrel_v01_01.xml"/> <!--include ref="../CRD_common_v01/Ecal_Crystal_Endcap_v01_01.xml"/--> diff --git a/Detector/DetCRD/compact/CRD_o1_v03/CRD_o1_v03-onlyTracker.xml b/Detector/DetCRD/compact/CRD_o1_v03/CRD_o1_v03-onlyTracker.xml index cc30d11b38cb9b01e91cee5245c89220b80a0f7f..a1b6f0af101f706674013dfcf9b2014b1471c920 100644 --- a/Detector/DetCRD/compact/CRD_o1_v03/CRD_o1_v03-onlyTracker.xml +++ b/Detector/DetCRD/compact/CRD_o1_v03/CRD_o1_v03-onlyTracker.xml @@ -32,7 +32,7 @@ <include ref="../CRD_common_v01/VXD_StaggeredLadder_v01_01.xml"/> <include ref="../CRD_common_v01/FTD_SkewRing_v01_01.xml"/> <include ref="../CRD_common_v01/SIT_SimplePixel_v01_01.xml"/> - <include ref="../CRD_common_v01/DC_Simple_v01_02.xml"/> + <include ref="../CRD_common_v01/DC_Simple_v01_05.xml"/> <include ref="../CRD_common_v01/SET_SimplePixel_v01_01.xml"/> <fields> diff --git a/Detector/DetCRD/compact/CRD_o1_v03/CRD_o1_v03.xml b/Detector/DetCRD/compact/CRD_o1_v03/CRD_o1_v03.xml index 79eea6dcf5d048ace369f3bd3c300d5b8ce04340..365d3f29a43828b011d41360049a7dc67ad058ba 100644 --- a/Detector/DetCRD/compact/CRD_o1_v03/CRD_o1_v03.xml +++ b/Detector/DetCRD/compact/CRD_o1_v03/CRD_o1_v03.xml @@ -31,7 +31,7 @@ <include ref="../CRD_common_v01/VXD_StaggeredLadder_v01_01.xml"/> <include ref="../CRD_common_v01/FTD_SkewRing_v01_01.xml"/> <include ref="../CRD_common_v01/SIT_SimplePixel_v01_01.xml"/> - <include ref="../CRD_common_v01/DC_Simple_v01_02.xml"/> + <include ref="../CRD_common_v01/DC_Simple_v01_05.xml"/> <include ref="../CRD_common_v01/SET_SimplePixel_v01_01.xml"/> <include ref="../CRD_common_v01/Ecal_Crystal_Barrel_v01_01.xml"/> <!--include ref="../CRD_common_v01/Ecal_Crystal_Endcap_v01_01.xml"/--> diff --git a/Detector/DetCRD/compact/CRD_o1_v04/CRD_o1_v04-onlyTracker.xml b/Detector/DetCRD/compact/CRD_o1_v04/CRD_o1_v04-onlyTracker.xml index ececd6165bbf2b9217bd005dc0bba4f980da37e2..d2efa50917deb4fb4a5c11c97909fe1e4025bb64 100644 --- a/Detector/DetCRD/compact/CRD_o1_v04/CRD_o1_v04-onlyTracker.xml +++ b/Detector/DetCRD/compact/CRD_o1_v04/CRD_o1_v04-onlyTracker.xml @@ -31,7 +31,7 @@ <include ref="../CRD_common_v01/VXD_v01_03.xml"/> <include ref="../CRD_common_v01/FTD_SkewRing_v01_03.xml"/> <include ref="../CRD_common_v01/SIT_SimplePixel_v01_01.xml"/> - <include ref="../CRD_common_v01/DC_Simple_v01_02.xml"/> + <include ref="../CRD_common_v01/DC_Simple_v01_05.xml"/> <include ref="../CRD_common_v01/SET_SimplePixel_v01_01.xml"/> <fields> diff --git a/Detector/DetCRD/compact/CRD_o1_v04/CRD_o1_v04.xml b/Detector/DetCRD/compact/CRD_o1_v04/CRD_o1_v04.xml index 1804d93a39d5f90048721b6fb21f83fcd6e82c84..c9f944249c23be02a1e6a925b11b238c66f51d84 100644 --- a/Detector/DetCRD/compact/CRD_o1_v04/CRD_o1_v04.xml +++ b/Detector/DetCRD/compact/CRD_o1_v04/CRD_o1_v04.xml @@ -31,7 +31,7 @@ <include ref="../CRD_common_v01/VXD_v01_03.xml"/> <include ref="../CRD_common_v01/FTD_SkewRing_v01_03.xml"/> <include ref="../CRD_common_v01/SIT_SimplePixel_v01_01.xml"/> - <include ref="../CRD_common_v01/DC_Simple_v01_02.xml"/> + <include ref="../CRD_common_v01/DC_Simple_v01_05.xml"/> <include ref="../CRD_common_v01/SET_SimplePixel_v01_01.xml"/> <include ref="../CRD_common_v01/Ecal_Crystal_Barrel_v01_01.xml"/> <!--include ref="../CRD_common_v01/Ecal_Crystal_Endcap_v01_01.xml"/--> diff --git a/Detector/DetCRD/compact/TDR_o1_v02/TDR_Dimensions_v01_02.xml b/Detector/DetCRD/compact/TDR_o1_v02/TDR_Dimensions_v01_02.xml index 65915aa7ba032b985a611cd9524971b439b4c469..73ec69de51cc53068e670768b44b09122111c879 100644 --- a/Detector/DetCRD/compact/TDR_o1_v02/TDR_Dimensions_v01_02.xml +++ b/Detector/DetCRD/compact/TDR_o1_v02/TDR_Dimensions_v01_02.xml @@ -84,7 +84,7 @@ <constant name="Vertex_inner_radius" value="BeamPipe_Central_inner_radius+BeamPipe_Be_total_thickness"/> <constant name="Vertex_outer_radius" value="70*mm"/> - <constant name="Vertex_half_length" value="430*mm"/> + <constant name="Vertex_half_length" value="210*mm"/> <constant name="BeamPipe_VertexRegion_rmax" value="BeamPipe_Central_inner_radius+BeamPipe_Al_thickness +(BeamPipe_FirstExpand_width/2-BeamPipe_Central_inner_radius)/(BeamPipe_ExpandAl_zmax-BeamPipe_CentralAl_zmax)*(Vertex_half_length-BeamPipe_CentralAl_zmax)"/> diff --git a/Detector/DetCRD/compact/TDR_o1_v02/TDR_o1_v02-onlyTracker.xml b/Detector/DetCRD/compact/TDR_o1_v02/TDR_o1_v02-onlyTracker.xml index f6d1d6e4fe13f717095826afe58288e858d60f97..f58fe4f1eed5c0307059d0a14dbf2979e9707f84 100644 --- a/Detector/DetCRD/compact/TDR_o1_v02/TDR_o1_v02-onlyTracker.xml +++ b/Detector/DetCRD/compact/TDR_o1_v02/TDR_o1_v02-onlyTracker.xml @@ -30,7 +30,7 @@ <!--old version, should be check/--> <include ref="../CRD_common_v01/Beampipe_v01_02.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_02.xml"/> <include ref="../CRD_common_v02/FTD_SkewRing_v01_04.xml"/> <include ref="../CRD_common_v01/SIT_SimplePixel_v01_02.xml"/> <include ref="../CRD_common_v01/TPC_Simple_v10_02.xml"/> diff --git a/Detector/DetCRD/scripts/CRD_o1_v01-SimRec.py b/Detector/DetCRD/scripts/CRD_o1_v01-SimRec.py index 52a6209da65917bb7ced0acacc15d198fee15973..e267c61eaffc2d994ce860575b17b4d806be0c4a 100644 --- a/Detector/DetCRD/scripts/CRD_o1_v01-SimRec.py +++ b/Detector/DetCRD/scripts/CRD_o1_v01-SimRec.py @@ -19,8 +19,8 @@ rndmgensvc = RndmGenSvc("RndmGenSvc") rndmgensvc.Engine = rndmengine.name() # option for standalone tracker study -geometry_option = "CRD_o1_v01/CRD_o1_v01-onlyTracker.xml" -#geometry_option = "CRD_o1_v01/CRD_o1_v01.xml" +#geometry_option = "CRD_o1_v01/CRD_o1_v01-onlyTracker.xml" +geometry_option = "CRD_o1_v01/CRD_o1_v01.xml" if not os.getenv("DETCRDROOT"): print("Can't find the geometry. Please setup envvar DETCRDROOT." )