Skip to content

Commit

Permalink
adjustments based on comments from PR
Browse files Browse the repository at this point in the history
  • Loading branch information
mverwe committed Nov 19, 2015
1 parent 4c5d28b commit 7e399e2
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ class HLTPixelActivityHFSumEnergyFilter : public edm::stream::EDFilter<> {
double eMin_HF_;
double offset_;
double slope_;
double maxDiff_;
};

#endif
16 changes: 7 additions & 9 deletions HLTrigger/special/src/HLTPixelActivityHFSumEnergyFilter.cc
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ HLTPixelActivityHFSumEnergyFilter::HLTPixelActivityHFSumEnergyFilter(const edm::
eCut_HF_ (config.getParameter<double>("eCut_HF")),
eMin_HF_ (config.getParameter<double>("eMin_HF")),
offset_ (config.getParameter<double>("offset")),
slope_ (config.getParameter<double>("slope")),
maxDiff_ (config.getParameter<double>("maxDiff"))
slope_ (config.getParameter<double>("slope"))
{
inputToken_ = consumes<edmNew::DetSetVector<SiPixelCluster> >(inputTag_);
HFHitsToken_ = consumes<HFRecHitCollection>(HFHits_);
Expand All @@ -33,10 +32,9 @@ HLTPixelActivityHFSumEnergyFilter::fillDescriptions(edm::ConfigurationDescriptio
desc.add<edm::InputTag>("inputTag",edm::InputTag("hltSiPixelClusters"));
desc.add<edm::InputTag>("HFHitCollection",edm::InputTag("hltHfreco"));
desc.add<double>("eCut_HF",0);
desc.add<double>("eMin_HF",0);
desc.add<double>("offset",0);
desc.add<double>("slope",0);
desc.add<double>("maxDiff",1e-5);
desc.add<double>("eMin_HF",10000.);
desc.add<double>("offset",-1000.);
desc.add<double>("slope",0.5);
descriptions.add("hltPixelActivityHFSumEnergyFilter",desc);
}

Expand Down Expand Up @@ -66,11 +64,11 @@ bool HLTPixelActivityHFSumEnergyFilter::filter(edm::Event& iEvent, const edm::Ev
}
}

bool accept = kFALSE;
bool accept = false;

double thres = offset_ + slope_ * sumE;
double diff = clusterSize - thres;
if(sumE>eMin_HF_ && diff < maxDiff_) accept = kTRUE;
double diff = clusterSize - thres; //diff = clustersize - (correlation line + offset)
if(sumE>eMin_HF_ && diff < 0.) accept = true;

// return with final filter decision
return accept;
Expand Down

0 comments on commit 7e399e2

Please sign in to comment.