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.

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

Jump to bottom

Running code-format for reconstruction #27075

Merged
merged 4 commits into from Jun 6, 2019
Merged

Running code-format for reconstruction #27075

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6492b4d
Clang-Format
cmsbuild Jun 3, 2019
048c870
turn off clang-format for selected region
smuzaffar Jun 5, 2019
0bc0bfb
reorder the comments to avoid ugly clang-formats
smuzaffar Jun 5, 2019
899c213
applied the code-formats changes
smuzaffar Jun 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
76 changes: 40 additions & 36 deletions DataFormats/EgammaTrackReco/interface/ConversionTrack.h
View file
Open in desktop
Expand Up @@ -15,43 +15,47 @@

#include "DataFormats/TrackReco/interface/TrackFwd.h"
class Trajectory;
namespace reco
{
class ConversionTrack
{
public:
ConversionTrack() : isTrackerOnly_(false), isGsfTrackOpen_(false), isArbitratedEcalSeeded_(false), isArbitratedMerged_(false),
isArbitratedMergedEcalGeneral_(false) {}
ConversionTrack(const TrackBaseRef &trk) :
track_(trk), isTrackerOnly_(false),isGsfTrackOpen_(false), isArbitratedEcalSeeded_(false), isArbitratedMerged_(false),
isArbitratedMergedEcalGeneral_(false) {}
virtual ~ConversionTrack() {}

const reco::Track *track() const { return track_.get(); }
const TrackBaseRef &trackRef() const { return track_; }
const edm::Ref<std::vector<Trajectory> > &trajRef() const { return traj_; }
void setTrajRef(edm::Ref<std::vector<Trajectory> > tr) { traj_ = tr; }
void setIsTrackerOnly(bool b) { isTrackerOnly_ = b; }
void setIsGsfTrackOpen(bool b) { isGsfTrackOpen_ = b; }
void setIsArbitratedEcalSeeded(bool b) { isArbitratedEcalSeeded_ = b; }
void setIsArbitratedMerged(bool b) { isArbitratedMerged_ = b; }
void setIsArbitratedMergedEcalGeneral(bool b) { isArbitratedMergedEcalGeneral_ = b; }
bool isTrackerOnly() const { return isTrackerOnly_;}
bool isArbitratedEcalSeeded() const { return isArbitratedEcalSeeded_;}
bool isArbitratedMerged() const { return isArbitratedMerged_;}
bool isArbitratedMergedEcalGeneral() const { return isArbitratedMergedEcalGeneral_;}
bool isGsfTrackOpen() const { return isGsfTrackOpen_;}
namespace reco {
class ConversionTrack {
public:
ConversionTrack()
: isTrackerOnly_(false),
isGsfTrackOpen_(false),
isArbitratedEcalSeeded_(false),
isArbitratedMerged_(false),
isArbitratedMergedEcalGeneral_(false) {}
ConversionTrack(const TrackBaseRef &trk)
: track_(trk),
isTrackerOnly_(false),
isGsfTrackOpen_(false),
isArbitratedEcalSeeded_(false),
isArbitratedMerged_(false),
isArbitratedMergedEcalGeneral_(false) {}
virtual ~ConversionTrack() {}

const reco::Track *track() const { return track_.get(); }
const TrackBaseRef &trackRef() const { return track_; }
const edm::Ref<std::vector<Trajectory> > &trajRef() const { return traj_; }
void setTrajRef(edm::Ref<std::vector<Trajectory> > tr) { traj_ = tr; }
void setIsTrackerOnly(bool b) { isTrackerOnly_ = b; }
void setIsGsfTrackOpen(bool b) { isGsfTrackOpen_ = b; }
void setIsArbitratedEcalSeeded(bool b) { isArbitratedEcalSeeded_ = b; }
void setIsArbitratedMerged(bool b) { isArbitratedMerged_ = b; }
void setIsArbitratedMergedEcalGeneral(bool b) { isArbitratedMergedEcalGeneral_ = b; }
bool isTrackerOnly() const { return isTrackerOnly_; }
bool isArbitratedEcalSeeded() const { return isArbitratedEcalSeeded_; }
bool isArbitratedMerged() const { return isArbitratedMerged_; }
bool isArbitratedMergedEcalGeneral() const { return isArbitratedMergedEcalGeneral_; }
bool isGsfTrackOpen() const { return isGsfTrackOpen_; }


private:
TrackBaseRef track_; //ptr to track
edm::Ref<std::vector<Trajectory> > traj_; //reference to a trajectory
bool isTrackerOnly_; //from general tracks collection
bool isGsfTrackOpen_; //from gsf track open sequence for low pt electrons for B
bool isArbitratedEcalSeeded_; //from in out or out-in ecal-seeded collections (arbitrated)
bool isArbitratedMerged_; //is arbitrated among all input collections
bool isArbitratedMergedEcalGeneral_; //is arbitrated among ecal-seeded and generalTracks
private:
TrackBaseRef track_; //ptr to track
edm::Ref<std::vector<Trajectory> > traj_; //reference to a trajectory
bool isTrackerOnly_; //from general tracks collection
bool isGsfTrackOpen_; //from gsf track open sequence for low pt electrons for B
bool isArbitratedEcalSeeded_; //from in out or out-in ecal-seeded collections (arbitrated)
bool isArbitratedMerged_; //is arbitrated among all input collections
bool isArbitratedMergedEcalGeneral_; //is arbitrated among ecal-seeded and generalTracks
};
}
} // namespace reco
#endif
2 changes: 1 addition & 1 deletion DataFormats/EgammaTrackReco/interface/ConversionTrackFwd.h 100755 → 100644
View file
Open in desktop
Expand Up @@ -6,6 +6,6 @@ namespace reco {
class ConversionTrack;
/// collection of ConversionTracks
typedef std::vector<ConversionTrack> ConversionTrackCollection;
}
} // namespace reco

