Merge remote-tracking branch 'official-cmssw/CMSSW_8_0_X' into CMSSW_…

…8_0_X_L2p5_tau_isolation

Alignment/CocoaApplication/BuildFile.xml

@@ -1,8 +1,6 @@
 <use   name="clhep"/>
 <use   name="root"/>
 <use   name="DetectorDescription/Core"/>
-<use   name="CondCore/IOVService"/>
-<use   name="CondCore/MetaDataService"/>
 <use   name="FWCore/Framework"/>
 <use   name="FWCore/ParameterSet"/>
 <use   name="Geometry/Records"/>
@@ -14,6 +12,5 @@
 <use   name="Alignment/CocoaFit"/>
 <use   name="meschach"/>
 <use   name="Alignment/CocoaDaq"/>
-<use   name="CondCore/DBCommon"/>
 <use   name="CondCore/DBOutputService"/>
 <flags   EDM_PLUGIN="1"/>

Alignment/CocoaApplication/src/CocoaAnalyzer.cc

@@ -1,5 +1,4 @@
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "CondCore/DBCommon/interface/Exception.h"
 #include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h" 
 #include "FWCore/Framework/interface/ESHandle.h"

Alignment/CocoaFit/BuildFile.xml

@@ -10,7 +10,6 @@
 <use   name="CondFormats/DataRecord"/>
 <use   name="CondFormats/Alignment"/>
 <use   name="CondFormats/AlignmentRecord"/>
-<use   name="CondCore/DBCommon"/>
 <use   name="CondCore/DBOutputService"/>
 <export>
   <lib   name="1"/>

Alignment/CocoaFit/src/CocoaDBMgr.cc

@@ -4,7 +4,6 @@
 #include "CondFormats/Alignment/interface/AlignTransformErrorExtended.h"
 #include "DataFormats/GeometryCommonDetAlgo/interface/GlobalError.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "CondCore/DBCommon/interface/Exception.h"
 #include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h" 
 #include "FWCore/Framework/interface/ESHandle.h"

Alignment/CommonAlignmentAlgorithm/interface/AlignmentAlgorithmBase.h

@@ -33,7 +33,7 @@ class Trajectory;
 // class TsosVectorCollection;
 // class TkFittedLasBeamCollection;
 // class AliClusterValueMap;
-#include "CondCore/DBCommon/interface/Time.h"
+#include "CondCore/CondDB/interface/Time.h"
 #include "Alignment/LaserAlignment/interface/TsosVectorCollection.h"
 #include "DataFormats/Alignment/interface/TkFittedLasBeamCollectionFwd.h"
 #include "DataFormats/Alignment/interface/AliClusterValueMapFwd.h"

Alignment/CommonAlignmentAlgorithm/src/AlignmentParameterSelector.cc

@@ -583,6 +583,8 @@ bool AlignmentParameterSelector::outsideDetIdRanges(const Alignable *alignable)
   const DetId detId(alignable->id());
   const int subdetId = detId.subdetId();
 
+  if (alignableTracker()) {
+
   const TrackerTopology* tTopo = alignableTracker()->trackerTopology();
 
   if (!theDetIds.empty() &&
@@ -663,7 +665,7 @@ bool AlignmentParameterSelector::outsideDetIdRanges(const Alignable *alignable)
       if (!theTECDetIdRanges.theSideRanges.empty() && 
 	  !this->insideRanges<int>(tTopo->tecSide(detId), theTECDetIdRanges.theSideRanges)) return true;
     }
-    
+  }
   }
 
   return false;

Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorAsAnalyzer.cc

@@ -56,6 +56,9 @@
 #include "CondFormats/AlignmentRecord/interface/CSCAlignmentErrorExtendedRcd.h"
 #include "CondFormats/AlignmentRecord/interface/GlobalPositionRcd.h"
 #include "CondFormats/Alignment/interface/DetectorGlobalPosition.h"
+
+#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
+
 //
 // class decleration
 //

Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonSystemMap1D.cc

@@ -24,6 +24,12 @@
 #include "TH1F.h"
 #include "TH2F.h"
 
