Skip to content
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

Change track muon dataformats scouting #31962

Merged
merged 40 commits into from
Nov 25, 2020
Merged
Show file tree
Hide file tree
Changes from 33 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
46e3404
added additional track parameters for vertex refitting downstream of …
jsalfeld Oct 28, 2020
641854b
added additional track parameters for vertex refitting downstream of …
jsalfeld Oct 28, 2020
3f9b5d7
fixed bug, int->double
jsalfeld Oct 28, 2020
66992c0
removed std::cout statement
jsalfeld Oct 28, 2020
e292032
clang format
jsalfeld Oct 28, 2020
207b294
add relevant information for electrons and photons
jsalfeld Nov 2, 2020
a48b57b
add relevant information for electrons and photons 2
jsalfeld Nov 2, 2020
ad9ea27
clang
jsalfeld Nov 2, 2020
948a895
Adding muon track vx, vy and vz wrt. reference point in scouting muons
mmasciov Nov 3, 2020
3f1c936
Accessing reco::Muon in HLTScoutingMuonProducer
mmasciov Nov 3, 2020
840ceb0
Getting actual muon type, rather than fixed value
mmasciov Nov 3, 2020
f0de552
Reordering/renaming scouting muon member variables
mmasciov Nov 3, 2020
a66ccc6
add timing information for scouting electrons and photons
jsalfeld Nov 3, 2020
c2706ba
Adding extra reco::Muon information
mmasciov Nov 3, 2020
26a2e09
Adding track hitPattern in HLTScoutingMuonProducer
mmasciov Nov 3, 2020
1aa337e
Cleaning up of HLTScoutingMuonProducer
mmasciov Nov 3, 2020
6f7b5af
Making default descriptions for displaced muons
mmasciov Nov 3, 2020
47bbb97
Clean ScoutingMuon class
mmasciov Nov 3, 2020
87f3a41
Merge pull request #1 from mmasciov/mmasciovScoutingMuonRun3
jsalfeld Nov 3, 2020
83646f6
Change data formats according to scram build code-format
mmasciov Nov 4, 2020
f7f9526
Fixing class versions
mmasciov Nov 4, 2020
72d1243
Merge pull request #2 from mmasciov/mmasciovScoutingMuonRun3Format
jsalfeld Nov 4, 2020
970af69
Fixing i/o rules for backward compatibility in reading old ScoutingMu…
mmasciov Nov 10, 2020
31b05e2
Merge pull request #3 from mmasciov/mmasciovScoutingMuonRun3Format
jsalfeld Nov 10, 2020
c44f90a
changed legacy classes to legacy content, and added Run3Scouting data…
jsalfeld Nov 12, 2020
50db7e9
resolve conflict in class_def
jsalfeld Nov 12, 2020
66d89a2
clang
jsalfeld Nov 12, 2020
67f6c1a
adjust class versions to 3
jsalfeld Nov 12, 2020
b2f64c0
Update DataFormats/Scouting/interface/Run3ScoutingElectron.h
jsalfeld Nov 18, 2020
fb67f00
Update DataFormats/Scouting/interface/Run3ScoutingElectron.h
jsalfeld Nov 18, 2020
6e00f98
Update DataFormats/Scouting/interface/Run3ScoutingMuon.h
jsalfeld Nov 18, 2020
e8d8e7f
Update DataFormats/Scouting/interface/Run3ScoutingMuon.h
jsalfeld Nov 18, 2020
854c878
implement mattis suggestions
jsalfeld Nov 18, 2020
4eb3851
Update DataFormats/Scouting/interface/Run3ScoutingPFJet.h
jsalfeld Nov 19, 2020
e718c67
Update DataFormats/Scouting/interface/Run3ScoutingPhoton.h
jsalfeld Nov 19, 2020
1a42077
fix error in calo topology product retrieval
jsalfeld Nov 20, 2020
980d71f
Merge commit 'refs/pull/31962/head' of https://github.com/cms-sw/cmss…
jsalfeld Nov 20, 2020
a1ef70e
removed cout in /HLTScoutingTrackProducer, improved matrix reading fo…
jsalfeld Nov 24, 2020
b94a3f6
Update HLTrigger/Muon/plugins/HLTScoutingTrackProducer.cc
jsalfeld Nov 24, 2020
16d8138
scouting egamma matrix size corresponds to size of matrix returned by…
jsalfeld Nov 24, 2020
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
1 change: 1 addition & 0 deletions DataFormats/Scouting/BuildFile.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<use name="DataFormats/TrackReco"/>
<use name="DataFormats/Common"/>
<export>
<lib name="1"/>
Expand Down
101 changes: 101 additions & 0 deletions DataFormats/Scouting/interface/Run3ScoutingCaloJet.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
#ifndef DataFormats_Run3ScoutingCaloJet_h
#define DataFormats_Run3ScoutingCaloJet_h

