Skip to content

Commit

Permalink
Merge pull request #27233 from cms-sw/code-format-reconstruction-cd073e
Browse files Browse the repository at this point in the history
Running code-format for reconstruction
  • Loading branch information
cmsbuild committed Jun 18, 2019
2 parents d8dd6e5 + ce037c1 commit 163635c
Show file tree
Hide file tree
Showing 27 changed files with 1,996 additions and 2,212 deletions.
448 changes: 219 additions & 229 deletions DataFormats/EgammaCandidates/interface/Conversion.h 100755 → 100644

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion DataFormats/EgammaCandidates/interface/ConversionFwd.h 100755 → 100644
Expand Up @@ -22,6 +22,6 @@ namespace reco {

/// iterator over a vector of reference to Conversion objects
typedef ConversionRefVector::iterator c_iterator;
}
} // namespace reco

#endif
21 changes: 11 additions & 10 deletions DataFormats/EgammaCandidates/interface/Electron.h
Expand Up @@ -16,32 +16,33 @@ namespace reco {
class Electron : public RecoCandidate {
public:
/// default constructor
Electron() : RecoCandidate() { }
Electron() : RecoCandidate() {}
/// constructor from values
Electron( Charge q, const LorentzVector & p4, const Point & vtx = Point( 0, 0, 0 ) ) :
RecoCandidate( q, p4, vtx, -11 * q ) { }
Electron(Charge q, const LorentzVector& p4, const Point& vtx = Point(0, 0, 0))
: RecoCandidate(q, p4, vtx, -11 * q) {}
/// destructor
~Electron() override;
/// returns a clone of the candidate
Electron * clone() const override;
Electron* clone() const override;
/// reference to a Track
using reco::RecoCandidate::track ; // avoid hiding the base
using reco::RecoCandidate::track; // avoid hiding the base
reco::TrackRef track() const override;
/// reference to a SuperCluster
reco::SuperClusterRef superCluster() const override;
/// reference to a GsfTrack
reco::GsfTrackRef gsfTrack() const override;
/// set refrence to Photon component
void setSuperCluster( const reco::SuperClusterRef & r ) { superCluster_ = r; }
void setSuperCluster(const reco::SuperClusterRef& r) { superCluster_ = r; }
/// set refrence to Track component
void setTrack( const reco::TrackRef & r ) { track_ = r; }
void setTrack(const reco::TrackRef& r) { track_ = r; }
/// set reference to GsfTrack component
void setGsfTrack( const reco::GsfTrackRef & r ) { gsfTrack_ = r; }
void setGsfTrack(const reco::GsfTrackRef& r) { gsfTrack_ = r; }

bool isElectron() const override;

private:
/// check overlap with another candidate
bool overlap( const Candidate & ) const override;
bool overlap(const Candidate&) const override;
/// reference to a SuperCluster
reco::SuperClusterRef superCluster_;
/// reference to a Track
Expand All @@ -50,6 +51,6 @@ namespace reco {
reco::GsfTrackRef gsfTrack_;
};

}
} // namespace reco

#endif
2 changes: 1 addition & 1 deletion DataFormats/EgammaCandidates/interface/ElectronFwd.h
Expand Up @@ -22,6 +22,6 @@ namespace reco {

/// iterator over a vector of reference to Electron objects
typedef ElectronRefVector::iterator electron_iterator;
}
} // namespace reco

#endif
@@ -1,15 +1,15 @@
#ifndef EgammaCandidates_ElectronIsolationAssociation_h
#define EgammaCandidates_ElectronIsolationAssociation_h
// \class ElectronIsolationAssociation
//
//
// \short association of Isolation to an Electron
//

#include "DataFormats/Common/interface/AssociationMap.h"
#include "DataFormats/EgammaCandidates/interface/ElectronFwd.h"
#include "DataFormats/EgammaCandidates/interface/ElectronFwd.h"
#include <vector>

namespace reco {
typedef edm::AssociationMap<edm::OneToValue<std::vector<reco::Electron>, float > > ElectronIsolationMap;
typedef edm::AssociationMap<edm::OneToValue<std::vector<reco::Electron>, float> > ElectronIsolationMap;
}
#endif

0 comments on commit 163635c

Please sign in to comment.