#endif
8 changes: 3 additions & 5 deletions DataFormats/EgammaTrackReco/interface/TrackCaloClusterAssociation.h
View file
Open in desktop
Expand Up @@ -6,20 +6,18 @@
#include "DataFormats/Common/interface/RefVector.h"
#include "DataFormats/Common/interface/Ptr.h"
#include "DataFormats/Common/interface/PtrVector.h"
#include "DataFormats/TrackReco/interface/TrackFwd.h"
#include "DataFormats/TrackReco/interface/TrackFwd.h"
#include "DataFormats/CaloRecHit/interface/CaloClusterFwd.h"
#include "DataFormats/Common/interface/ValueMap.h"


namespace reco {

// association map
// typedef edm::ValueMap<reco::CaloClusterPtrVector> TrackCaloClusterAssociationCollection;

typedef edm::ValueMap<reco::CaloClusterPtr> TrackCaloClusterPtrAssociation;
typedef edm::ValueMap<reco::CaloClusterPtr> TrackCaloClusterPtrAssociation;
typedef edm::ValueMap<reco::CaloClusterPtrVector> TrackCaloClusterPtrVectorAssociation;


}
} // namespace reco

#endif
5 changes: 1 addition & 4 deletions DataFormats/EgammaTrackReco/interface/TrackCandidateCaloClusterAssociation.h
View file
Open in desktop
Expand Up @@ -11,15 +11,12 @@
#include "DataFormats/CaloRecHit/interface/CaloClusterFwd.h"
#include "DataFormats/Common/interface/ValueMap.h"



namespace reco {

// association map
typedef edm::ValueMap<reco::CaloClusterPtr> TrackCandidateCaloClusterPtrAssociation;
typedef edm::ValueMap<reco::CaloClusterPtrVector> TrackCandidateCaloClusterPtrVectorAssociation;


}
} // namespace reco

#endif
5 changes: 1 addition & 4 deletions DataFormats/EgammaTrackReco/interface/TrackCandidateSuperClusterAssociation.h
View file
Open in desktop
Expand Up @@ -9,14 +9,11 @@
#include "DataFormats/EgammaReco/interface/SuperClusterFwd.h"
#include "DataFormats/Common/interface/ValueMap.h"



namespace reco {

// association map
typedef edm::ValueMap<reco::SuperClusterRef> TrackCandidateSuperClusterAssociationCollection;


}
} // namespace reco

#endif
5 changes: 2 additions & 3 deletions DataFormats/EgammaTrackReco/interface/TrackSuperClusterAssociation.h
View file
Open in desktop
Expand Up @@ -4,16 +4,15 @@
#include <vector>
#include "DataFormats/Common/interface/Ref.h"
#include "DataFormats/Common/interface/RefVector.h"
#include "DataFormats/TrackReco/interface/TrackFwd.h"
#include "DataFormats/TrackReco/interface/TrackFwd.h"
#include "DataFormats/EgammaReco/interface/SuperClusterFwd.h"
#include "DataFormats/Common/interface/ValueMap.h"


namespace reco {

// association map
typedef edm::ValueMap<reco::SuperClusterRef> TrackSuperClusterAssociationCollection;

}
} // namespace reco

