Merge pull request #14278 from davidsheffield/81X_Scouting_HLTrigger_…

…ErrorMessages Quietly return when producer fails to find input collection
cms-sw · Apr 28, 2016 · 6da9ec2 · 6da9ec2
2 parents b08c187 + 5009ce8
commit 6da9ec2
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 35 deletions.
diff --git a/HLTrigger/Egamma/src/HLTScoutingEgammaProducer.cc b/HLTrigger/Egamma/src/HLTScoutingEgammaProducer.cc
@@ -56,99 +56,100 @@ void HLTScoutingEgammaProducer::produce(edm::StreamID sid, edm::Event & iEvent,
 {
     using namespace edm;
 
+    std::unique_ptr<ScoutingElectronCollection> outElectrons(new ScoutingElectronCollection());
+    std::unique_ptr<ScoutingPhotonCollection> outPhotons(new ScoutingPhotonCollection());
+
     // Get RecoEcalCandidate
     Handle<reco::RecoEcalCandidateCollection> EgammaCandidateCollection;
     if(!iEvent.getByToken(EgammaCandidateCollection_,
                           EgammaCandidateCollection)){
-        edm::LogError ("HLTScoutingEgammaProducer")
-            << "invalid collection: EgammaCandidateCollection" << "\n";
+        iEvent.put(std::move(outElectrons));
+        iEvent.put(std::move(outPhotons));
         return;
     }
 
     // Get GsfTrack
     Handle<reco::GsfTrackCollection> EgammaGsfTrackCollection;
     if(!iEvent.getByToken(EgammaGsfTrackCollection_,
                           EgammaGsfTrackCollection)){
-        edm::LogError ("HLTScoutingEgammaProducer")
-            << "invalid collection: EgammaGsfTrackCollection" << "\n";
+        iEvent.put(std::move(outElectrons));
+        iEvent.put(std::move(outPhotons));
         return;
     }
 
     // Get SigmaIEtaIEtaMap
     Handle<RecoEcalCandMap> SigmaIEtaIEtaMap;
     if(!iEvent.getByToken(SigmaIEtaIEtaMap_, SigmaIEtaIEtaMap)){
-        edm::LogError ("HLTScoutingEgammaProducer")
-            << "invalid collection: hltEgammaClusterShape:sigmaIEtaIEta5x5" << "\n";
+        iEvent.put(std::move(outElectrons));
+        iEvent.put(std::move(outPhotons));
         return;
     }
 
     // Get HoverEMap
     Handle<RecoEcalCandMap> HoverEMap;
     if(!iEvent.getByToken(HoverEMap_, HoverEMap)){
-        edm::LogError ("HLTScoutingEgammaProducer")
-            << "invalid collection: hltEgammaHoverE" << "\n";
+        iEvent.put(std::move(outElectrons));
+        iEvent.put(std::move(outPhotons));
         return;
     }
 
     // Get DetaMap
     Handle<RecoEcalCandMap> DetaMap;
     if(!iEvent.getByToken(DetaMap_, DetaMap)){
-        edm::LogError ("HLTScoutingEgammaProducer")
-            << "invalid collection: hltEgammaGsfTrackVars:Deta" << "\n";
+        iEvent.put(std::move(outElectrons));
+        iEvent.put(std::move(outPhotons));
         return;
     }
 
     // Get DphiMap
     Handle<RecoEcalCandMap> DphiMap;
     if(!iEvent.getByToken(DphiMap_, DphiMap)){
-        edm::LogError ("HLTScoutingEgammaProducer")
-            << "invalid collection: hltEgammaGsfTrackVars:Dphi" << "\n";
+        iEvent.put(std::move(outElectrons));
+        iEvent.put(std::move(outPhotons));
         return;
     }
 
     // Get MissingHitsMap
     Handle<RecoEcalCandMap> MissingHitsMap;
     if(!iEvent.getByToken(MissingHitsMap_, MissingHitsMap)){
-        edm::LogError ("HLTScoutingEgammaProducer")
-            << "invalid collection: hltEgammaGsfTrackVars:MissingHits" << "\n";
+        iEvent.put(std::move(outElectrons));
+        iEvent.put(std::move(outPhotons));
         return;
     }
 
     // Get 1/E - 1/p Map
     Handle<RecoEcalCandMap> OneOEMinusOneOPMap;
     if(!iEvent.getByToken(OneOEMinusOneOPMap_, OneOEMinusOneOPMap)){
-        edm::LogError ("HLTScoutingEgammaProducer")
-            << "invalid collection: hltEgammaGsfTrackVars:OneOESuperMinusOneOP" << "\n";
+        iEvent.put(std::move(outElectrons));
+        iEvent.put(std::move(outPhotons));
         return;
     }
 
     // Get EcalPFClusterIsoMap
     Handle<RecoEcalCandMap> EcalPFClusterIsoMap;
     if(!iEvent.getByToken(EcalPFClusterIsoMap_, EcalPFClusterIsoMap)){
-        edm::LogError ("HLTScoutingEgammaProducer")
-            << "invalid collection: hltEgammaEcalPFClusterIso" << "\n";
+        iEvent.put(std::move(outElectrons));
+        iEvent.put(std::move(outPhotons));
         return;
     }
 
     // Get EleGsfTrackIsoMap
     Handle<RecoEcalCandMap> EleGsfTrackIsoMap;
     if(!iEvent.getByToken(EleGsfTrackIsoMap_, EleGsfTrackIsoMap)){
-        edm::LogError ("HLTScoutingEgammaProducer")
-            << "invalid collection: hltEgammaEleGsfTrackIso" << "\n";
+        iEvent.put(std::move(outElectrons));
+        iEvent.put(std::move(outPhotons));
         return;
     }
 
     // Get HcalPFClusterIsoMap
     Handle<RecoEcalCandMap> HcalPFClusterIsoMap;
     if(!iEvent.getByToken(HcalPFClusterIsoMap_, HcalPFClusterIsoMap)){
-        edm::LogError ("HLTScoutingEgammaProducer")
-            << "invalid collection: HcalPFClusterIso" << "\n";
+        iEvent.put(std::move(outElectrons));
+        iEvent.put(std::move(outPhotons));
         return;
     }
 
     // Produce electrons and photons
-    std::unique_ptr<ScoutingElectronCollection> outElectrons(new ScoutingElectronCollection());
-    std::unique_ptr<ScoutingPhotonCollection> outPhotons(new ScoutingPhotonCollection());
     int index = 0;
     for (auto &candidate : *EgammaCandidateCollection) {
         reco::RecoEcalCandidateRef candidateRef = getRef(EgammaCandidateCollection, index);

diff --git a/HLTrigger/Muon/src/HLTScoutingMuonProducer.cc b/HLTrigger/Muon/src/HLTScoutingMuonProducer.cc
@@ -46,48 +46,44 @@ void HLTScoutingMuonProducer::produce(edm::StreamID sid, edm::Event & iEvent,
 {
     using namespace edm;
 
+    std::unique_ptr<ScoutingMuonCollection> outMuons(new ScoutingMuonCollection());
+
     // Get RecoChargedCandidate
     Handle<reco::RecoChargedCandidateCollection> ChargedCandidateCollection;
     if(!iEvent.getByToken(ChargedCandidateCollection_, ChargedCandidateCollection)){
-        edm::LogError ("HLTScoutingMuonProducer")
-            << "invalid collection: ChargedCandidateCollection" << "\n";
+        iEvent.put(std::move(outMuons));
         return;
     }
 
     // Get Track
     Handle<reco::TrackCollection> TrackCollection;
     if(!iEvent.getByToken(TrackCollection_, TrackCollection)){
-        edm::LogError ("HLTScoutingMuonProducer")
-            << "invalid collection: TrackCollection" << "\n";
+        iEvent.put(std::move(outMuons));
         return;
     }
 
     // Get EcalPFClusterIsoMap
     Handle<RecoChargedCandMap> EcalPFClusterIsoMap;
     if(!iEvent.getByToken(EcalPFClusterIsoMap_, EcalPFClusterIsoMap)){
-        edm::LogError ("HLTScoutingMuonProducer")
-            << "invalid collection: hltMuonEcalPFClusterIsoForMuons" << "\n";
+        iEvent.put(std::move(outMuons));
         return;
     }
 
     // Get HcalPFClusterIsoMap
     Handle<RecoChargedCandMap> HcalPFClusterIsoMap;
     if(!iEvent.getByToken(HcalPFClusterIsoMap_, HcalPFClusterIsoMap)){
-        edm::LogError ("HLTScoutingMuonProducer")
-            << "invalid collection: hltMuonHcalPFClusterIsoForMuons" << "\n";
+        iEvent.put(std::move(outMuons));
         return;
     }
 
     // Get TrackIsoMap
     Handle<ValueMap<double>> TrackIsoMap;
     if(!iEvent.getByToken(TrackIsoMap_, TrackIsoMap)){
-        edm::LogError ("HLTScoutingMuonProducer")
-            << "invalid collection: TrackIsoMap" << "\n";
+        iEvent.put(std::move(outMuons));
         return;
     }
 
     // Produce muons
-    std::unique_ptr<ScoutingMuonCollection> outMuons(new ScoutingMuonCollection());
     int index = 0;
     for (auto &muon : *ChargedCandidateCollection) {
         reco::RecoChargedCandidateRef muonRef = getRef(ChargedCandidateCollection, index);