diff --git a/Utilities/KalDet/src/ild/sit/CEPCITKKalDetector.cc b/Utilities/KalDet/src/ild/sit/CEPCITKKalDetector.cc index a76646036953a75460e415220ba8fd50c360c0e3..6d0d4230b91d2ea89c7d850aa83e13e6622059df 100644 --- a/Utilities/KalDet/src/ild/sit/CEPCITKKalDetector.cc +++ b/Utilities/KalDet/src/ild/sit/CEPCITKKalDetector.cc @@ -279,8 +279,12 @@ CEPCITKKalDetector::CEPCITKKalDetector( const gear::GearMgr& gearMgr, IGeomSvc* } } } - double redge = sqrt((ladder_distance+ladder_thickness)*(ladder_distance+ladder_thickness) + (fabs(offset)+0.5*width) * (fabs(offset)+0.5*width)) + eps_layer; - Add(new ILDCylinderMeasLayer(air, air, redge, 0.5*length, 0, 0, 0, _bZ, dummy, -1, "ITKOuterEdge")); + double d0 = std::min(sensitive_distance, ladder_distance); + double d1 = sensitive_distance < ladder_distance ? ladder_distance+ladder_thickness : sensitive_distance+sensitive_thickness; + double rmin = fabs(offset) < 0.5*width ? d0 : sqrt(d0*d0 + (fabs(offset)-0.5*width)*(fabs(offset)-0.5*width)) - eps_layer; + double rmax = sqrt(d1*d1 + (fabs(offset)+0.5*width) * (fabs(offset)+0.5*width)) + eps_layer; + Add(new ILDCylinderMeasLayer(air, air, rmin, 0.5*length, 0, 0, 0, _bZ, dummy, -1, "ITKInnerEdge")); + Add(new ILDCylinderMeasLayer(air, air, rmax, 0.5*length, 0, 0, 0, _bZ, dummy, -1, "ITKOuterEdge")); } SetOwner(); diff --git a/cmake/internal_kaltest.cmake b/cmake/internal_kaltest.cmake index c8d6764de4a32e89b5d00a15c738675ec5d9ceea..03b968cd85a3a77a69f93b6ec2d3b3b65dafc54d 100644 --- a/cmake/internal_kaltest.cmake +++ b/cmake/internal_kaltest.cmake @@ -11,7 +11,7 @@ endif() ExternalProject_Add( KalTest GIT_REPOSITORY https://code.ihep.ac.cn/cepc/externals/KalTest_iLCSoft.git - GIT_TAG v02-05-cepcsw + GIT_TAG v02-05-03cepcsw PREFIX ${CMAKE_BINARY_DIR}/_deps SOURCE_DIR ${CMAKE_BINARY_DIR}/_deps/kaltest-src BINARY_DIR ${CMAKE_BINARY_DIR}/_deps/kaltest-build