@@ -84,6 +84,9 @@ inline bool isSolidToCut(const TGeoVolume* v)
8484 if (TString (nm).BeginsWith (" VD_InclinedWall" )) {
8585 return true ;
8686 }
87+ if (TString (nm).Contains (" _ZCap" )) {
88+ return true ;
89+ }
8790 return false ;
8891}
8992
@@ -252,10 +255,11 @@ static const double diskZ_cm[6] = {-34.0f, -30.0f, -26.0f, 26.0f, 30.0f, 34.0f};
252255
253256// Petal walls specifications (cm)
254257static constexpr double kPetalZ_cm = 70 .0f ; // full wall height
255- static constexpr double kWallThick_cm = 0 .015f ; // 0.15 mm
258+ static constexpr double kWallThick_cm = 0 .02f ; // 0.2 mm
256259static constexpr double kInnerWallRadius_cm = 0 .48f ; // 4.8 mm (ALWAYS cylindrical)
257260static constexpr double kOuterWallRadius_cm = 4 .8f ; // 48 mm (can be changed)
258261static constexpr double kEps_cm = 2 .5e-4f ;
262+ static constexpr double kEps_100um = 0 .01f ; // 100 microns in cm
259263
260264// 3 inclined walls ("walls") specs for the full-cylinder option
261265// Thickness in-plane (cm). This is the short half-dimension of the TGeoBBox in XY.
@@ -604,8 +608,8 @@ static void addIRISServiceModulesSegmented(TGeoVolume* petalAsm, int nPetals)
604608
605609 // --- Vacuum vessel window around z∈[-L/2, +L/2] with wall thickness on +Z side
606610 // Keep these in sync with TRKServices::createVacuumCompositeShape()
607- constexpr double vacuumVesselLength = 76.0 ; // cm
608- constexpr double vacuumVesselThickness = 0.08 ; // cm (0.8 mm)
611+ constexpr double vacuumVesselLength = kPetalZ_cm ; // cm
612+ constexpr double vacuumVesselThickness = kWallThick_cm ; // cm (0.2 mm)
609613 const double halfVess = 0.5 * vacuumVesselLength; // 38.0 cm
610614 const double gapStart = halfVess; // 38.00
611615 const double gapEnd = halfVess + vacuumVesselThickness; // 38.08
@@ -783,8 +787,8 @@ static TGeoVolume* buildFullCylAssembly(int petalID, bool withDisks)
783787
784788 // --- Z end-cap walls to close the petal in Z ---
785789 {
786- const double zMin = -0.5 * kLenZ_cm ;
787- const double zMax = +0.5 * kLenZ_cm ;
790+ const double zMin = -0.5 * kPetalZ_cm - 2 * kWallThick_cm ;
791+ const double zMax = +0.5 * kPetalZ_cm + 2 * kWallThick_cm ;
788792 const double rIn = kInnerWallRadius_cm ;
789793 const double rOut = kOuterWallRadius_cm + kWallThick_cm ;
790794
0 commit comments