Commit d2cfa754 authored by Jochen Meyer's avatar Jochen Meyer Committed by Graeme Stewart
Browse files

no more sign flip for correction (MuonSegmentTaggerTools-00-03-09)

	* no more sign flip for correction in MuTagMatchingTool
	* tagging as MuonSegmentTaggerTools-00-03-09

2016-08-24 Jochen Meyer
	* addressing coverity defects 108726, 108883
	* tagging as MuonSegmentTaggerTools-00-03-08

2016-08-23 Jochen Meyer
	* endreq -> endmsg
	* tagging as MuonSegmentTaggerTools-00-03-07
parent 92b360f6
......@@ -40,7 +40,12 @@ MuTagAmbiguitySolverTool::MuTagAmbiguitySolverTool(const std::string& t,
p_muonHelper("Muon::MuonEDMHelperTool/MuonEDMHelperTool"),
p_muonPrinter("Muon::MuonEDMPrinterTool/MuonEDMPrinterTool"),
p_muonIdHelper("Muon::MuonIdHelperTool/MuonIdHelperTool"),
p_segmentMatchingTool("Muon::MuonSegmentMatchingTool/MuonSegmentMatchingTool")
p_segmentMatchingTool("Muon::MuonSegmentMatchingTool/MuonSegmentMatchingTool"),
p_StoreGateSvc(0),
m_mdtIdHelper(0),
m_cscIdHelper(0),
m_rpcIdHelper(0),
m_tgcIdHelper(0)
{
declareInterface<IMuTagAmbiguitySolverTool>(this);
declareProperty("MuonSegmentMatchingTool" , p_segmentMatchingTool ) ;
......@@ -317,7 +322,7 @@ int MuTagAmbiguitySolverTool::ambiguousSegment( const Muon::MuonSegment& seg1, c
if( match ){
if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << " found matching segment pair: " << std::endl
<< p_muonPrinter->print(seg1) << std::endl
<< p_muonPrinter->print(seg2) << endreq;
<< p_muonPrinter->print(seg2) << endmsg;
// if overlap matching enabled flag as ambiguous
if( m_slOverlapMatching ) return 2;
......@@ -341,7 +346,7 @@ int MuTagAmbiguitySolverTool::ambiguousSegment( const Muon::MuonSegment& seg1, c
if( m_hitOverlapMatching ){
if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << " found overlapping segment pair: " << compareSegments.print(result) << std::endl
<< p_muonPrinter->print(seg1) << std::endl
<< p_muonPrinter->print(seg2) << endreq;
<< p_muonPrinter->print(seg2) << endmsg;
return 3;
}
}
......
......@@ -70,11 +70,11 @@ namespace {
}
#endif
}
MuTagMatchingTool::MuTagMatchingTool(const std::string& t,
MuTagMatchingTool::MuTagMatchingTool(const std::string& t,
const std::string& n,
const IInterface* p ):
AthAlgTool(t,n,p)
......@@ -86,6 +86,13 @@ MuTagMatchingTool::MuTagMatchingTool(const std::string& t,
, m_hitSummaryTool("Muon::MuonSegmentHitSummaryTool/MuonSegmentHitSummaryTool")
, m_selectionTool("Muon::MuonSegmentSelectionTool/MuonSegmentSelectionTool")
, m_pullCalculator("Trk::ResidualPullCalculator/ResidualPullCalculator")
, p_StoreGateSvc(0)
, m_detMgr(0)
, m_mdtIdHelper(0)
, m_cscIdHelper(0)
, m_rpcIdHelper(0)
, m_tgcIdHelper(0)
, m_trackingGeometry(0)
{
declareInterface<IMuTagMatchingTool>(this);
declareProperty( "IExtrapolator" , p_IExtrapolator ) ;
......@@ -949,6 +956,7 @@ MuonCombined::MuonSegmentInfo MuTagMatchingTool::muTagSegmentInfo( const Trk::Tr
}
double dydyz = scale*info.exCovYZY;
double correction = dydyz/(info.exErrorYZ*info.exErrorYZ);
/*
//
// Flip sign in endcap for eta > 0 (not understood why)
//
......@@ -958,7 +966,7 @@ MuonCombined::MuonSegmentInfo MuTagMatchingTool::muTagSegmentInfo( const Trk::Tr
ATH_MSG_DEBUG(" Flip correlation term for segment direction theta " << segment->globalDirection().theta() << " position theta " << segment->globalPosition().theta());
}
}
*/
//
// residual after taking into account the correlation with the angle YZ
//
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment