diff --git a/Detector/FT/src/FT_geo.cpp b/Detector/FT/src/FT_geo.cpp index c6d614424d11be79e06fb1031306e3aa3ff1ac1c..675f8ee44b41871f5f1b260e48657086533b5b12 100644 --- a/Detector/FT/src/FT_geo.cpp +++ b/Detector/FT/src/FT_geo.cpp @@ -7,7 +7,7 @@ // For the licensing terms see $DD4hepINSTALL/LICENSE. // For the list of contributors see $DD4hepINSTALL/doc/CREDITS. // -// Author : M.Frank +// Author : M.Frank, modified by B.Dey // //========================================================================== // @@ -131,7 +131,6 @@ namespace { if ( n == "attach_volume" ) m_attach_volume = c.attr( _U( value ) ); if ( n == "local_debug" ) m_local_debug = c.attr( _U( value ) ); if ( n == "debug" ) debug = c.attr( _U( value ) ); - // cout << "Dbg:" << n << " " << c.attr(_U(value)) << endl; } } eps = dd4hep::_toDouble( "FT:eps" ); @@ -268,6 +267,7 @@ namespace { pos = dd4hep::Position( +0.5 * p.sign * ( hole_size_x - core_size_x ), -0.5 * ( core_size_y - endpiece_size_y ) + hole_size_y + dead_size_y, +0.5 * ( core_size_z - endpiece_size_z ) ); + //-0.5 * ( core_size_z - endpiece_size_z ) // BD check this core_back_vol.placeVolume( volume( "lvEndpiece1" ), pos ); dd4hep::printout( m_local_debug ? dd4hep::ALWAYS : dd4hep::DEBUG, "FT-geo", @@ -289,6 +289,9 @@ namespace { // // The "wall_thick" below is exactly the extrusion between: lvFTModuleHoleRightU/lvHoleWallRightU_9 // Don't know how to handle this + // BD changed: *small* change to handle extrusions + if ( endPhi > M_PI ) endPhi -= delta_angle / 10.; + if ( startPhi < 0 ) startPhi += delta_angle / 10.; dd4hep::Tube hole_wall_solid( hole_leftx_size_y, hole_leftx_size_y + wall_thick, mod_size_z / 2.0, startPhi, endPhi ); dd4hep::Volume hole_wall_vol( "lvHoleWall" + m.first, hole_wall_solid, skin_mat ); @@ -422,7 +425,7 @@ namespace { if ( m_build_passive ) { pos = dd4hep::Position( 0.0, -0.5 * ( mod_size_y - core_size_y ), 0.5 * ( mat_size_z + core_size_z ) ); pv = mod_vol.placeVolume( volume( "lvCoreHoleBack" + m.first ), dd4hep::Transform3D( rot_Y, pos ) ); - + // pv = mod_vol.placeVolume(volume("lvCoreHoleBack"+m.first), pos); // BD check this pos = dd4hep::Position( 0.0, -0.5 * ( mod_size_y - skin_size_y ), 0.5 * ( mat_size_z + skin_size_z ) + core_size_z ); pv = mod_vol.placeVolume( volume( "lvSkinHole" + m.first ), pos ); diff --git a/compact/FT/detector.xml b/compact/FT/detector.xml index e3546914fab8645d2cb6d90098fbbeeabd313f88..00b2fb2f423913288dbd50c39f6cbd1190baab84 100644 --- a/compact/FT/detector.xml +++ b/compact/FT/detector.xml @@ -5,8 +5,8 @@ - - + + @@ -124,8 +124,6 @@ - - @@ -134,8 +132,10 @@ + --> - + +