Skip to content
Snippets Groups Projects
Commit 61ec93b9 authored by John Derek Chapman's avatar John Derek Chapman
Browse files

Merge branch 'fixDistanceToChannelForStereos' into '21.3'

fixing channel dist for stereo layers

See merge request !31303
parents f46130f9 9611fba1
16 merge requests!46457Draft: Adding the tools to run over data,!46454Draft: Adding the tools to be able to run over data,!44869Draft: Update to candidate store,!4217921.9-first_steps-InDetTrackingGeometryXML,!39162Draft: Insert BCM' support,!38765Bis78 cabling,!36893Fix size of RPC active region in BIS78 and strip material,!3645821.9: Improving material map description (ATLITKSW-127),!36293WIP pixel updates,!34993KF-input adding jXERHO to the AOD outputs,!34864LH rings in front ot HR rigs,!34763Fix L1_4jJ15.0ETA25 item definition (ATR-21261),!33996WIP: Correct MM zpositions,!3291021.3 salva s0,!31887Merge 21.3.19 into 21.9,!31303fixing channel dist for stereo layers
......@@ -140,7 +140,11 @@ namespace MuonGM {
// As such,our calculations are in 1D and do not require the use of the angle
// We are commenting out instead of removing while we come to a permanent solution
// Alexandre Laurier September 12 2018
Amg::Vector2D chLoc( pos.x()-chPos.x() , pos.y()-chPos.y());
//In the new geometry from November 2019 the layers are not anymore tilted, therefore we need
//to introduce the correction for the stereo angle in the distance
//Patrick Scholer March 18 2020
Amg::Vector2D chLoc( (pos.x()-pos.y()*tan(sAngle))-chPos.x() , pos.y()-chPos.y());
if ( validMode && fabs(chLoc.x()) > 0.5*channelWidth( pos) ) {
MsgStream log(Athena::getMessageSvc(),"MuonChannelDesign");
if (log.level()<=MSG::INFO) log << MSG::INFO << "Problem in identification of the channel: distance to nearest channel, channel width: "
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment