diff --git a/InnerDetector/InDetRecEvent/InDetLowBetaInfo/InDetLowBetaInfo/InDetLowBetaCandidate.h b/InnerDetector/InDetRecEvent/InDetLowBetaInfo/InDetLowBetaInfo/InDetLowBetaCandidate.h index 7839385193507ce2171b972f6a34893492855f4a..26823986d09b9531e34d9b93e8e37126c6990d6d 100644 --- a/InnerDetector/InDetRecEvent/InDetLowBetaInfo/InDetLowBetaInfo/InDetLowBetaCandidate.h +++ b/InnerDetector/InDetRecEvent/InDetLowBetaInfo/InDetLowBetaInfo/InDetLowBetaCandidate.h @@ -14,7 +14,7 @@ #ifndef INDETLOWBETACANDIDATE_H #define INDETLOWBETACANDIDATE_H -#include "GaudiKernel/MsgStream.h" +//#include "GaudiKernel/MsgStream.h" #include "AthenaKernel/CLASS_DEF.h" class MsgStream; @@ -23,7 +23,6 @@ namespace InDet{ class InDetLowBetaCandidate{ - /** default, copy = operator constructors */ public: InDetLowBetaCandidate(); @@ -39,14 +38,13 @@ namespace InDet{ ); virtual ~InDetLowBetaCandidate(); - InDetLowBetaCandidate(const InDetLowBetaCandidate& rhs); - InDetLowBetaCandidate &operator=(const InDetLowBetaCandidate &); - /////////virtual VxCandidate* clone() const; - + InDetLowBetaCandidate(const InDetLowBetaCandidate& rhs) = default; + InDetLowBetaCandidate &operator=(const InDetLowBetaCandidate &) = default; + InDetLowBetaCandidate &operator=(InDetLowBetaCandidate &&) = default; + /** Output Method for MsgStream, to be overloaded by child classes */ virtual MsgStream& dump(MsgStream& sl) const; - /** Output Method for std::ostream, to be overloaded by child classes */ - //virtual std::ostream& dump(std::ostream& sl) const; + float getTRTCorrBitsOverThreshold() const; float getTRTTrailingEdge() const; @@ -70,7 +68,6 @@ namespace InDet{ }; //end of class definitions MsgStream& operator << ( MsgStream& sl, const InDetLowBetaCandidate& sf); - //std::ostream& operator << ( std::ostream& sl, const InDetLowBetaCandidate& sf); }//end of namsepace diff --git a/InnerDetector/InDetRecEvent/InDetLowBetaInfo/src/InDetLowBetaCandidate.cxx b/InnerDetector/InDetRecEvent/InDetLowBetaInfo/src/InDetLowBetaCandidate.cxx index bd0c0d25dc7ff5b630905c09b4f96dbc20020e01..072b47712307bf7077d2af966f1996217d3afd12 100644 --- a/InnerDetector/InDetRecEvent/InDetLowBetaInfo/src/InDetLowBetaCandidate.cxx +++ b/InnerDetector/InDetRecEvent/InDetLowBetaInfo/src/InDetLowBetaCandidate.cxx @@ -28,7 +28,7 @@ namespace InDet { float TRTLikelihoodError, float TRTHighTbits):m_TRTCorrBitsOverThreshold(TRTCorrBitsOverThreshold), m_TRTTrailingEdge( TRTTrailingEdge), m_TRTTrailingEdgeError( TRTTrailingEdgeError), m_TRTNLastBits(TRTNLastBits), m_TRTdEdx(TRTdEdx), m_TRTLikelihoodBeta(TRTLikelihoodBeta), m_TRTLikelihoodError(TRTLikelihoodError), m_TRTHighTbits( TRTHighTbits ) {} - +/** InDetLowBetaCandidate::InDetLowBetaCandidate(const InDetLowBetaCandidate& rhs) : m_TRTCorrBitsOverThreshold(rhs.m_TRTCorrBitsOverThreshold), m_TRTTrailingEdge(rhs.m_TRTTrailingEdge), @@ -54,6 +54,7 @@ namespace InDet { } return *this; } +**/ InDetLowBetaCandidate::~InDetLowBetaCandidate() {} @@ -70,20 +71,11 @@ namespace InDet { return sl; } - //std::ostrem& InDetLowBetaCandidate::dump(std::ostrem sl) const { - // sl << "Printing InDet::InDetLowBetaCandidate: " << endmsg; - // sl << "TRTCorrBitsOverThreshold: " << m_TRTCorrBitsOverThreshold << endmsg; - // sl << "TRTTrailingEdge: " << m_TRTTrailingEdge << endmsg; - // sl << "TRTTrailingEdgeError: " << m_TRTTrailingEdgeError << endmsg; - // sl << "TRTNLastBits: " << m_TRTNLastBits << endmsg; - // return sl; - // } MsgStream& operator << ( MsgStream& sl, const InDetLowBetaCandidate& sf) { return sf.dump(sl); } - //std::ostream& operator << ( std::ostream& sl, const InDetLowBetaCandidate& sf) - // { return sf.dump(sl); } + float InDetLowBetaCandidate::getTRTCorrBitsOverThreshold() const {