Skip to content
Snippets Groups Projects
Commit ba18d395 authored by Shaun Roe's avatar Shaun Roe Committed by Graeme Stewart
Browse files

fix endreq compiler warnings (TrkTrack-07-02-06)

	* fix endreq compiler warning
	* Tagging TrkTrack-07-02-06

2016-08-12 Alex Alonso
        * Add new patternRecognition for Pseudotracking in trackInfo.
	* Tagging TrkTrack-07-02-05


Former-commit-id: 144eedc63b7d559c4aff402f1ef3124ed008c2d5
parent f78b6f45
No related branches found
No related tags found
No related merge requests found
......@@ -254,8 +254,12 @@ the track and determine this for yourself (especially as not all Track builders
/** SLHCConversion Track flag */
SiSpacePointsSeedMaker_SLHCConversionTracks = 50,
/** Pseudo-tracking flag */
Pseudotracking = 51,
/** Maximum number of enums */
NumberOfTrackRecoInfo = 51
NumberOfTrackRecoInfo = 52
};
TrackInfo (); //!<needed by POOL. DO NOT USE YOURSELF!
......
......@@ -59,12 +59,12 @@ MsgStream& Trk::operator << ( MsgStream& sl, const Trk::AlignmentEffectsOnTrack&
{
if (sl.level()<MSG::INFO)
{
sl<<"AlignmentEffectsOnTrack:"<<endreq;
sl <<"deltaTranslation = "<<aeot.deltaTranslation()<<endreq;
sl <<"sigmaDeltaTranslation = "<<aeot.deltaTranslation()<<endreq;
sl <<"deltaAngle = "<<aeot.deltaAngle()<<endreq;
sl <<"sigmaDeltaAngle = "<<aeot.sigmaDeltaAngle()<<endreq;
sl <<"surface = "<<aeot.associatedSurface()<<endreq;
sl<<"AlignmentEffectsOnTrack:"<<endmsg;
sl <<"deltaTranslation = "<<aeot.deltaTranslation()<<endmsg;
sl <<"sigmaDeltaTranslation = "<<aeot.deltaTranslation()<<endmsg;
sl <<"deltaAngle = "<<aeot.deltaAngle()<<endmsg;
sl <<"sigmaDeltaAngle = "<<aeot.sigmaDeltaAngle()<<endmsg;
sl <<"surface = "<<aeot.associatedSurface()<<endmsg;
}
return sl;
}
......
......@@ -271,13 +271,13 @@ unsigned int Trk::Track::numberOfInstantiations()
MsgStream& Trk::operator << ( MsgStream& sl, const Trk::Track& track)
{
std::string name("Track ");
sl <<name<<"Author = "<<track.info().dumpInfo()<<endreq;
if (track.fitQuality()!=0) sl << *(track.fitQuality() )<<endreq;
if (track.trackSummary()!=0) sl << *(track.trackSummary())<<endreq;
else sl << "No TrackSummary available in this track."<<endreq;
sl <<name<<"Author = "<<track.info().dumpInfo()<<endmsg;
if (track.fitQuality()!=0) sl << *(track.fitQuality() )<<endmsg;
if (track.trackSummary()!=0) sl << *(track.trackSummary())<<endmsg;
else sl << "No TrackSummary available in this track."<<endmsg;
if (track.trackStateOnSurfaces() !=0)
{
sl << name <<"has " << (track.trackStateOnSurfaces()->size()) << " trackStateOnSurface(s)" << endreq;
sl << name <<"has " << (track.trackStateOnSurfaces()->size()) << " trackStateOnSurface(s)" << endmsg;
//level()sh shows the output level, currentLevel()
//shows what the stream is set to
......@@ -288,9 +288,9 @@ MsgStream& Trk::operator << ( MsgStream& sl, const Trk::Track& track)
int num=0;
for (;it!=track.trackStateOnSurfaces()->end();++it)
{
sl<< " --------- Start of TrackStateOnSurface \t"<<num<<"\t-------"<<endreq;
sl<< " --------- Start of TrackStateOnSurface \t"<<num<<"\t-------"<<endmsg;
sl<<(**it);
sl<< " --------- End of TrackStateOnSurface \t"<<num++<<"\t-------"<<endreq;
sl<< " --------- End of TrackStateOnSurface \t"<<num++<<"\t-------"<<endmsg;
}
}
}
......
......@@ -180,6 +180,7 @@ std::string Trk::TrackInfo::dumpInfo() const
authorInfo<< (m_patternRecognition.test(Trk::TrackInfo::SiSpacePointsSeedMaker_VeryLowMomentum) ? "SiSpacePointsSeedMaker_VeryLowMomentum; ": "");
authorInfo<< (m_patternRecognition.test(Trk::TrackInfo::SiSpacePointsSeedMaker_SLHCConversionTracks) ? "SiSpacePointsSeedMaker_SLHCConversionTracks; ": "");
authorInfo<< (m_patternRecognition.test(Trk::TrackInfo::SiSpacePointsSeedMaker_LargeD0) ? "SiSpacePointsSeedMaker_LargeD0; ": "");
authorInfo<< (m_patternRecognition.test(Trk::TrackInfo::Pseudotracking ) ? "Pseudotracking; ": "");
authorInfo<< (m_patternRecognition.test(Trk::TrackInfo::MuidMuonRecoveryTool) ? "MuidMuonRecoveryTool; ": "");
authorInfo<< (m_patternRecognition.test(Trk::TrackInfo::MuidStandaloneRefit) ? "MuidStandaloneRefit; ": "");
authorInfo<< (m_patternRecognition.test(Trk::TrackInfo::TrackInCaloROI) ? "TrackInCaloROI; ": "");
......@@ -207,7 +208,7 @@ std::ostream& Trk::operator << ( std::ostream& sl, const Trk::TrackInfo& info)
MsgStream& Trk::operator << ( MsgStream& sl, const Trk::TrackInfo& info)
{
sl <<info.dumpInfo()<<endreq;
sl <<info.dumpInfo()<<endmsg;
return sl;
}
......
......@@ -238,26 +238,26 @@ TrackStateOnSurface::isSane() const {
MsgStream& operator << ( MsgStream& sl, const TrackStateOnSurface& tsos)
{
std::string name("TrackStateOnSurface: ");
sl <<name<<"\t of type : "<<tsos.dumpType()<<endreq;
sl <<name<<"\t of type : "<<tsos.dumpType()<<endmsg;
//write out "type" of object
if (sl.level()<MSG::INFO)
{
sl<<name<<"Detailed dump of contained objects follows:"<<endreq;
sl<<name<<"Detailed dump of contained objects follows:"<<endmsg;
if ( tsos.fitQualityOnSurface()!=0)
sl << *(tsos.fitQualityOnSurface() )<<endreq<<" (end of FitQualityOnSurface dump)"<<endreq;
sl << *(tsos.fitQualityOnSurface() )<<"\n (end of FitQualityOnSurface dump)"<<endmsg;
if ( tsos.trackParameters() !=0)
sl << *(tsos.trackParameters() )<<endreq<<" (end of TrackParameters dump)"<<endreq;
sl << *(tsos.trackParameters() )<<"\n (end of TrackParameters dump)"<<endmsg;
if ( tsos.measurementOnTrack()!=0)
sl << *(tsos.measurementOnTrack() )<<endreq<<" (end of MeasurementBase dump"<<endreq;
sl << *(tsos.measurementOnTrack() )<<"\n (end of MeasurementBase dump"<<endmsg;
if (tsos.materialEffectsOnTrack()!=0)
sl << *(tsos.materialEffectsOnTrack() )<<endreq<<" (end of MaterialEffectsBase dump)"<<endreq;
sl << *(tsos.materialEffectsOnTrack() )<<"\n (end of MaterialEffectsBase dump)"<<endmsg;
if (tsos.alignmentEffectsOnTrack()!=0)
sl << *(tsos.alignmentEffectsOnTrack() )<<endreq<<" (end of AlignmentEffectsOnTrack dump)"<<endreq;
sl << *(tsos.alignmentEffectsOnTrack() )<<"\n (end of AlignmentEffectsOnTrack dump)"<<endmsg;
}
return sl;
}
......
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