#endif
29 changes: 13 additions & 16 deletions DataFormats/EgammaTrackReco/src/classes.h
View file
Open in desktop
@@ -1,27 +1,24 @@
#include "DataFormats/TrackCandidate/interface/TrackCandidateCollection.h"
#include "DataFormats/CLHEP/interface/Migration.h"
#include <boost/cstdint.hpp>
#include "DataFormats/TrackingRecHit/interface/TrackingRecHitFwd.h"
#include "DataFormats/CLHEP/interface/Migration.h"
#include <boost/cstdint.hpp>
#include "DataFormats/TrackingRecHit/interface/TrackingRecHitFwd.h"
#include "DataFormats/TrackCandidate/interface/TrackCandidate.h"
#include "DataFormats/TrackReco/interface/Track.h"
#include "Rtypes.h"
#include "Math/Cartesian3D.h"
#include "Math/Polar3D.h"
#include "Math/CylindricalEta3D.h"
#include "DataFormats/TrackReco/interface/TrackFwd.h"
#include "Rtypes.h"
#include "Math/Cartesian3D.h"
#include "Math/Polar3D.h"
#include "Math/CylindricalEta3D.h"
#include "DataFormats/TrackReco/interface/TrackFwd.h"
#include "DataFormats/EgammaTrackReco/interface/TrackCandidateSuperClusterAssociation.h"
#include "DataFormats/EgammaTrackReco/interface/TrackSuperClusterAssociation.h"
#include "DataFormats/EgammaTrackReco/interface/TrackCandidateCaloClusterAssociation.h"
#include "DataFormats/EgammaTrackReco/interface/TrackCaloClusterAssociation.h"
#include "DataFormats/Common/interface/RefProd.h"
#include "DataFormats/Common/interface/RefProd.h"
#include "DataFormats/EgammaReco/interface/SuperCluster.h"
#include "DataFormats/EgammaReco/interface/SuperClusterFwd.h"
#include "DataFormats/EgammaReco/interface/SuperClusterFwd.h"
#include "DataFormats/CaloRecHit/interface/CaloCluster.h"
#include "DataFormats/CaloRecHit/interface/CaloClusterFwd.h"
#include "DataFormats/EgammaTrackReco/interface/ConversionTrack.h"
#include "DataFormats/EgammaTrackReco/interface/ConversionTrackFwd.h"

#include "DataFormats/CaloRecHit/interface/CaloClusterFwd.h"
#include "DataFormats/EgammaTrackReco/interface/ConversionTrack.h"
#include "DataFormats/EgammaTrackReco/interface/ConversionTrackFwd.h"

#include "DataFormats/Common/interface/Wrapper.h"


93 changes: 31 additions & 62 deletions EventFilter/DTRawToDigi/interface/DTROChainCoding.h
View file
Open in desktop
Expand Up @@ -13,7 +13,6 @@

#include <boost/cstdint.hpp>


/// FIXEME:
/*
A major problem is the numbering of the
Expand All @@ -27,101 +26,71 @@

*/


