New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
PF cluster isolation for muons + TimeCleaned RecHit producer. #6266
Merged
Merged
Changes from all commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
2532077
Merged CMSSW_7_3_X from repository cms-sw
b834b65
rebase the PR in lastest 73X
78aa7bc
move to a template to compute PF isolation for both EGamma and Muons
e32ef6e
migrate to a template HLTGenericFilter
e278503
fix the getting of parameters and the fillDescription from Matteo
c963140
move the energy call in a function depending of the type of template
5481454
revert the standard case and the specialisation in template + improve…
f0404fb
check the type and use recoEcalCandidateProducer as candidate name in…
d2de2b5
if size of hitLabels and productLabels is not 2 then exit with an err…
bc29fd2
remove some lines previouly commented out in the RecoEgamma/EgammaHL…
01f33ae
replate deltaR by deltaR2
1424f36
fix a typo
22447b3
replace the LogError by a Exception
07af0bb
compute only 1 drVeto2
8387cb2
move the check of label size at the begining of the EgammaHLTTimeClea…
dc29ac0
fix a typo for the EGammaCand isolation
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
15 changes: 15 additions & 0 deletions
15
DataFormats/RecoCandidate/interface/RecoChargedCandidateIsolation.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| #ifndef RecoCandidates_RecoChargedCandidateIsolationAssociation_h | ||
| #define RecoCandidates_RecoChargedCandidateIsolationAssociation_h | ||
| // \class RecoChargedCandidateIsolationAssociation | ||
| // | ||
| // \short association of Isolation to a RecoChargedCandidate | ||
| // | ||
|
|
||
| #include "DataFormats/Common/interface/AssociationMap.h" | ||
| #include "DataFormats/RecoCandidate/interface/RecoChargedCandidateFwd.h" | ||
| #include <vector> | ||
|
|
||
| namespace reco { | ||
| typedef edm::AssociationMap<edm::OneToValue<std::vector<reco::RecoChargedCandidate>, float > > RecoChargedCandidateIsolationMap; | ||
| } | ||
| #endif | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| #ifndef HLTGenericFilter_h | ||
| #define HLTGenericFilter_h | ||
|
|
||
| /** \class HLTGenericFilter | ||
| * | ||
| * \author Roberto Covarelli (CERN) | ||
| * | ||
| */ | ||
|
|
||
| #include "HLTrigger/HLTcore/interface/HLTFilter.h" | ||
|
|
||
| #include "FWCore/Framework/interface/Frameworkfwd.h" | ||
| #include "FWCore/Framework/interface/EDProducer.h" | ||
| #include "FWCore/PluginManager/interface/ModuleDef.h" | ||
|
|
||
| #include "FWCore/ParameterSet/interface/ParameterSet.h" | ||
|
|
||
| #include "DataFormats/RecoCandidate/interface/RecoEcalCandidate.h" | ||
| #include "DataFormats/RecoCandidate/interface/RecoEcalCandidateIsolation.h" | ||
|
|
||
| #include "DataFormats/RecoCandidate/interface/RecoChargedCandidate.h" | ||
| #include "DataFormats/RecoCandidate/interface/RecoChargedCandidateIsolation.h" | ||
|
|
||
| #include "DataFormats/HLTReco/interface/TriggerFilterObjectWithRefs.h" | ||
|
|
||
| namespace edm { | ||
| class ConfigurationDescriptions; | ||
| } | ||
|
|
||
| // | ||
| // class declaration | ||
| // | ||
|
|
||
| template<typename T1> | ||
| class HLTGenericFilter : public HLTFilter { | ||
|
|
||
| typedef std::vector<T1> T1Collection; | ||
| typedef edm::Ref<T1Collection> T1Ref; | ||
| typedef edm::AssociationMap<edm::OneToValue<std::vector<T1>, float > > T1IsolationMap; | ||
|
|
||
| public: | ||
| explicit HLTGenericFilter(const edm::ParameterSet&); | ||
| ~HLTGenericFilter(); | ||
| virtual bool hltFilter(edm::Event&, const edm::EventSetup&, trigger::TriggerFilterObjectWithRefs & filterproduct) const override; | ||
| static void fillDescriptions(edm::ConfigurationDescriptions & descriptions); | ||
|
|
||
| private: | ||
|
|
||
| float getEnergy(T1Ref) const; | ||
| float getEt(T1Ref) const; | ||
|
|
||
| edm::InputTag candTag_; // input tag identifying product that contains filtered photons | ||
| edm::InputTag isoTag_; // input tag identifying product that contains isolated map | ||
| edm::InputTag nonIsoTag_; // input tag identifying product that contains non-isolated map | ||
| edm::EDGetTokenT<trigger::TriggerFilterObjectWithRefs> candToken_; | ||
| edm::EDGetTokenT<T1IsolationMap> isoToken_; | ||
| edm::EDGetTokenT<T1IsolationMap> nonIsoToken_; | ||
| bool lessThan_; // the cut is "<" or ">" ? | ||
| bool useEt_; // use E or Et in relative isolation cuts | ||
| double thrRegularEB_; // threshold for regular cut (x < thr) - ECAL barrel | ||
| double thrRegularEE_; // threshold for regular cut (x < thr) - ECAL endcap | ||
| double thrOverEEB_; // threshold for x/E < thr cut (isolations) - ECAL barrel | ||
| double thrOverEEE_; // threshold for x/E < thr cut (isolations) - ECAL endcap | ||
| double thrOverE2EB_; // threshold for x/E^2 < thr cut (isolations) - ECAL barrel | ||
| double thrOverE2EE_; // threshold for x/E^2 < thr cut (isolations) - ECAL endcap | ||
| int ncandcut_; // number of photons required | ||
| bool doIsolated_; | ||
|
|
||
| edm::InputTag L1IsoCollTag_; | ||
| edm::InputTag L1NonIsoCollTag_; | ||
| }; | ||
|
|
||
| #endif //HLTGenericFilter_h | ||
|
|
||
|
|
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(need to understand if AssoMap is needed; comments on the producer to follow)