Merge pull request cms-sw#42532 from CeliaFernandez/dev-addNonUpdatedSTAMu

Include an additional input to fill standalone muon tracks in MuonIdProducer

Author: cmsbuild

RecoMuon/MuonIdentification/plugins/MuonIdProducer.cc

@@ -136,8 +136,8 @@ MuonIdProducer::MuonIdProducer(const edm::ParameterSet& iConfig)
     throw cms::Exception("ConfigurationError")
         << "Number of input collection labels is different from number of types. "
         << "For each collection label there should be exactly one collection type specified.";
-  if (inputCollectionLabels_.size() > 7 || inputCollectionLabels_.empty())
-    throw cms::Exception("ConfigurationError") << "Number of input collections should be from 1 to 7.";
+  if (inputCollectionLabels_.size() > 8 || inputCollectionLabels_.empty())
+    throw cms::Exception("ConfigurationError") << "Number of input collections should be from 1 to 8.";
 
   debugWithTruthMatching_ = iConfig.getParameter<bool>("debugWithTruthMatching");
   if (debugWithTruthMatching_) {
@@ -180,8 +180,10 @@ MuonIdProducer::MuonIdProducer(const edm::ParameterSet& iConfig)
 
     if (inputType == ICTypes::INNER_TRACKS) {
       innerTrackCollectionToken_ = consumes<reco::TrackCollection>(inputLabel);
-    } else if (inputType == ICTypes::OUTER_TRACKS) {
+    } else if (inputType == ICTypes::OUTER_TRACKS && outerTrackCollectionToken_.isUninitialized()) {
       outerTrackCollectionToken_ = consumes<reco::TrackCollection>(inputLabel);
+    } else if (inputType == ICTypes::OUTER_TRACKS) {
+      outerTrackSecondaryCollectionToken_ = consumes<reco::TrackCollection>(inputLabel);
     } else if (inputType == ICTypes::LINKS) {
       linkCollectionToken_ = consumes<reco::MuonTrackLinksCollection>(inputLabel);
     } else if (inputType == ICTypes::MUONS) {
@@ -205,6 +207,7 @@ MuonIdProducer::~MuonIdProducer() {
 void MuonIdProducer::init(edm::Event& iEvent, const edm::EventSetup& iSetup) {
   innerTrackCollectionHandle_.clear();
   outerTrackCollectionHandle_.clear();
+  outerTrackSecondaryCollectionHandle_.clear();
   linkCollectionHandle_.clear();
   muonCollectionHandle_.clear();
 
@@ -225,11 +228,17 @@ void MuonIdProducer::init(edm::Event& iEvent, const edm::EventSetup& iSetup) {
       if (!innerTrackCollectionHandle_.isValid())
         throw cms::Exception("FatalError") << "Failed to get input track collection with label: " << inputLabel;
       LogTrace("MuonIdentification") << "Number of input inner tracks: " << innerTrackCollectionHandle_->size();
-    } else if (inputType == ICTypes::OUTER_TRACKS) {
+    } else if (inputType == ICTypes::OUTER_TRACKS && !outerTrackCollectionHandle_.isValid()) {
       iEvent.getByToken(outerTrackCollectionToken_, outerTrackCollectionHandle_);
       if (!outerTrackCollectionHandle_.isValid())
         throw cms::Exception("FatalError") << "Failed to get input track collection with label: " << inputLabel;
       LogTrace("MuonIdentification") << "Number of input outer tracks: " << outerTrackCollectionHandle_->size();
+    } else if (inputType == ICTypes::OUTER_TRACKS) {
+      iEvent.getByToken(outerTrackSecondaryCollectionToken_, outerTrackSecondaryCollectionHandle_);
+      if (!outerTrackSecondaryCollectionHandle_.isValid())
+        throw cms::Exception("FatalError") << "Failed to get input track collection with label: " << inputLabel;
+      LogTrace("MuonIdentification") << "Number of input outer secondary tracks: "
+                                     << outerTrackSecondaryCollectionHandle_->size();
     } else if (inputType == ICTypes::LINKS) {
       iEvent.getByToken(linkCollectionToken_, linkCollectionHandle_);
       if (!linkCollectionHandle_.isValid())
@@ -629,8 +638,14 @@ void MuonIdProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
   // and at last the stand alone muons
   if (outerTrackCollectionHandle_.isValid()) {
     LogTrace("MuonIdentification") << "Looking for new muons among stand alone muon tracks";
-    for (unsigned int i = 0; i < outerTrackCollectionHandle_->size(); ++i) {
-      const auto& outerTrack = outerTrackCollectionHandle_->at(i);
+    const unsigned int nouter = outerTrackCollectionHandle_->size();
+    const unsigned int nsecond =
+        (outerTrackSecondaryCollectionHandle_.isValid()) ? outerTrackSecondaryCollectionHandle_->size() : 0;
+    for (unsigned int i = 0; i < nouter + nsecond; ++i) {
+      const auto& outerTrack =
+          (i < nouter) ? outerTrackCollectionHandle_->at(i) : outerTrackSecondaryCollectionHandle_->at(i - nouter);
+      reco::TrackRef refToTrack = (i < nouter) ? reco::TrackRef(outerTrackCollectionHandle_, i)
+                                               : reco::TrackRef(outerTrackSecondaryCollectionHandle_, i - nouter);
 
       // check if this muon is already in the list of global muons
       bool newMuon = true;
@@ -654,16 +669,15 @@ void MuonIdProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
           if (overlap(muon, outerTrack) > 0) {
             LogTrace("MuonIdentification") << "Found associated tracker muon. Set a reference and move on";
             newMuon = false;
-            muon.setOuterTrack(reco::TrackRef(outerTrackCollectionHandle_, i));
+            muon.setOuterTrack(refToTrack);
             muon.setType(muon.type() | reco::Muon::StandAloneMuon);
             break;
           }
         }
       }
       if (newMuon) {
         LogTrace("MuonIdentification") << "No associated stand alone track is found. Making a muon";
-        outputMuons->push_back(
-            makeMuon(iEvent, iSetup, reco::TrackRef(outerTrackCollectionHandle_, i), reco::Muon::OuterTrack));
+        outputMuons->push_back(makeMuon(iEvent, iSetup, refToTrack, reco::Muon::OuterTrack));
         outputMuons->back().setType(reco::Muon::StandAloneMuon);
       }
     }

RecoMuon/MuonIdentification/plugins/MuonIdProducer.h

@@ -228,6 +228,7 @@ class MuonIdProducer : public edm::stream::EDProducer<> {
 
   edm::Handle<reco::TrackCollection> innerTrackCollectionHandle_;
   edm::Handle<reco::TrackCollection> outerTrackCollectionHandle_;
+  edm::Handle<reco::TrackCollection> outerTrackSecondaryCollectionHandle_;
   edm::Handle<reco::MuonCollection> muonCollectionHandle_;
   edm::Handle<reco::MuonTrackLinksCollection> linkCollectionHandle_;
   edm::Handle<reco::TrackToTrackMap> tpfmsCollectionHandle_;
@@ -237,6 +238,7 @@ class MuonIdProducer : public edm::stream::EDProducer<> {
 
   edm::EDGetTokenT<reco::TrackCollection> innerTrackCollectionToken_;
   edm::EDGetTokenT<reco::TrackCollection> outerTrackCollectionToken_;
+  edm::EDGetTokenT<reco::TrackCollection> outerTrackSecondaryCollectionToken_;
   edm::EDGetTokenT<reco::MuonCollection> muonCollectionToken_;
   edm::EDGetTokenT<reco::MuonTrackLinksCollection> linkCollectionToken_;
   edm::EDGetTokenT<reco::TrackToTrackMap> tpfmsCollectionToken_;

RecoMuon/MuonIdentification/python/muons1stStep_cfi.py

@@ -35,6 +35,7 @@
     inputCollectionTypes = cms.vstring('inner tracks', 
                                        'links', 
                                        'outer tracks',
+                                       'outer tracks',
                                        'tev firstHit',
                                        'tev picky',
                                        'tev dyt'),
@@ -44,7 +45,7 @@
     # internal
     debugWithTruthMatching = cms.bool(False),
     # input tracks
-    inputCollectionLabels = cms.VInputTag(cms.InputTag("generalTracks"), cms.InputTag("globalMuons"), cms.InputTag("standAloneMuons","UpdatedAtVtx"),
+    inputCollectionLabels = cms.VInputTag(cms.InputTag("generalTracks"), cms.InputTag("globalMuons"), cms.InputTag("standAloneMuons","UpdatedAtVtx"), cms.InputTag("standAloneMuons"),
                                           cms.InputTag("tevMuons","firstHit"),cms.InputTag("tevMuons","picky"),cms.InputTag("tevMuons","dyt")),
     fillCaloCompatibility = cms.bool(True),
     # OR