From 120e11dedeeccd276d308c53694e4db365a0ae9c Mon Sep 17 00:00:00 2001
From: William Axel Leight <william.axel.leight@cern.ch>
Date: Mon, 19 Sep 2016 22:47:01 +0200
Subject: [PATCH] Minor addition to CandidateSummary
(MuonCombinedEvent-01-01-05)
* Added isSiliconAssociated to CandidateSummary (for MuGirl use)
* Tagging as MuonCombinedEvent-01-01-05
2016-08-11 scott snyder <snyder@bnl.gov>
* Tagging MuonCombinedEvent-01-01-04.
* endreq -> endmsg.
Former-commit-id: 5e40a424d7cbbe2050f058917cc8e8087f87a174
---
.../MuonCombinedEvent/CandidateSummary.h | 2 ++
.../MuonCombinedEvent/src/MuonOverlapDescriptor.cxx | 10 +++++-----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/Reconstruction/MuonIdentification/MuonCombinedEvent/MuonCombinedEvent/CandidateSummary.h b/Reconstruction/MuonIdentification/MuonCombinedEvent/MuonCombinedEvent/CandidateSummary.h
index e106aa0590c3..c4b4a13d9f0d 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedEvent/MuonCombinedEvent/CandidateSummary.h
+++ b/Reconstruction/MuonIdentification/MuonCombinedEvent/MuonCombinedEvent/CandidateSummary.h
@@ -85,6 +85,7 @@ public:
double lhr;
int saveAnn;
int saveStau;
+ bool isSiliconAssociated;
StauRpcHitsLists* rpcHitsLists;
CandidateSummary()
@@ -134,6 +135,7 @@ public:
lhr(-999.),
saveAnn(-1),
saveStau(-1),
+ isSiliconAssociated(false),
rpcHitsLists(NULL)
{
}
diff --git a/Reconstruction/MuonIdentification/MuonCombinedEvent/src/MuonOverlapDescriptor.cxx b/Reconstruction/MuonIdentification/MuonCombinedEvent/src/MuonOverlapDescriptor.cxx
index b2ae28a7fb5e..167f04dcf9fd 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedEvent/src/MuonOverlapDescriptor.cxx
+++ b/Reconstruction/MuonIdentification/MuonCombinedEvent/src/MuonOverlapDescriptor.cxx
@@ -75,15 +75,15 @@ MsgStream& Rec::operator << ( MsgStream& sl, const MuonOverlapDescriptor& itself
// if namespace, need to use MsgStream& Rec::operator :-(
{
if (itself.hasOverlap()) {
- sl <<"Muon overlap desriptor: "<< endreq;
+ sl <<"Muon overlap desriptor: "<< endmsg;
sl <<"ID pointers: " << (itself.sharesIndetTrack()? "identical":"different")
<<", MS pointers: " << (itself.sharesSpectroTrack()? "identical" : "different")
- <<endreq;
+ <<endmsg;
sl <<"MS hits: " << itself.nSharedPrecisionHits() << " shared prec. hits of "
- << itself.nTotalPrecisionHits()<<" total." << endreq;
+ << itself.nTotalPrecisionHits()<<" total." << endmsg;
sl <<" " << itself.nSharedSpectroPhiHits() << " shared phi hits of "
- << itself.nTotalSpectroPhiHits()<<" totoal."<<endreq;
- } else sl<<"Muon overlap desriptor: no Overlap."<<endreq;
+ << itself.nTotalSpectroPhiHits()<<" totoal."<<endmsg;
+ } else sl<<"Muon overlap desriptor: no Overlap."<<endmsg;
return sl;
}
--
GitLab