Skip to content

move JetMatching package from SimDataFormats into DataFormats #33189

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.

Sign up for GitHub

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

Merged
cmsbuild merged 3 commits into from
Mar 23, 2021
Merged

move JetMatching package from SimDataFormats into DataFormats #33189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b4cf062
mv JetMatching package into DataFormats
davidlange6 Mar 16, 2021
ae04659
fix include guards
davidlange6 Mar 16, 2021
04a1e0b
code checks
davidlange6 Mar 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 SimDataFormats/JetMatching/BuildFile.xml → DataFormats/JetMatching/BuildFile.xml
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...ormats/JetMatching/interface/JetFlavour.h → ...ormats/JetMatching/interface/JetFlavour.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef SimDataFormats_JetMatching_JetFlavour_H
#define SimDataFormats_JetMatching_JetFlavour_H
#ifndef DataFormats_JetMatching_JetFlavour_H
#define DataFormats_JetMatching_JetFlavour_H

#include <vector>
#include "DataFormats/Math/interface/Point3D.h"
Expand Down
6 changes: 3 additions & 3 deletions ...ts/JetMatching/interface/JetFlavourInfo.h → ...ts/JetMatching/interface/JetFlavourInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#ifndef SimDataFormats_JetMatching_JetFlavourInfo_H
#define SimDataFormats_JetMatching_JetFlavourInfo_H
#ifndef DataFormats_JetMatching_JetFlavourInfo_H
#define DataFormats_JetMatching_JetFlavourInfo_H

#include <vector>
#include "DataFormats/HepMCCandidate/interface/GenParticle.h"
#include "DataFormats/HepMCCandidate/interface/GenParticleFwd.h"

