forked from cms-sw/cmssw
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Cmssw 11 0 x tau pog restructure tau id format rebased (cms-sw#133)
* enable alternative output data types in TauDiscriminationProducerBase and create one * add class dictionaries * add template argument for input type of TauDiscriminationProducerBase * change RecoTauDiscriminantCutMultiplexer to write all WPs into one dataformat * update configs * adapt PAT Tau Producer to new reco Tau Discriminator format * fix handling of config inputs and clean up * fix expected input type * special treatment of taus that failed prediscriminant during reco production * pipe through discr raw value even if no category found * small fix in PAT Tau ID config * fix tau ID indexing * reenable usage of preDiscriminantFailValue in TauDiscriminationProducerBase * update TauTagValidation * update event content config * adapt switchMVAtoDB_cfi * fix typo * store vector of rawValues in TauDiscriminatorContainer * use new dataformat in discriminator raw value production * install new dataformat in anti muon discriminator * adapt PFRecoTauDiscriminationByIsolation to new data format * add new data format for PAT tau discriminators * prepare tau ID producer base for new data format with pat taus * merge ID cut multiplexer for reco and pat taus into a templated version * switch from double to float for raw values in new data format * add IDname to fillDescriptions of cut based IDs * remove depracated cut based IDs and rearrange inheritance chain in configs accordingly * add fillDescription defaults to cut based ID definitions * move photonPtSumOutsideSignalCone options to WP configs * add IDname parameter to AntiMuonDiscr fillDescr * some fixes at producer level * update reco configs * switch back to usage of category float only if needed * update PAT step and apply some fixes * introduce new data format in remaining ID producers operating on MiniAOD * enable PATTauIDEmbedder to process new data format * adapt configs of ID producers running on MiniAOD to new data format * update data format in remaining external modules * fix antiEleID rebase * change name of Tau ID Container Base Class * fix some issues revealed by the matrix tests * move deepTauID to new data format * complete adaptation of deepTau config and HLT related things, clean up * complete previous rebase * make PAT ID mapping sensitive to input tag instance * fix typo
- Loading branch information
swozniewski
committed
Feb 23, 2020
1 parent
7ab5197
commit 19a2c0c
Showing
67 changed files
with
3,052 additions
and
2,596 deletions.
There are no files selected for viewing
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 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 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 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 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 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
37 changes: 37 additions & 0 deletions
37
DataFormats/PatCandidates/interface/PATTauDiscriminatorContainer.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,37 @@ | ||
| #ifndef DataFormats_PatCandidates_PATTauDiscriminatorContainer_h | ||
| #define DataFormats_PatCandidates_PATTauDiscriminatorContainer_h | ||
| #include "DataFormats/Common/interface/AssociationVector.h" | ||
| #include "DataFormats/Common/interface/RefProd.h" | ||
| #include "DataFormats/PatCandidates/interface/Tau.h" | ||
|
|
||
| #include <vector> | ||
|
|
||
| namespace pat { | ||
| struct PATSingleTauDiscriminatorContainer { | ||
| std::vector<float> rawValues; | ||
| std::vector<bool> workingPoints; | ||
| operator float() const { return rawValues.at(0); } | ||
|
|
||
| PATSingleTauDiscriminatorContainer(){} | ||
| PATSingleTauDiscriminatorContainer(float rawInit){ rawValues.push_back(rawInit); } | ||
| }; | ||
|
|
||
| typedef edm::AssociationVector<pat::TauRefProd,std::vector<PATSingleTauDiscriminatorContainer> > PATTauDiscriminatorContainerBase; | ||
|
|
||
| class PATTauDiscriminatorContainer : public PATTauDiscriminatorContainerBase { | ||
| public: | ||
| /// empty constructor | ||
| PATTauDiscriminatorContainer(); // : PATTauDiscriminatorContainerBase() {} | ||
| /// constructor from reference to pat::Tau | ||
| PATTauDiscriminatorContainer(const pat::TauRefProd & ref) : PATTauDiscriminatorContainerBase(ref) {} | ||
| /// constructor from base object | ||
| PATTauDiscriminatorContainer(const PATTauDiscriminatorContainerBase &v) : PATTauDiscriminatorContainerBase(v) {} | ||
| }; | ||
|
|
||
| typedef pat::PATTauDiscriminatorContainer::value_type PATTauDiscriminatorContainerVT; | ||
| typedef edm::Ref<pat::PATTauDiscriminatorContainer> PATTauDiscriminatorContainerRef; | ||
| typedef edm::RefProd<pat::PATTauDiscriminatorContainer> PATTauDiscriminatorContainerRefProd; | ||
| typedef edm::RefVector<pat::PATTauDiscriminatorContainer> PATTauDiscriminatorContainerRefVector; | ||
| } | ||
|
|
||
| #endif |
3 changes: 3 additions & 0 deletions
3
DataFormats/PatCandidates/src/PATTauDiscriminatorContainer.cc
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,3 @@ | ||
| #include "DataFormats/PatCandidates/interface/PATTauDiscriminatorContainer.h" | ||
|
|
||
| pat::PATTauDiscriminatorContainer::PATTauDiscriminatorContainer() : PATTauDiscriminatorContainerBase() {}; |
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
41 changes: 41 additions & 0 deletions
41
DataFormats/TauReco/interface/PFTauDiscriminatorContainer.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,41 @@ | ||
| #ifndef DataFormats_TauReco_PFTauDiscriminatorContainer_h | ||
| #define DataFormats_TauReco_PFTauDiscriminatorContainer_h | ||
| #include "DataFormats/Common/interface/AssociationVector.h" | ||
| #include "DataFormats/Common/interface/RefProd.h" | ||
| #include "DataFormats/TauReco/interface/PFTau.h" | ||
|
|
||
| #include <vector> | ||
|
|
||
| namespace reco { | ||
| struct PFSingleTauDiscriminatorContainer { | ||
| std::vector<float> rawValues; | ||
| std::vector<bool> workingPoints; | ||
| operator float() const { return rawValues.at(0); } | ||
|
|
||
| PFSingleTauDiscriminatorContainer(){} | ||
| PFSingleTauDiscriminatorContainer(float rawInit){ rawValues.push_back(rawInit); } | ||
| }; | ||
|
|
||
| typedef edm::AssociationVector<PFTauRefProd,std::vector<PFSingleTauDiscriminatorContainer> > PFTauDiscriminatorContainerBase; | ||
|
|
||
| class PFTauDiscriminatorContainer : public PFTauDiscriminatorContainerBase { | ||
| public: | ||
| PFTauDiscriminatorContainer() : | ||
| PFTauDiscriminatorContainerBase() | ||
| { } | ||
|
|
||
| PFTauDiscriminatorContainer(const reco::PFTauRefProd & ref) : | ||
| PFTauDiscriminatorContainerBase(ref) | ||
| { } | ||
|
|
||
| PFTauDiscriminatorContainer(const PFTauDiscriminatorContainerBase &v) : | ||
| PFTauDiscriminatorContainerBase(v) | ||
| { } | ||
| }; | ||
|
|
||
| typedef PFTauDiscriminatorContainer::value_type PFTauDiscriminatorContainerVT; | ||
| typedef edm::Ref<PFTauDiscriminatorContainer> PFTauDiscriminatorContainerRef; | ||
| typedef edm::RefProd<PFTauDiscriminatorContainer> PFTauDiscriminatorContainerRefProd; | ||
| typedef edm::RefVector<PFTauDiscriminatorContainer> PFTauDiscriminatorContainerRefVector; | ||
| } | ||
| #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
Oops, something went wrong.