From 6daa22e1ba0e342c81b7aa24d17f0729664b720d Mon Sep 17 00:00:00 2001
From: Andreas Oehler <sha1-bf17a625e96eed2dfa3f3b53d79864d479019360@cern.ch>
Date: Mon, 23 Jun 2008 14:35:15 +0000
Subject: [PATCH] --- yaml --- r: 46367 b: "refs/heads/CMSSW_7_1_X" c:
 1042d12e5c2d617e4aebc825add8f2fbea643772 h: "refs/heads/CMSSW_7_1_X" i:  
 46365: 8d78441eb7bff645e968af9e7d4943982a9be719   46363:
 ba855e4d0142976c155b708a481d7564da675d40   46359:
 32b275faf5c4e8c4b4aa9c84e660015dc058cb33   46351:
 f1939cf9b64ee6013044d5d76f012a3f42de8cd8   46335:
 0d68e0cb42512f393cfc03ae46c7e935c1014171 v: v3

---
 [refs]                                             | 2 +-
 trunk/RecoJets/JetProducers/src/BaseJetProducer.cc | 6 +-----
 trunk/RecoJets/JetProducers/src/BaseJetProducer.h  | 1 -
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index d81e1d014af3e..12dcc96f7178f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,3 +1,3 @@
 ---
 refs/heads/gh-pages: ac155dadd83efa75cad55c0508a57a2b9dd3d66c
-"refs/heads/CMSSW_7_1_X": 025f3c6215e01f239b73a7d8cca03200d043b855
+"refs/heads/CMSSW_7_1_X": 1042d12e5c2d617e4aebc825add8f2fbea643772
diff --git a/trunk/RecoJets/JetProducers/src/BaseJetProducer.cc b/trunk/RecoJets/JetProducers/src/BaseJetProducer.cc
index e2ded4bd2a5a9..21f44562370d9 100644
--- a/trunk/RecoJets/JetProducers/src/BaseJetProducer.cc
+++ b/trunk/RecoJets/JetProducers/src/BaseJetProducer.cc
@@ -83,8 +83,7 @@ namespace cms
       mJetType (conf.getUntrackedParameter<string>( "jetType", "CaloJet")),
       mVerbose (conf.getUntrackedParameter<bool>("verbose", false)),
       mEtInputCut (conf.getParameter<double>("inputEtMin")),
-      mEInputCut (conf.getParameter<double>("inputEMin")),
-      mMaxInputParticles(conf.getUntrackedParameter<int>("inputMaxParticles",-1))
+      mEInputCut (conf.getParameter<double>("inputEMin"))
   {
     std::string alias = conf.getUntrackedParameter<string>( "alias", conf.getParameter<std::string>("@module_label"));
     if (makeCaloJet (mJetType)) {
@@ -130,9 +129,6 @@ namespace cms
     if (input.empty ()) {
       edm::LogInfo ("Empty Event") << "empty input for jet algorithm: bypassing..." << std::endl;
     }
-    else if ((int)input.size() >mMaxInputParticles && mMaxInputParticles!=-1){
-      edm::LogWarning ("Input Limit Exceeded") <<"number of input particles exceeds limit of "<<mMaxInputParticles<<" - bypassing..."<<endl;
-    }
     else {
       runAlgorithm (input, &output);
     }
diff --git a/trunk/RecoJets/JetProducers/src/BaseJetProducer.h b/trunk/RecoJets/JetProducers/src/BaseJetProducer.h
index 9e9a247c6f83a..b6759cb8b7e5a 100644
--- a/trunk/RecoJets/JetProducers/src/BaseJetProducer.h
+++ b/trunk/RecoJets/JetProducers/src/BaseJetProducer.h
@@ -42,7 +42,6 @@ namespace cms
     double mEtInputCut;
     double mEInputCut;
     double mJetPtMin;
-    int mMaxInputParticles;
   };
 }