+#include "TrackingTools/Records/interface/TrackingComponentsRecord.h"
+#include "TrackingTools/GeomPropagators/interface/Propagator.h"
+#include "TrackingTools/TrackAssociator/interface/DetIdAssociator.h"
+#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
+#include "MagneticField/Engine/interface/MagneticField.h"
+
 
 class AlignmentMonitorMuonSystemMap1D: public AlignmentMonitorBase
 {
@@ -260,6 +266,15 @@ void AlignmentMonitorMuonSystemMap1D::event(const edm::Event &iEvent, const edm:
   edm::Handle<reco::BeamSpot> beamSpot;
   iEvent.getByLabel(m_beamSpotTag, beamSpot);
 
+  edm::ESHandle<DetIdAssociator> muonDetIdAssociator_;
+  iSetup.get<DetIdAssociatorRecord>().get("MuonDetIdAssociator", muonDetIdAssociator_);
+
+  edm::ESHandle<Propagator> prop;
+  iSetup.get<TrackingComponentsRecord>().get("SteppingHelixPropagatorAny",prop);
+
+  edm::ESHandle<MagneticField> magneticField;
+  iSetup.get<IdealMagneticFieldRecord>().get(magneticField);
+
   if (m_muonCollectionTag.label().empty()) // use trajectories
   {
     for (ConstTrajTrackPairCollection::const_iterator trajtrack = trajtracks.begin();  trajtrack != trajtracks.end();  ++trajtrack)
@@ -275,7 +290,7 @@ void AlignmentMonitorMuonSystemMap1D::event(const edm::Event &iEvent, const edm:
         {
           m_counter_trackdxy++;
 
-          MuonResidualsFromTrack muonResidualsFromTrack(globalGeometry, traj, track, pNavigator(), 1000.);
+          MuonResidualsFromTrack muonResidualsFromTrack(iSetup, magneticField, globalGeometry, muonDetIdAssociator_, prop, traj, track, pNavigator(), 1000.);
           processMuonResidualsFromTrack(muonResidualsFromTrack, iEvent);
         }
       } // end if track has acceptable momentum
@@ -337,7 +352,7 @@ void AlignmentMonitorMuonSystemMap1D::processMuonResidualsFromTrack(MuonResidual
 
       m_counter_dt++;
 
-      if (id.station() < 4 && dt13 != NULL  &&  dt13->numHits() >= m_minDT13Hits && dt2 != NULL  &&  dt2->numHits() >= m_minDT2Hits)
+      if (id.station() < 4 && dt13 != NULL  &&  dt13->numHits() >= m_minDT13Hits && dt2 != NULL  &&  dt2->numHits() >= m_minDT2Hits && (dt2->chi2() / double(dt2->ndof())) < 2.0)
       {
         m_counter_13numhits++;
 

Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonVsCurvature.cc

@@ -24,6 +24,12 @@
 #include "TH2F.h"
 #include "TH1F.h"
 
+#include "TrackingTools/Records/interface/TrackingComponentsRecord.h"
+#include "TrackingTools/GeomPropagators/interface/Propagator.h"
+#include "TrackingTools/TrackAssociator/interface/DetIdAssociator.h"
+#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
+#include "MagneticField/Engine/interface/MagneticField.h"
+
 
 class AlignmentMonitorMuonVsCurvature: public AlignmentMonitorBase
 {
@@ -191,6 +197,15 @@ void AlignmentMonitorMuonVsCurvature::event(const edm::Event &iEvent, const edm:
   edm::Handle<reco::BeamSpot> beamSpot;
   iEvent.getByLabel(m_beamSpotTag, beamSpot);
 
+  edm::ESHandle<DetIdAssociator> muonDetIdAssociator_;
+  iSetup.get<DetIdAssociatorRecord>().get("MuonDetIdAssociator", muonDetIdAssociator_);
+
+  edm::ESHandle<Propagator> prop;
+  iSetup.get<TrackingComponentsRecord>().get("SteppingHelixPropagatorAny",prop);
+
+  edm::ESHandle<MagneticField> magneticField;
+  iSetup.get<IdealMagneticFieldRecord>().get(magneticField);
+
   if (m_muonCollectionTag.label().empty()) // use trajectories
   {
     for (ConstTrajTrackPairCollection::const_iterator trajtrack = trajtracks.begin();  trajtrack != trajtracks.end();  ++trajtrack)
@@ -200,7 +215,7 @@ void AlignmentMonitorMuonVsCurvature::event(const edm::Event &iEvent, const edm:
 
       if (track->pt() > m_minTrackPt  && track->p() > m_minTrackP  &&  fabs(track->dxy(beamSpot->position())) < m_maxDxy )
       {
-        MuonResidualsFromTrack muonResidualsFromTrack(globalGeometry, traj, track, pNavigator(), 1000.);
+        MuonResidualsFromTrack muonResidualsFromTrack(iSetup, magneticField, globalGeometry, muonDetIdAssociator_, prop, traj, track, pNavigator(), 1000.);
         processMuonResidualsFromTrack(muonResidualsFromTrack, traj );
       } // end if track pT is within range
     } // end loop over tracks

Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorSegmentDifferences.cc

@@ -24,6 +24,12 @@
 
 #include <sstream>
 
+#include "TrackingTools/Records/interface/TrackingComponentsRecord.h"
+#include "TrackingTools/GeomPropagators/interface/Propagator.h"
+#include "TrackingTools/TrackAssociator/interface/DetIdAssociator.h"
+#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
+#include "MagneticField/Engine/interface/MagneticField.h"
+
 
 class AlignmentMonitorSegmentDifferences: public AlignmentMonitorBase
 {
@@ -343,6 +349,16 @@ void AlignmentMonitorSegmentDifferences::event(const edm::Event &iEvent, const e
   edm::Handle<reco::BeamSpot> beamSpot;
   iEvent.getByLabel(m_beamSpotTag, beamSpot);
 
+  edm::ESHandle<DetIdAssociator> muonDetIdAssociator_;
+  iSetup.get<DetIdAssociatorRecord>().get("MuonDetIdAssociator", muonDetIdAssociator_);
+
+
+  edm::ESHandle<Propagator> prop;
+  iSetup.get<TrackingComponentsRecord>().get("SteppingHelixPropagatorAny",prop);
+
+  edm::ESHandle<MagneticField> magneticField;
+  iSetup.get<IdealMagneticFieldRecord>().get(magneticField);
+
   if (m_muonCollectionTag.label().empty()) // use trajectories
   {
     for (ConstTrajTrackPairCollection::const_iterator trajtrack = trajtracks.begin();  trajtrack != trajtracks.end();  ++trajtrack)
@@ -352,7 +368,7 @@ void AlignmentMonitorSegmentDifferences::event(const edm::Event &iEvent, const e
 
       if (track->pt() > m_minTrackPt && track->p() > m_minTrackP && fabs(track->dxy(beamSpot->position())) < m_maxDxy )
       {
-        MuonResidualsFromTrack muonResidualsFromTrack(globalGeometry, traj, track, pNavigator(), 1000.);
+        MuonResidualsFromTrack muonResidualsFromTrack(iSetup, magneticField, globalGeometry,muonDetIdAssociator_, prop, traj, track, pNavigator(), 1000.);
         processMuonResidualsFromTrack(muonResidualsFromTrack);
       }
     } // end loop over tracks
@@ -478,7 +494,7 @@ void AlignmentMonitorSegmentDifferences::processMuonResidualsFromTrack(MuonResid
       } // end if DT13
 
       // z-direction
-      if (dt2 != NULL  &&  dt2->numHits() >= m_minDT2Hits)
+      if (dt2 != NULL  &&  dt2->numHits() >= m_minDT2Hits && (dt2->chi2() / double(dt2->ndof())) < 2.0)
       {
         DTChamberId thisid(chamberId->rawId());
         for (std::vector<DetId>::const_iterator otherId = chamberIds.begin();  otherId != chamberIds.end();  ++otherId)

Alignment/CommonAlignmentProducer/python/ALCARECOTkAlUpsilonMuMuHI_cff.py

@@ -10,13 +10,14 @@
 ALCARECOTkAlUpsilonMuMuHIDCSFilter = ALCARECOTkAlUpsilonMuMuDCSFilter.clone()
 
 ALCARECOTkAlUpsilonMuMuHIGoodMuons = ALCARECOTkAlUpsilonMuMuGoodMuons.clone()
-ALCARECOTkAlUpsilonMuMuHIRelCombIsoMuons = ALCARECOTkAlUpsilonMuMuRelCombIsoMuons.clone()
-ALCARECOTkAlUpsilonMuMuHIRelCombIsoMuons.src = 'ALCARECOTkAlUpsilonMuMuHIGoodMuons'
-ALCARECOTkAlUpsilonMuMuHIRelCombIsoMuons.cut = '(isolationR03().sumPt + isolationR03().emEt + isolationR03().hadEt)/pt  < 0.3'
+#ALCARECOTkAlUpsilonMuMuHIRelCombIsoMuons = ALCARECOTkAlUpsilonMuMuRelCombIsoMuons.clone()
+#ALCARECOTkAlUpsilonMuMuHIRelCombIsoMuons.src = 'ALCARECOTkAlUpsilonMuMuHIGoodMuons'
+#ALCARECOTkAlUpsilonMuMuHIRelCombIsoMuons.cut = '(isolationR03().sumPt + isolationR03().emEt + isolationR03().hadEt)/pt  < 0.3'
 
 ALCARECOTkAlUpsilonMuMuHI = ALCARECOTkAlUpsilonMuMu.clone(
      src = 'hiGeneralTracks'
 )
-ALCARECOTkAlUpsilonMuMuHI.GlobalSelector.muonSource = 'ALCARECOTkAlUpsilonMuMuHIRelCombIsoMuons'
+ALCARECOTkAlUpsilonMuMuHI.GlobalSelector.muonSource = 'ALCARECOTkAlUpsilonMuMuHIGoodMuons'
 
-seqALCARECOTkAlUpsilonMuMuHI = cms.Sequence(ALCARECOTkAlUpsilonMuMuHIHLT+ALCARECOTkAlUpsilonMuMuHIDCSFilter+ALCARECOTkAlUpsilonMuMuHIGoodMuons+ALCARECOTkAlUpsilonMuMuHIRelCombIsoMuons+ALCARECOTkAlUpsilonMuMuHI)
+#seqALCARECOTkAlUpsilonMuMuHI = cms.Sequence(ALCARECOTkAlUpsilonMuMuHIHLT+ALCARECOTkAlUpsilonMuMuHIDCSFilter+ALCARECOTkAlUpsilonMuMuHIGoodMuons+ALCARECOTkAlUpsilonMuMuHIRelCombIsoMuons+ALCARECOTkAlUpsilonMuMuHI)
+seqALCARECOTkAlUpsilonMuMuHI = cms.Sequence(ALCARECOTkAlUpsilonMuMuHIHLT+ALCARECOTkAlUpsilonMuMuHIDCSFilter+ALCARECOTkAlUpsilonMuMuHIGoodMuons+ALCARECOTkAlUpsilonMuMuHI)

Alignment/CommonAlignmentProducer/python/ALCARECOTkAlZMuMuHI_cff.py

@@ -10,12 +10,13 @@
 ALCARECOTkAlZMuMuHIDCSFilter = ALCARECOTkAlZMuMuDCSFilter.clone()
 
 ALCARECOTkAlZMuMuHIGoodMuons = ALCARECOTkAlZMuMuGoodMuons.clone()
-ALCARECOTkAlZMuMuHIRelCombIsoMuons = ALCARECOTkAlZMuMuRelCombIsoMuons.clone()
-ALCARECOTkAlZMuMuHIRelCombIsoMuons.src = 'ALCARECOTkAlZMuMuHIGoodMuons'
+#ALCARECOTkAlZMuMuHIRelCombIsoMuons = ALCARECOTkAlZMuMuRelCombIsoMuons.clone()
+#ALCARECOTkAlZMuMuHIRelCombIsoMuons.src = 'ALCARECOTkAlZMuMuHIGoodMuons'
 
 ALCARECOTkAlZMuMuHI = ALCARECOTkAlZMuMu.clone(
      src = 'hiGeneralTracks'
 )
-ALCARECOTkAlZMuMuHI.GlobalSelector.muonSource = 'ALCARECOTkAlZMuMuHIRelCombIsoMuons'
+ALCARECOTkAlZMuMuHI.GlobalSelector.muonSource = 'ALCARECOTkAlZMuMuHIGoodMuons'
 
-seqALCARECOTkAlZMuMuHI = cms.Sequence(ALCARECOTkAlZMuMuHIHLT+ALCARECOTkAlZMuMuHIDCSFilter+ALCARECOTkAlZMuMuHIGoodMuons+ALCARECOTkAlZMuMuHIRelCombIsoMuons+ALCARECOTkAlZMuMuHI)
+#seqALCARECOTkAlZMuMuHI = cms.Sequence(ALCARECOTkAlZMuMuHIHLT+ALCARECOTkAlZMuMuHIDCSFilter+ALCARECOTkAlZMuMuHIGoodMuons+ALCARECOTkAlZMuMuHIRelCombIsoMuons+ALCARECOTkAlZMuMuHI)
+seqALCARECOTkAlZMuMuHI = cms.Sequence(ALCARECOTkAlZMuMuHIHLT+ALCARECOTkAlZMuMuHIDCSFilter+ALCARECOTkAlZMuMuHIGoodMuons+ALCARECOTkAlZMuMuHI)

Alignment/MuonAlignment/BuildFile.xml

@@ -12,7 +12,6 @@
 <use   name="DataFormats/DetId"/>
 <use   name="FWCore/Framework"/>
 <use   name="FWCore/Concurrency"/>
-<use   name="CondCore/DBCommon"/>
 <use   name="CondCore/DBOutputService"/>
 <use   name="CondFormats/Alignment"/>
 <use   name="DataFormats/MuonDetId"/>

Alignment/MuonAlignment/python/convertSQLitetoXML_cfg.py

@@ -4,7 +4,7 @@
 process.source = cms.Source("EmptySource")
 process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(1))
 
-process.load("Geometry.CMSCommonData.cmsIdealGeometryXML_cfi")
+process.load("Configuration.StandardSequences.GeometryIdeal_cff")
 process.load("Geometry.MuonNumbering.muonNumberingInitialization_cfi")
 
 process.load("CondCore.DBCommon.CondDBSetup_cfi")

Alignment/MuonAlignment/python/convertXMLtoSQLite_cfg.py

@@ -5,7 +5,7 @@
 process.source = cms.Source("EmptySource")
 process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(1))
 
-process.load("Geometry.CMSCommonData.cmsIdealGeometryXML_cfi")
+process.load("Configuration.StandardSequences.GeometryIdeal_cff")
 process.load("Geometry.MuonNumbering.muonNumberingInitialization_cfi")
 
 process.MuonGeometryDBConverter = cms.EDAnalyzer("MuonGeometryDBConverter",

Alignment/MuonAlignment/python/download_sqlite_cfg.py

@@ -8,7 +8,7 @@
 process.source = cms.Source("EmptySource")
 process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(1))
 
-process.load("Geometry.CMSCommonData.cmsIdealGeometryXML_cfi")
+process.load("Configuration.StandardSequences.GeometryIdeal_cff")
 process.load("Geometry.MuonNumbering.muonNumberingInitialization_cfi")
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
 process.GlobalTag.globaltag = globalTag

Alignment/MuonAlignment/python/makeMuonMisalignmentScenario.py

@@ -355,7 +355,7 @@ def random6dof():
 process.source = cms.Source("EmptySource")
 process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(1))
 
-process.load("Geometry.CMSCommonData.cmsIdealGeometryXML_cfi")
+process.load("Configuration.StandardSequences.GeometryDB_cff")
 process.load("Geometry.MuonNumbering.muonNumberingInitialization_cfi")
 
 process.MuonGeometryDBConverter = cms.EDAnalyzer("MuonGeometryDBConverter",

Alignment/MuonAlignment/src/MuonAlignmentInputMethod.cc

@@ -21,6 +21,8 @@
 #include "Geometry/DTGeometryBuilder/src/DTGeometryBuilderFromDDD.h"
 #include "Geometry/CSCGeometryBuilder/src/CSCGeometryBuilderFromDDD.h"
 
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+
 //
 // constants, enums and typedefs
 //

Alignment/MuonAlignmentAlgorithms/BuildFile.xml

@@ -10,10 +10,14 @@
 <use   name="TrackingTools/TrackFitters"/>
 <use   name="Alignment/CommonAlignment"/>
 <use   name="RecoMuon/TransientTrackingRecHit"/>
+<use   name="TrackingTools/TransientTrack"/>
+<use   name="MagneticField/Records"/>
 <use   name="clhep"/>
 <use   name="root"/>
 <use   name="rootcore"/>
 <use   name="rootminuit"/>
+<use   name="TrackingTools/TrackAssociator"/>
+<use   name="TrackingTools/Records"/>
 <export>
   <lib   name="1"/>
 </export>

Alignment/MuonAlignmentAlgorithms/interface/MuonCSCChamberResidual.h

@@ -9,16 +9,17 @@
  */
 
 #include "Alignment/MuonAlignmentAlgorithms/interface/MuonHitsChamberResidual.h"
+#include "TrackingTools/GeomPropagators/interface/Propagator.h"
 
 class MuonCSCChamberResidual: public MuonHitsChamberResidual
 {
 public:
   MuonCSCChamberResidual(edm::ESHandle<GlobalTrackingGeometry> globalGeometry, AlignableNavigator *navigator,
-                         DetId chamberId, const AlignableDetOrUnitPtr& chamberAlignable);
+                         DetId chamberId, AlignableDetOrUnitPtr chamberAlignable);
 
   // for CSC, the residual is chamber local x, projected by the strip measurement direction
   // for CSC, the resslope is dresx/dz, or tan(phi_y)
-  virtual void addResidual(const TrajectoryStateOnSurface *tsos, const TransientTrackingRecHit *hit);
+  virtual void addResidual(edm::ESHandle<Propagator> prop, const TrajectoryStateOnSurface *tsos, const TrackingRecHit *hit,double, double);
 
   // dummy method
   virtual void setSegmentResidual(const reco::MuonChamberMatch *, const reco::MuonSegmentMatch *) {}

Alignment/MuonAlignmentAlgorithms/interface/MuonChamberResidual.h

@@ -21,6 +21,8 @@
 #include "DataFormats/MuonReco/interface/Muon.h"
 #include "DataFormats/MuonReco/interface/MuonFwd.h"
 
+#include "TrackingTools/GeomPropagators/interface/Propagator.h"
+
 class MuonChamberResidual
 {
 public:
@@ -32,12 +34,12 @@ class MuonChamberResidual
   };
 
   MuonChamberResidual(edm::ESHandle<GlobalTrackingGeometry> globalGeometry, AlignableNavigator *navigator, 
-                      DetId chamberId, const AlignableDetOrUnitPtr& chamberAlignable);
+                      DetId chamberId, AlignableDetOrUnitPtr chamberAlignable);
 
   virtual ~MuonChamberResidual() {}
 
   // has to be implemented for rechit based residuals 
-  virtual void addResidual(const TrajectoryStateOnSurface *, const TransientTrackingRecHit *) = 0;
+  virtual void addResidual(edm::ESHandle<Propagator> prop, const TrajectoryStateOnSurface *, const TrackingRecHit *, double, double) = 0;
 
   // has to be implemented for track muon segment residuals
   virtual void setSegmentResidual(const reco::MuonChamberMatch *, const reco::MuonSegmentMatch *) = 0;
@@ -65,11 +67,15 @@ class MuonChamberResidual
   double trackx() const { return m_trackx; }
   double tracky() const { return m_tracky; }
 
+  double ChambW() const { return m_ChambW; }
+  double Chambl() const { return m_Chambl; } 
+
   double segdxdz() const { return m_segdxdz; }
   double segdydz() const { return m_segdydz; }
   double segx() const { return m_segx; }
   double segy() const { return m_segy; }
 
+
   align::GlobalPoint global_trackpos();
   align::GlobalPoint global_stubpos();
   double global_residual() const;
@@ -111,6 +117,9 @@ class MuonChamberResidual
   double m_segdydz;
   double m_segx;
   double m_segy;
+  double m_ChambW;
+  double m_Chambl;
+
 
 };