class DTROChainCoding {

public:

/// Constructors

DTROChainCoding(): code(0) {}
DTROChainCoding() : code(0) {}

DTROChainCoding(const int & ddu, const int & ros,
const int & rob, const int & tdc, const int & channel) {
code =
ddu << DDU_SHIFT |
ros << ROS_SHIFT |
rob << ROB_SHIFT |
tdc << TDC_SHIFT |
channel << CHANNEL_SHIFT;
DTROChainCoding(const int& ddu, const int& ros, const int& rob, const int& tdc, const int& channel) {
code = ddu << DDU_SHIFT | ros << ROS_SHIFT | rob << ROB_SHIFT | tdc << TDC_SHIFT | channel << CHANNEL_SHIFT;
}

DTROChainCoding(uint32_t code_): code(code_) {}
DTROChainCoding(uint32_t code_) : code(code_) {}

/// Destructor
virtual ~DTROChainCoding() {}

/// Setters ///////////////////////
inline void setCode(const uint32_t & code_) {code = code_;}
inline void setChain(const int & ddu, const int & ros,
const int & rob, const int & tdc, const int & channel) {

code =
ddu << DDU_SHIFT |
ros << ROS_SHIFT |
rob << ROB_SHIFT |
tdc << TDC_SHIFT |
channel << CHANNEL_SHIFT;
inline void setCode(const uint32_t& code_) { code = code_; }
inline void setChain(const int& ddu, const int& ros, const int& rob, const int& tdc, const int& channel) {
code = ddu << DDU_SHIFT | ros << ROS_SHIFT | rob << ROB_SHIFT | tdc << TDC_SHIFT | channel << CHANNEL_SHIFT;
}

/// need to reset the bits before setting
inline void setDDU(const int & ID) {
code = ( code & (~(DDU_MASK << DDU_SHIFT)) ) | (ID << DDU_SHIFT);
}
inline void setROS(const int & ID) {
code = ( code & (~(ROS_MASK << ROS_SHIFT)) ) | (ID << ROS_SHIFT);
}
inline void setROB(const int & ID) {
code = ( code & (~(ROB_MASK << ROB_SHIFT)) ) | (ID << ROB_SHIFT);
}
inline void setTDC(const int & ID) {
code = ( code & (~(TDC_MASK << TDC_SHIFT)) ) | (ID << TDC_SHIFT);
}
inline void setChannel(const int & ID) {
code = ( code & (~(CHANNEL_MASK << CHANNEL_SHIFT)) ) | (ID << CHANNEL_SHIFT);
}

/// need to reset the bits before setting
inline void setDDU(const int& ID) { code = (code & (~(DDU_MASK << DDU_SHIFT))) | (ID << DDU_SHIFT); }
inline void setROS(const int& ID) { code = (code & (~(ROS_MASK << ROS_SHIFT))) | (ID << ROS_SHIFT); }
inline void setROB(const int& ID) { code = (code & (~(ROB_MASK << ROB_SHIFT))) | (ID << ROB_SHIFT); }
inline void setTDC(const int& ID) { code = (code & (~(TDC_MASK << TDC_SHIFT))) | (ID << TDC_SHIFT); }
inline void setChannel(const int& ID) { code = (code & (~(CHANNEL_MASK << CHANNEL_SHIFT))) | (ID << CHANNEL_SHIFT); }

/// Getters ///////////////////////
inline uint32_t getCode() const { return code; }
inline int getDDU() const { return (code >> DDU_SHIFT) & DDU_MASK; }
inline int getDDUID() const { return (code >> DDU_SHIFT) ; }
inline int getDDUID() const { return (code >> DDU_SHIFT); }
inline int getROS() const { return (code >> ROS_SHIFT) & ROS_MASK; }
inline int getROSID() const { return (code >> ROS_SHIFT) ; }
inline int getROSID() const { return (code >> ROS_SHIFT); }
inline int getROB() const { return (code >> ROB_SHIFT) & ROB_MASK; }
inline int getROBID() const { return (code >> ROB_SHIFT) ; }
inline int getROBID() const { return (code >> ROB_SHIFT); }
inline int getTDC() const { return (code >> TDC_SHIFT) & TDC_MASK; }
inline int getTDCID() const { return (code >> TDC_SHIFT) ; }
inline int getTDCID() const { return (code >> TDC_SHIFT); }
inline int getChannel() const { return (code >> CHANNEL_SHIFT) & CHANNEL_MASK; }
inline int getChannelID() const { return (code >> CHANNEL_SHIFT) ; }
inline int getChannelID() const { return (code >> CHANNEL_SHIFT); }

/// SC getters: same as ROS getters (SC data goes in the corresponding ROS)
inline int getSC() const { return (code >> ROS_SHIFT) & ROS_MASK; }
inline int getSCID() const { return (code >> ROS_SHIFT) ; }

inline int getSCID() const { return (code >> ROS_SHIFT); }

private:

uint32_t code;

// First shift the bits then apply the mask

// ddu bit are the last ones. I DONT CARE if the ID is > than 730 (I always get the lsb)
static const int DDU_SHIFT = 16;
static const int DDU_MASK = 0x3FF;

static const int ROS_SHIFT = 12;
static const int ROS_MASK = 0xF;

static const int ROB_SHIFT = 7;
static const int ROB_MASK = 0x1F;
static const int DDU_SHIFT = 16;
static const int DDU_MASK = 0x3FF;

static const int TDC_SHIFT = 5;
static const int TDC_MASK = 0x3;
static const int ROS_SHIFT = 12;
static const int ROS_MASK = 0xF;

static const int CHANNEL_SHIFT = 0;
static const int CHANNEL_MASK = 0x1F;
static const int ROB_SHIFT = 7;
static const int ROB_MASK = 0x1F;

static const int TDC_SHIFT = 5;
static const int TDC_MASK = 0x3;

static const int CHANNEL_SHIFT = 0;
static const int CHANNEL_MASK = 0x1F;
};

#endif