namespace reco {
/**\class JetFlavourInfo JetFlavourInfo.h SimDataFormats/JetMatching/interface/JetFlavourInfo.h
/**\class JetFlavourInfo JetFlavourInfo.h DataFormats/JetMatching/interface/JetFlavourInfo.h
* \brief Class storing the jet flavour information
*
* JetFlavourInfo class stores the jet flavour information based on hadrons
Expand Down
8 changes: 4 additions & 4 deletions ...tching/interface/JetFlavourInfoMatching.h → ...tching/interface/JetFlavourInfoMatching.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#ifndef SimDataFormats_JetMatching_JetFlavourInfoMatching_h
#define SimDataFormats_JetMatching_JetFlavourInfoMatching_h
#ifndef DataFormats_JetMatching_JetFlavourInfoMatching_h
#define DataFormats_JetMatching_JetFlavourInfoMatching_h

#include "DataFormats/JetReco/interface/CaloJetCollection.h"
#include "DataFormats/Common/interface/AssociationVector.h"
#include "DataFormats/Common/interface/RefToBaseProd.h"
#include "SimDataFormats/JetMatching/interface/JetFlavourInfo.h"
#include "DataFormats/JetMatching/interface/JetFlavourInfo.h"
Copy link
Contributor

@slava77 slava77 Mar 16, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it would be nice to update the include guards as well, s/SimDataFormats_/DataFormats_/ (this applies to all files in this moved package)

Copy link
Contributor Author

@davidlange6 davidlange6 Mar 16, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry I missed those. Fixed.

#include <vector>

namespace reco {
Expand Down Expand Up @@ -33,4 +33,4 @@ namespace reco {

} // namespace reco

#endif // SimDataFormats_JetMatching_JetFlavourInfoMatching_h
#endif // DataFormats_JetMatching_JetFlavourInfoMatching_h
8 changes: 4 additions & 4 deletions ...etMatching/interface/JetFlavourMatching.h → ...etMatching/interface/JetFlavourMatching.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#ifndef SimDataFormats_JetMatching_JetFlavourMatching_h
#define SimDataFormats_JetMatching_JetFlavourMatching_h
#ifndef DataFormats_JetMatching_JetFlavourMatching_h
#define DataFormats_JetMatching_JetFlavourMatching_h

#include "DataFormats/JetReco/interface/CaloJetCollection.h"
#include "DataFormats/Common/interface/AssociationVector.h"
#include "DataFormats/Common/interface/RefToBaseProd.h"
#include "SimDataFormats/JetMatching/interface/JetFlavour.h"
#include "DataFormats/JetMatching/interface/JetFlavour.h"
#include <vector>

namespace reco {
Expand Down Expand Up @@ -32,4 +32,4 @@ namespace reco {

} // namespace reco

#endif // SimDataFormats_JetMatching_JetFlavourMatching_h
#endif // DataFormats_JetMatching_JetFlavourMatching_h
8 changes: 4 additions & 4 deletions ...JetMatching/interface/JetMatchedPartons.h → ...JetMatching/interface/JetMatchedPartons.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#ifndef SimDataFormats_JetMatching_JetMatchedPartons_h
#define SimDataFormats_JetMatching_JetMatchedPartons_h
#ifndef DataFormats_JetMatching_JetMatchedPartons_h
#define DataFormats_JetMatching_JetMatchedPartons_h

#include "DataFormats/JetReco/interface/CaloJetCollection.h"
#include "DataFormats/Common/interface/AssociationVector.h"
#include "DataFormats/Common/interface/RefToBaseProd.h"
#include "SimDataFormats/JetMatching/interface/MatchedPartons.h"
#include "DataFormats/JetMatching/interface/MatchedPartons.h"
#include <vector>

namespace reco {
Expand Down Expand Up @@ -32,4 +32,4 @@ namespace reco {

} // namespace reco

#endif // SimDataFormats_JetMatching_JetMatchedPartons_h
#endif // DataFormats_JetMatching_JetMatchedPartons_h
0 ...ts/JetMatching/interface/MatchedPartons.h → ...ts/JetMatching/interface/MatchedPartons.h
View file
Open in desktop
File renamed without changes.
10 changes: 10 additions & 0 deletions DataFormats/JetMatching/src/classes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#include <utility>
#include <vector>

#include "DataFormats/Common/interface/Wrapper.h"
#include "DataFormats/JetMatching/interface/JetFlavourInfo.h"
#include "DataFormats/JetMatching/interface/JetFlavourInfoMatching.h"
#include "DataFormats/JetMatching/interface/JetFlavour.h"
#include "DataFormats/JetMatching/interface/JetFlavourMatching.h"
#include "DataFormats/JetMatching/interface/MatchedPartons.h"
#include "DataFormats/JetMatching/interface/JetMatchedPartons.h"
0 ...taFormats/JetMatching/src/classes_def.xml → DataFormats/JetMatching/src/classes_def.xml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion DataFormats/PatCandidates/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<use name="DataFormats/HLTReco"/>
<use name="DataFormats/CaloTowers"/>
<use name="DataFormats/EcalRecHit"/>
<use name="SimDataFormats/JetMatching"/>
<use name="DataFormats/JetMatching"/>
<use name="DataFormats/CLHEP"/>
<use name="DataFormats/EgammaReco"/>
<use name="DataFormats/GeometryCommonDetAlgo"/>
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/PatCandidates/interface/Jet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#include "DataFormats/BTauReco/interface/TrackCountingTagInfo.h"
#include "DataFormats/BTauReco/interface/CandSoftLeptonTagInfo.h"
#include "DataFormats/BTauReco/interface/SoftLeptonTagInfo.h"
#include "SimDataFormats/JetMatching/interface/JetFlavourInfo.h"
#include "DataFormats/JetMatching/interface/JetFlavourInfo.h"
#include "DataFormats/BTauReco/interface/PixelClusterTagInfo.h"
#include "DataFormats/BTauReco/interface/CandSecondaryVertexTagInfo.h"
#include "DataFormats/BTauReco/interface/SecondaryVertexTagInfo.h"
Expand Down
2 changes: 1 addition & 1 deletion HLTriggerOffline/Btag/interface/HLTBTagPerformanceAnalyzer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include <DQMServices/Core/interface/DQMEDAnalyzer.h>

// for gen matching
#include "SimDataFormats/JetMatching/interface/JetFlavourMatching.h"
#include "DataFormats/JetMatching/interface/JetFlavourMatching.h"
#include <Math/GenVector/VectorUtil.h>

#include "FWCore/Utilities/interface/transform.h"
Expand Down
4 changes: 2 additions & 2 deletions PhysicsTools/JetCharge/test/JetChargeAnalyzer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#include "DataFormats/JetReco/interface/Jet.h"
#include "DataFormats/JetReco/interface/JetFloatAssociation.h"

#include "SimDataFormats/JetMatching/interface/JetFlavour.h"
#include "SimDataFormats/JetMatching/interface/JetFlavourMatching.h"
#include "DataFormats/JetMatching/interface/JetFlavour.h"
#include "DataFormats/JetMatching/interface/JetFlavourMatching.h"

//#include "RecoBTag/MCTools/interface/JetFlavourIdentifier.h"

Expand Down
4 changes: 2 additions & 2 deletions PhysicsTools/JetExamples/test/printGenJetRatio.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
#include "DataFormats/JetReco/interface/JetFloatAssociation.h"
#include "DataFormats/Common/interface/Ref.h"

#include "SimDataFormats/JetMatching/interface/JetFlavour.h"
#include "SimDataFormats/JetMatching/interface/JetFlavourMatching.h"
#include "DataFormats/JetMatching/interface/JetFlavour.h"
#include "DataFormats/JetMatching/interface/JetFlavourMatching.h"

class printGenJetRatio : public edm::EDAnalyzer {
public:
Expand Down
8 changes: 4 additions & 4 deletions PhysicsTools/JetExamples/test/printJetFlavour.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
#include "DataFormats/Common/interface/Ref.h"
#include "DataFormats/Common/interface/getRef.h"

#include "SimDataFormats/JetMatching/interface/JetFlavour.h"
#include "SimDataFormats/JetMatching/interface/JetFlavourMatching.h"
#include "SimDataFormats/JetMatching/interface/MatchedPartons.h"
#include "SimDataFormats/JetMatching/interface/JetMatchedPartons.h"
#include "DataFormats/JetMatching/interface/JetFlavour.h"
#include "DataFormats/JetMatching/interface/JetFlavourMatching.h"
#include "DataFormats/JetMatching/interface/MatchedPartons.h"
#include "DataFormats/JetMatching/interface/JetMatchedPartons.h"

// system include files
#include <memory>
Expand Down
4 changes: 2 additions & 2 deletions PhysicsTools/JetExamples/test/printJetFlavourInfo.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
#include "FWCore/ParameterSet/interface/ParameterSet.h"

#include "DataFormats/JetReco/interface/Jet.h"
#include "SimDataFormats/JetMatching/interface/JetFlavourInfo.h"
#include "SimDataFormats/JetMatching/interface/JetFlavourInfoMatching.h"
#include "DataFormats/JetMatching/interface/JetFlavourInfo.h"
#include "DataFormats/JetMatching/interface/JetFlavourInfoMatching.h"

#include "DataFormats/Math/interface/deltaR.h"

Expand Down
2 changes: 2 additions & 0 deletions PhysicsTools/JetMCAlgos/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<use name="PhysicsTools/JetMCUtils"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/HepMCCandidate"/>
<export>
<lib name="1"/>
</export>
10 changes: 10 additions & 0 deletions PhysicsTools/JetMCAlgos/plugins/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,16 @@
<use name="SimDataFormats/JetMatching"/>
<use name="SimDataFormats/GeneratorProducts"/>
<use name="DataFormats/HepMCCandidate"/>
<use name="CommonTools/CandUtils"/>
<use name="CommonTools/UtilAlgos"/>
<use name="DataFormats/Candidate"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/JetReco"/>
<use name="DataFormats/Math"/>
<use name="DataFormats/ParticleFlowCandidate"/>
<use name="FWCore/Common"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/Utilities"/>
<use name="fastjet"/>
<library file="*.cc" name="PhysicsToolsJetMCAlgosPlugins">
</library>
7 changes: 4 additions & 3 deletions PhysicsTools/JetMCAlgos/plugins/GenHFHadronMatcher.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
#include "DataFormats/JetReco/interface/Jet.h"
#include "DataFormats/Math/interface/deltaR.h"

#include "SimDataFormats/JetMatching/interface/JetFlavourInfoMatching.h"
#include "DataFormats/JetMatching/interface/JetFlavourInfoMatching.h"

//
// class declaration
Expand Down Expand Up @@ -320,8 +320,9 @@ std::vector<int> GenHFHadronMatcher::findHadronJets(const reco::GenParticleColle
reco::JetFlavourInfo jetInfo = i_info->second;
const int jetIndex = i_info - jetFlavourInfos->begin();
// Looping over each hadron associated with the jet and finding its origin
const reco::GenParticleRefVector &hadronsInJet =
flavour_ == 5 ? jetInfo.getbHadrons() : flavour_ == 4 ? jetInfo.getcHadrons() : reco::GenParticleRefVector();
const reco::GenParticleRefVector &hadronsInJet = flavour_ == 5 ? jetInfo.getbHadrons()
: flavour_ == 4 ? jetInfo.getcHadrons()
: reco::GenParticleRefVector();
for (reco::GenParticleRefVector::const_iterator hadron = hadronsInJet.begin(); hadron != hadronsInJet.end();
++hadron) {
// Check that the hadron satisfies criteria configured in the module
Expand Down
2 changes: 1 addition & 1 deletion PhysicsTools/JetMCAlgos/plugins/GenJetBCEnergyRatio.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#include "DataFormats/JetReco/interface/Jet.h"
#include "DataFormats/JetReco/interface/GenJetCollection.h"
#include "SimDataFormats/JetMatching/interface/JetFlavour.h"
#include "DataFormats/JetMatching/interface/JetFlavour.h"

#include "DataFormats/Common/interface/Ref.h"
#include "DataFormats/Candidate/interface/Candidate.h"
Expand Down
4 changes: 2 additions & 2 deletions PhysicsTools/JetMCAlgos/plugins/JetFlavourClustering.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@

#include "DataFormats/JetReco/interface/Jet.h"
#include "DataFormats/JetReco/interface/JetCollection.h"
#include "SimDataFormats/JetMatching/interface/JetFlavourInfo.h"
#include "SimDataFormats/JetMatching/interface/JetFlavourInfoMatching.h"
#include "DataFormats/JetMatching/interface/JetFlavourInfo.h"
#include "DataFormats/JetMatching/interface/JetFlavourInfoMatching.h"
#include "DataFormats/HepMCCandidate/interface/GenParticle.h"
#include "DataFormats/HepMCCandidate/interface/GenParticleFwd.h"
#include "DataFormats/Math/interface/deltaR.h"
Expand Down
8 changes: 4 additions & 4 deletions PhysicsTools/JetMCAlgos/plugins/JetFlavourIdentifier.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@
#include "DataFormats/JetReco/interface/Jet.h"
#include "DataFormats/JetReco/interface/JetCollection.h"
#include "DataFormats/JetReco/interface/CaloJetCollection.h"
#include "SimDataFormats/JetMatching/interface/JetFlavour.h"
#include "SimDataFormats/JetMatching/interface/JetFlavourMatching.h"
#include "SimDataFormats/JetMatching/interface/MatchedPartons.h"
#include "SimDataFormats/JetMatching/interface/JetMatchedPartons.h"
#include "DataFormats/JetMatching/interface/JetFlavour.h"
#include "DataFormats/JetMatching/interface/JetFlavourMatching.h"
#include "DataFormats/JetMatching/interface/MatchedPartons.h"
#include "DataFormats/JetMatching/interface/JetMatchedPartons.h"

#include "DataFormats/Common/interface/Ref.h"
#include "DataFormats/Candidate/interface/Candidate.h"
Expand Down
8 changes: 4 additions & 4 deletions PhysicsTools/JetMCAlgos/plugins/JetPartonMatcher.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@
#include "DataFormats/JetReco/interface/Jet.h"
#include "DataFormats/JetReco/interface/JetCollection.h"
#include "DataFormats/JetReco/interface/CaloJetCollection.h"
#include "SimDataFormats/JetMatching/interface/JetFlavour.h"
#include "SimDataFormats/JetMatching/interface/JetFlavourMatching.h"
#include "SimDataFormats/JetMatching/interface/MatchedPartons.h"
#include "SimDataFormats/JetMatching/interface/JetMatchedPartons.h"
#include "DataFormats/JetMatching/interface/JetFlavour.h"
#include "DataFormats/JetMatching/interface/JetFlavourMatching.h"
#include "DataFormats/JetMatching/interface/MatchedPartons.h"
#include "DataFormats/JetMatching/interface/JetMatchedPartons.h"

#include "DataFormats/Common/interface/View.h"
#include "DataFormats/Common/interface/Ref.h"
Expand Down
4 changes: 2 additions & 2 deletions PhysicsTools/NanoAOD/plugins/GenJetFlavourTableProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"

#include "DataFormats/JetReco/interface/GenJet.h"
#include "SimDataFormats/JetMatching/interface/JetFlavourInfo.h"
#include "SimDataFormats/JetMatching/interface/JetFlavourInfoMatching.h"
#include "DataFormats/JetMatching/interface/JetFlavourInfo.h"
#include "DataFormats/JetMatching/interface/JetFlavourInfoMatching.h"
#include "DataFormats/Math/interface/deltaR.h"

#include "DataFormats/NanoAOD/interface/FlatTable.h"
Expand Down
4 changes: 2 additions & 2 deletions PhysicsTools/PatAlgos/plugins/GenJetFlavourInfoPreserver.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

#include "DataFormats/JetReco/interface/Jet.h"
#include "DataFormats/JetReco/interface/JetCollection.h"
#include "SimDataFormats/JetMatching/interface/JetFlavourInfo.h"
#include "SimDataFormats/JetMatching/interface/JetFlavourInfoMatching.h"
#include "DataFormats/JetMatching/interface/JetFlavourInfo.h"
#include "DataFormats/JetMatching/interface/JetFlavourInfoMatching.h"

#include "DataFormats/JetReco/interface/GenJet.h"
#include "DataFormats/JetReco/interface/GenJetCollection.h"
Expand Down
4 changes: 2 additions & 2 deletions PhysicsTools/PatAlgos/plugins/PATJetProducer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
#include "FWCore/Utilities/interface/InputTag.h"
#include "DataFormats/Common/interface/View.h"

#include "SimDataFormats/JetMatching/interface/JetFlavourMatching.h"
#include "SimDataFormats/JetMatching/interface/JetFlavourInfoMatching.h"
#include "DataFormats/JetMatching/interface/JetFlavourMatching.h"
#include "DataFormats/JetMatching/interface/JetFlavourInfoMatching.h"

#include "CommonTools/Utils/interface/PtComparator.h"

Expand Down
8 changes: 4 additions & 4 deletions RecoJets/JetAnalyzers/src/CalcTopMassExample.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
#include "DataFormats/Common/interface/Ref.h"
#include "DataFormats/Common/interface/getRef.h"

#include "SimDataFormats/JetMatching/interface/JetFlavour.h"
#include "SimDataFormats/JetMatching/interface/JetFlavourMatching.h"
#include "SimDataFormats/JetMatching/interface/MatchedPartons.h"
#include "SimDataFormats/JetMatching/interface/JetMatchedPartons.h"
#include "DataFormats/JetMatching/interface/JetFlavour.h"
#include "DataFormats/JetMatching/interface/JetFlavourMatching.h"
#include "DataFormats/JetMatching/interface/MatchedPartons.h"
#include "DataFormats/JetMatching/interface/JetMatchedPartons.h"

#include "CommonTools/UtilAlgos/interface/TFileService.h"

Expand Down
10 changes: 0 additions & 10 deletions SimDataFormats/JetMatching/src/classes.h
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions Validation/RecoB/plugins/BTagPerformanceAnalyzerMC.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "JetMETCorrections/JetCorrector/interface/JetCorrector.h"
#include "SimDataFormats/GeneratorProducts/interface/GenEventInfoProduct.h"
#include "SimDataFormats/JetMatching/interface/JetFlavour.h"
#include "SimDataFormats/JetMatching/interface/JetFlavourInfo.h"
#include "SimDataFormats/JetMatching/interface/JetFlavourInfoMatching.h"
#include "SimDataFormats/JetMatching/interface/JetFlavourMatching.h"
#include "DataFormats/JetMatching/interface/JetFlavour.h"
#include "DataFormats/JetMatching/interface/JetFlavourInfo.h"
#include "DataFormats/JetMatching/interface/JetFlavourInfoMatching.h"
#include "DataFormats/JetMatching/interface/JetFlavourMatching.h"
/** \class BTagPerformanceAnalyzerMC
*
* Top level steering routine for b tag performance analysis.
Expand Down