#include <vector>

//class for holding calo jet information, for use in data scouting
//IMPORTANT: the content of this class should be changed only in backwards compatible ways!
class Run3ScoutingCaloJet {
public:
//constructor with values for all data fields
Run3ScoutingCaloJet(float pt,
float eta,
float phi,
float m,
float jetArea,
float maxEInEmTowers,
float maxEInHadTowers,
float hadEnergyInHB,
float hadEnergyInHE,
float hadEnergyInHF,
float emEnergyInEB,
float emEnergyInEE,
float emEnergyInHF,
float towersArea,
float mvaDiscriminator,
float btagDiscriminator)
: pt_(pt),
eta_(eta),
phi_(phi),
m_(m),
jetArea_(jetArea),
maxEInEmTowers_(maxEInEmTowers),
maxEInHadTowers_(maxEInHadTowers),
hadEnergyInHB_(hadEnergyInHB),
hadEnergyInHE_(hadEnergyInHE),
hadEnergyInHF_(hadEnergyInHF),
emEnergyInEB_(emEnergyInEB),
emEnergyInEE_(emEnergyInEE),
emEnergyInHF_(emEnergyInHF),
towersArea_(towersArea),
mvaDiscriminator_(mvaDiscriminator),
btagDiscriminator_(btagDiscriminator) {}
//default constructor
Run3ScoutingCaloJet()
: pt_(0),
eta_(0),
phi_(0),
m_(0),
jetArea_(0),
maxEInEmTowers_(0),
maxEInHadTowers_(0),
hadEnergyInHB_(0),
hadEnergyInHE_(0),
hadEnergyInHF_(0),
emEnergyInEB_(0),
emEnergyInEE_(0),
emEnergyInHF_(0),
towersArea_(0),
mvaDiscriminator_(0),
btagDiscriminator_(0) {}

//accessor functions
float pt() const { return pt_; }
float eta() const { return eta_; }
float phi() const { return phi_; }
float m() const { return m_; }
float jetArea() const { return jetArea_; }
float maxEInEmTowers() const { return maxEInEmTowers_; }
float maxEInHadTowers() const { return maxEInHadTowers_; }
float hadEnergyInHB() const { return hadEnergyInHB_; }
float hadEnergyInHE() const { return hadEnergyInHE_; }
float hadEnergyInHF() const { return hadEnergyInHF_; }
float emEnergyInEB() const { return emEnergyInEB_; }
float emEnergyInEE() const { return emEnergyInEE_; }
float emEnergyInHF() const { return emEnergyInHF_; }
float towersArea() const { return towersArea_; }
float mvaDiscriminator() const { return mvaDiscriminator_; }
float btagDiscriminator() const { return btagDiscriminator_; }

private:
float pt_;
Copy link
Contributor

Choose a reason for hiding this comment

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

Just to note that the repetition in the default constructor could be avoided by declaring the default values already here along

Suggested change
float pt_;
float pt_ = 0;

and defaulting the default constructor

Run3ScoutingCaloJet() = default;

But the current style is also fine.

float eta_;
float phi_;
float m_;
float jetArea_;
float maxEInEmTowers_;
float maxEInHadTowers_;
float hadEnergyInHB_;
float hadEnergyInHE_;
float hadEnergyInHF_;
float emEnergyInEB_;
float emEnergyInEE_;
float emEnergyInHF_;
float towersArea_;
float mvaDiscriminator_;
float btagDiscriminator_;
};

