Merge CMSSW_7_5_X into CMSSW_7_6_X.

cms-sw · Sep 23, 2015 · 2315273 · 2315273
2 parents 73a43c2 + 01e471a
commit 2315273
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/HLTriggerOffline/B2G/python/b2gSingleLeptonHLTEventValidation_cfi.py b/HLTriggerOffline/B2G/python/b2gSingleLeptonHLTEventValidation_cfi.py
@@ -22,7 +22,8 @@
         minJets      = cms.untracked.uint32(2),
         # Trigger
         sTrigger     = cms.untracked.string("TriggerResults"),
-        vsPaths      = cms.untracked.vstring(['HLT_Mu40_eta2p1_PFJet200_PFJet50']),
+        vsPaths      = cms.untracked.vstring(['HLT_Mu40_eta2p1_PFJet200_PFJet50',
+		'HLT_Mu30_eta2p1_PFJet150_PFJet50']),
 )
 
 # ttbar semi electronique
@@ -47,5 +48,6 @@
         minJets      = cms.untracked.uint32(2),
         # Trigger
         sTrigger     = cms.untracked.string("TriggerResults"),
-        vsPaths      = cms.untracked.vstring(['HLT_Ele45_CaloIdVT_GsfTrkIdT_PFJet200_PFJet50']),
+        vsPaths      = cms.untracked.vstring(['HLT_Ele45_CaloIdVT_GsfTrkIdT_PFJet200_PFJet50',
+		'HLT_Ele35_CaloIdVT_GsfTrkIdT_PFJet150_PFJet50']),
 )
diff --git a/PhysicsTools/PatAlgos/plugins/PATMuonProducer.h b/PhysicsTools/PatAlgos/plugins/PATMuonProducer.h
@@ -198,6 +198,7 @@ void pat::PATMuonProducer::readIsolationLabels( const edm::ParameterSet & iConfi
       for ( ; it != ed; ++it, ++key) {
        labels.push_back(std::make_pair(pat::IsolationKeys(key), *it));
       }
+      tokens = edm::vector_transform(labels, [this](IsolationLabel const & label){return consumes<edm::ValueMap<T> >(label.second);});
     }
   }
   tokens = edm::vector_transform(labels, [this](pat::PATMuonProducer::IsolationLabel const & label){return consumes<edm::ValueMap<T> >(label.second);});

diff --git a/PhysicsTools/PatAlgos/plugins/PATPhotonProducer.h b/PhysicsTools/PatAlgos/plugins/PATPhotonProducer.h
@@ -177,6 +177,9 @@ void pat::PATPhotonProducer::readIsolationLabels( const edm::ParameterSet & iCon
        labels.push_back(std::make_pair(pat::IsolationKeys(key), *it));
       }
     }
+
+    tokens = edm::vector_transform(labels, [this](IsolationLabel const & label){return consumes<edm::ValueMap<T> >(label.second);});
+
   }
 	tokens = edm::vector_transform(labels, [this](IsolationLabel const & label){return consumes<edm::ValueMap<T> >(label.second);});
 }
-Original file line number
+Diff line change
@@ Expand Up @@
            labels.push_back(std::make_pair(pat::IsolationKeys(key), *it));
           }
         }
+        tokens = edm::vector_transform(labels, [this](IsolationLabel const & label){return consumes<edm::ValueMap<T> >(label.second);});
       }
     	tokens = edm::vector_transform(labels, [this](IsolationLabel const & label){return consumes<edm::ValueMap<T> >(label.second);});
     }
@@ Expand Down @@