Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 46367
b: "refs/heads/CMSSW_7_1_X"
c: 1042d12
h: "refs/heads/CMSSW_7_1_X"
i:
  46365: 8d78441
  46363: ba855e4
  46359: 32b275f
  46351: f1939cf
  46335: 0d68e0c
v: v3
  • Loading branch information
Andreas Oehler committed Jun 23, 2008
1 parent ab9c621 commit 6daa22e
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
---
refs/heads/gh-pages: ac155dadd83efa75cad55c0508a57a2b9dd3d66c
"refs/heads/CMSSW_7_1_X": 025f3c6215e01f239b73a7d8cca03200d043b855
"refs/heads/CMSSW_7_1_X": 1042d12e5c2d617e4aebc825add8f2fbea643772
6 changes: 1 addition & 5 deletions trunk/RecoJets/JetProducers/src/BaseJetProducer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down Expand Up @@ -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);
}
Expand Down
1 change: 0 additions & 1 deletion trunk/RecoJets/JetProducers/src/BaseJetProducer.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ namespace cms
double mEtInputCut;
double mEInputCut;
double mJetPtMin;
int mMaxInputParticles;
};
}

Expand Down

0 comments on commit 6daa22e

Please sign in to comment.