typedef std::vector<Run3ScoutingCaloJet> Run3ScoutingCaloJetCollection;

#endif
129 changes: 129 additions & 0 deletions DataFormats/Scouting/interface/Run3ScoutingElectron.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
#ifndef DataFormats_Run3ScoutingElectron_h
#define DataFormats_Run3ScoutingElectron_h

#include <vector>

// Class for holding electron information, for use in data scouting
// IMPORTANT: the content of this class should be changed only in backwards compatible ways!
class Run3ScoutingElectron {
public:
//constructor with values for all data fields
Run3ScoutingElectron(float pt,
float eta,
float phi,
float m,
float d0,
float dz,
float dEtaIn,
float dPhiIn,
float sigmaIetaIeta,
float hOverE,
float ooEMOop,
int missingHits,
int charge,
float ecalIso,
float hcalIso,
float trackIso,
float r9,
float sMin,
float sMaj,
unsigned int seedId,
std::vector<float> energyMatrix,
std::vector<float> timingMatrix)
: pt_(pt),
eta_(eta),
phi_(phi),
m_(m),
d0_(d0),
dz_(dz),
dEtaIn_(dEtaIn),
dPhiIn_(dPhiIn),
sigmaIetaIeta_(sigmaIetaIeta),
hOverE_(hOverE),
ooEMOop_(ooEMOop),
missingHits_(missingHits),
charge_(charge),
ecalIso_(ecalIso),
hcalIso_(hcalIso),
trackIso_(trackIso),
r9_(r9),
sMin_(sMin),
sMaj_(sMaj),
seedId_(seedId),
energyMatrix_(std::move(energyMatrix)),
timingMatrix_(std::move(timingMatrix)) {}
//default constructor
Run3ScoutingElectron()
: pt_(0),
eta_(0),
phi_(0),
m_(0),
d0_(0),
dz_(0),
dEtaIn_(0),
dPhiIn_(0),
sigmaIetaIeta_(0),
hOverE_(0),
ooEMOop_(0),
missingHits_(0),
charge_(0),
ecalIso_(0),
hcalIso_(0),
trackIso_(0),
r9_(0),
sMin_(0),
sMaj_(0),
seedId_(0) {}

//accessor functions
float pt() const { return pt_; }
float eta() const { return eta_; }
float phi() const { return phi_; }
float m() const { return m_; }
float d0() const { return d0_; }
float dz() const { return dz_; }
float dEtaIn() const { return dEtaIn_; }
float dPhiIn() const { return dPhiIn_; }
float sigmaIetaIeta() const { return sigmaIetaIeta_; }
float hOverE() const { return hOverE_; }
float ooEMOop() const { return ooEMOop_; }
int missingHits() const { return missingHits_; }
int charge() const { return charge_; }
float ecalIso() const { return ecalIso_; }
float hcalIso() const { return hcalIso_; }
float trackIso() const { return trackIso_; }
float r9() const { return r9_; }
float sMin() const { return sMin_; }
float sMaj() const { return sMaj_; }
unsigned int seedId() const { return seedId_; }
std::vector<float> const& energyMatrix() const { return energyMatrix_; }
std::vector<float> const& timingMatrix() const { return timingMatrix_; }

private:
float pt_;
float eta_;
float phi_;
float m_;
float d0_;
float dz_;
float dEtaIn_;
float dPhiIn_;
float sigmaIetaIeta_;
float hOverE_;
float ooEMOop_;
int missingHits_;
int charge_;
float ecalIso_;
float hcalIso_;
float trackIso_;
float r9_;
float sMin_;
float sMaj_;
unsigned int seedId_;
std::vector<float> energyMatrix_;
std::vector<float> timingMatrix_;
};

typedef std::vector<Run3ScoutingElectron> Run3ScoutingElectronCollection;

#endif
Loading