From a61049392cad0c96847147391777f8f86dfc74e6 Mon Sep 17 00:00:00 2001
From: Christopher Jones <cdj@fnal.gov>
Date: Fri, 7 Mar 2014 17:21:04 +0100
Subject: [PATCH] Replaced try...catch with ParameterSet::existsAs calls

This code was causing dozens of exceptions to be thrown and then
caught in production jobs. Since the code was only testing the
existence of a ParameterSet it was easy to replace with existsAs.

NOTE: It looks to me like this code is completely unnecessary.
The loop just before this one goes over the exact same parameter names
and asks for them as tracked parameters. If that succeeds, they can't
also be untracked so the code modified does nothing. If that fails
an exception is thrown and the code modified is never called.
---
 .../Higgs/src/HLTHiggsSubAnalysis.cc          | 36 +++++++------------
 1 file changed, 12 insertions(+), 24 deletions(-)

diff --git a/HLTriggerOffline/Higgs/src/HLTHiggsSubAnalysis.cc b/HLTriggerOffline/Higgs/src/HLTHiggsSubAnalysis.cc
index 74e7c2165ca8c..4f6c3f1692dc4 100644
--- a/HLTriggerOffline/Higgs/src/HLTHiggsSubAnalysis.cc
+++ b/HLTriggerOffline/Higgs/src/HLTHiggsSubAnalysis.cc
@@ -60,10 +60,10 @@ HLTHiggsSubAnalysis::HLTHiggsSubAnalysis(const edm::ParameterSet & pset,
 			it != _recLabels.end(); ++it)
 	{
 		const std::string objStr = EVTColContainer::getTypeString(it->first);
-		_genCut[it->first] = pset.getParameter<std::string>( std::string(objStr+"_genCut").c_str() );
-		_recCut[it->first] = pset.getParameter<std::string>( std::string(objStr+"_recCut").c_str() );
-		_cutMinPt[it->first] = pset.getParameter<double>( std::string(objStr+"_cutMinPt").c_str() );
-		_cutMaxEta[it->first] = pset.getParameter<double>( std::string(objStr+"_cutMaxEta").c_str() );
+		_genCut[it->first] = pset.getParameter<std::string>( objStr+"_genCut" );
+		_recCut[it->first] = pset.getParameter<std::string>( objStr+"_recCut" );
+		_cutMinPt[it->first] = pset.getParameter<double>( objStr+"_cutMinPt" );
+		_cutMaxEta[it->first] = pset.getParameter<double>( objStr+"_cutMaxEta" );
 	}
 
 	//--- Updating parameters if has to be modified for this particular specific analysis
@@ -72,33 +72,21 @@ HLTHiggsSubAnalysis::HLTHiggsSubAnalysis(const edm::ParameterSet & pset,
 	{
 
 		const std::string objStr = EVTColContainer::getTypeString(it->first);
-		try
+		if(anpset.existsAs<std::string>( objStr+"_genCut", false)) 
 		{
-			_genCut[it->first] = anpset.getUntrackedParameter<std::string>( std::string(objStr+"_genCut").c_str() ); 
+			_genCut[it->first] = anpset.getUntrackedParameter<std::string>( objStr+"_genCut" ); 
 		}
-		catch(edm::Exception)
+		if(anpset.existsAs<std::string>( objStr+"_recCut", false))
 		{
+			_recCut[it->first] = anpset.getUntrackedParameter<std::string>( objStr+"_recCut" );
 		}
-		try
+		if(anpset.existsAs<double>( objStr+"_cutMinPt" , false) )
 		{
-			_recCut[it->first] = anpset.getUntrackedParameter<std::string>( std::string(objStr+"_recCut").c_str() );
+			_cutMinPt[it->first] = anpset.getUntrackedParameter<double>( objStr+"_cutMinPt" );
 		}
-		catch(edm::Exception)
-		{
-		}
-		try
-		{
-			_cutMinPt[it->first] = anpset.getUntrackedParameter<double>( std::string(objStr+"_cutMinPt").c_str() );
-		}
-		catch(edm::Exception)
-		{
-		}
-		try
-		{
-			_cutMaxEta[it->first] = anpset.getUntrackedParameter<double>( std::string(objStr+"_cutMaxEta").c_str() );
-		}
-		catch(edm::Exception)
+		if(anpset.existsAs<double>( objStr+"_cutMaxEta" ,false) )
 		{
+			_cutMaxEta[it->first] = anpset.getUntrackedParameter<double>( objStr+"_cutMaxEta" );
 		}
 	}