Skip to content

Commit

Permalink
Clang-Format
Browse files Browse the repository at this point in the history
  • Loading branch information
cmsbuild committed May 9, 2019
1 parent 5c0443f commit 6fda101
Show file tree
Hide file tree
Showing 221 changed files with 21,740 additions and 21,082 deletions.
182 changes: 103 additions & 79 deletions Alignment/APEEstimation/interface/EventVariables.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,49 +3,73 @@

#include <vector>

struct TrackStruct{

TrackStruct(){}

enum HitState{notInTracker, notAssignedToSectors, invalid, negativeError, ok};

struct HitParameterStruct{

HitParameterStruct(): hitState(ok),
isPixelHit(false),
goodXMeasurement(false),
goodYMeasurement(false),
widthX(0),
baryStripX(-999.F),
widthY(0),
baryStripY(-999.F),
chargePixel(-999.F),
clusterProbabilityXY(-999.F), clusterProbabilityQ(-999.F),
clusterProbabilityXYQ(-999.F), logClusterProbability(-999.F),
isOnEdge(false), hasBadPixels(false), spansTwoRoc(false),
qBin(-1),
isModuleUsable(true),
chargeStrip(0),
maxStrip(0), maxStripInv(0), maxCharge(0), maxIndex(0),
chargeOnEdges(-999.F), chargeAsymmetry(-999.F),
chargeLRplus(-999.F), chargeLRminus(-999.F),
sOverN(-999.F),
projWidth(-999.F),
resX(-999.F), norResX(-999.F), xHit(-999.F), xTrk(-999.F),
errXHit(-999.F), errXTrk(-999.F), errX(-999.F), errX2(-999.F),
errXHitWoApe(-999.F), errXWoApe(-999.F),
probX(-999.F),
resY(-999.F), norResY(-999.F), yHit(-999.F), yTrk(-999.F),
errYHit(-999.F), errYTrk(-999.F), errY(-999.F), errY2(-999.F),
errYHitWoApe(-999.F), errYWoApe(-999.F),
probY(-999.F),
phiSens(-999.F), phiSensX(-999.F), phiSensY(-999.F){}

struct TrackStruct {
TrackStruct() {}

enum HitState { notInTracker, notAssignedToSectors, invalid, negativeError, ok };

struct HitParameterStruct {
HitParameterStruct()
: hitState(ok),
isPixelHit(false),
goodXMeasurement(false),
goodYMeasurement(false),
widthX(0),
baryStripX(-999.F),
widthY(0),
baryStripY(-999.F),
chargePixel(-999.F),
clusterProbabilityXY(-999.F),
clusterProbabilityQ(-999.F),
clusterProbabilityXYQ(-999.F),
logClusterProbability(-999.F),
isOnEdge(false),
hasBadPixels(false),
spansTwoRoc(false),
qBin(-1),
isModuleUsable(true),
chargeStrip(0),
maxStrip(0),
maxStripInv(0),
maxCharge(0),
maxIndex(0),
chargeOnEdges(-999.F),
chargeAsymmetry(-999.F),
chargeLRplus(-999.F),
chargeLRminus(-999.F),
sOverN(-999.F),
projWidth(-999.F),
resX(-999.F),
norResX(-999.F),
xHit(-999.F),
xTrk(-999.F),
errXHit(-999.F),
errXTrk(-999.F),
errX(-999.F),
errX2(-999.F),
errXHitWoApe(-999.F),
errXWoApe(-999.F),
probX(-999.F),
resY(-999.F),
norResY(-999.F),
yHit(-999.F),
yTrk(-999.F),
errYHit(-999.F),
errYTrk(-999.F),
errY(-999.F),
errY2(-999.F),
errYHitWoApe(-999.F),
errYWoApe(-999.F),
probY(-999.F),
phiSens(-999.F),
phiSensX(-999.F),
phiSensY(-999.F) {}

HitState hitState;
bool isPixelHit;
bool goodXMeasurement, goodYMeasurement;
std::vector<unsigned int> v_sector;

// Cluster parameters
// pixel+strip
unsigned int widthX;
Expand All @@ -54,58 +78,58 @@ struct TrackStruct{
unsigned int widthY;
float baryStripY;
float chargePixel;
float clusterProbabilityXY, clusterProbabilityQ,
clusterProbabilityXYQ, logClusterProbability;
float clusterProbabilityXY, clusterProbabilityQ, clusterProbabilityXYQ, logClusterProbability;
bool isOnEdge, hasBadPixels, spansTwoRoc;
int qBin;
// strip only
bool isModuleUsable;
unsigned int chargeStrip;
unsigned int maxStrip, maxStripInv, maxCharge, maxIndex;
float chargeOnEdges, chargeAsymmetry,
chargeLRplus, chargeLRminus;
float chargeOnEdges, chargeAsymmetry, chargeLRplus, chargeLRminus;
float sOverN;
float projWidth;

// trackFit results
float resX, norResX, xHit, xTrk,
errXHit, errXTrk, errX, errX2,
errXHitWoApe, errXWoApe,
probX;
float resY, norResY, yHit, yTrk,
errYHit, errYTrk, errY, errY2,
errYHitWoApe, errYWoApe,
probY;
float resX, norResX, xHit, xTrk, errXHit, errXTrk, errX, errX2, errXHitWoApe, errXWoApe, probX;
float resY, norResY, yHit, yTrk, errYHit, errYTrk, errY, errY2, errYHitWoApe, errYWoApe, probY;
float phiSens, phiSensX, phiSensY;
};

struct TrackParameterStruct{

TrackParameterStruct(): hitsSize(-999), hitsValid(-999), hitsInvalid(-999),
hits2D(-999), layersMissed(-999),
hitsPixel(-999), hitsStrip(-999),
charge(-999),
chi2(-999.F), ndof(-999.F), norChi2(-999.F), prob(-999.F),
eta(-999.F), etaErr(-999.F), theta(-999.F),
phi(-999.F), phiErr(-999.F),
d0(-999.F), d0Beamspot(-999.F), d0BeamspotErr(-999.F),
dz(-999.F), dzErr(-999.F), dzBeamspot(-999.F),
p(-999.F), pt(-999.F), ptErr(-999.F),
meanPhiSensToNorm(-999.F){}

int hitsSize, hitsValid, hitsInvalid,
hits2D, layersMissed,
hitsPixel, hitsStrip,
charge;
float chi2, ndof, norChi2, prob,
eta, etaErr, theta,
phi, phiErr,
d0, d0Beamspot, d0BeamspotErr,
dz, dzErr, dzBeamspot,
p, pt, ptErr,
meanPhiSensToNorm;

struct TrackParameterStruct {
TrackParameterStruct()
: hitsSize(-999),
hitsValid(-999),
hitsInvalid(-999),
hits2D(-999),
layersMissed(-999),
hitsPixel(-999),
hitsStrip(-999),
charge(-999),
chi2(-999.F),
ndof(-999.F),
norChi2(-999.F),
prob(-999.F),
eta(-999.F),
etaErr(-999.F),
theta(-999.F),
phi(-999.F),
phiErr(-999.F),
d0(-999.F),
d0Beamspot(-999.F),
d0BeamspotErr(-999.F),
dz(-999.F),
dzErr(-999.F),
dzBeamspot(-999.F),
p(-999.F),
pt(-999.F),
ptErr(-999.F),
meanPhiSensToNorm(-999.F) {}

int hitsSize, hitsValid, hitsInvalid, hits2D, layersMissed, hitsPixel, hitsStrip, charge;
float chi2, ndof, norChi2, prob, eta, etaErr, theta, phi, phiErr, d0, d0Beamspot, d0BeamspotErr, dz, dzErr,
dzBeamspot, p, pt, ptErr, meanPhiSensToNorm;
};

TrackParameterStruct trkParams;
std::vector<HitParameterStruct> v_hitParams;
};
Expand Down
19 changes: 6 additions & 13 deletions Alignment/APEEstimation/interface/ReducedTrackerTreeVariables.h
Original file line number Diff line number Diff line change
@@ -1,28 +1,21 @@
#ifndef ReducedTrackerTreeVariables_h
#define ReducedTrackerTreeVariables_h


// For ROOT types with '_t':
#include <Rtypes.h>



// container to hold those static module parameters needed for correct xPrime-Residual calculation (and others), determined with ideal geometry
struct ReducedTrackerTreeVariables{

ReducedTrackerTreeVariables(){this->clear();}

void clear(){
struct ReducedTrackerTreeVariables {
ReducedTrackerTreeVariables() { this->clear(); }

void clear() {
subdetId = 0;
nStrips = 0;
uDirection = vDirection = wDirection = 0;
}

UInt_t subdetId,
nStrips;

UInt_t subdetId, nStrips;
Int_t uDirection, vDirection, wDirection;
};



#endif
106 changes: 60 additions & 46 deletions Alignment/APEEstimation/interface/TrackerDetectorStruct.h
Original file line number Diff line number Diff line change
@@ -1,57 +1,71 @@
#ifndef Alignment_APEEstimation_TrackerDetectorStruct_h
#define Alignment_APEEstimation_TrackerDetectorStruct_h


#include "TH1.h"
#include "TH2.h"
#include "TProfile.h"

struct TrackerDetectorStruct{

TrackerDetectorStruct(): TrkSize(nullptr), TrkSizeGood(nullptr),
HitsSize(nullptr), HitsValid(nullptr), HitsInvalid(nullptr), Hits2D(nullptr),
HitsGood(nullptr), LayersMissed(nullptr),
HitsPixel(nullptr), HitsStrip(nullptr),
Charge(nullptr),
Chi2(nullptr), Ndof(nullptr), NorChi2(nullptr), Prob(nullptr),
Eta(nullptr), EtaErr(nullptr), EtaSig(nullptr), Theta(nullptr),
Phi(nullptr), PhiErr(nullptr), PhiSig(nullptr),
D0Beamspot(nullptr), D0BeamspotErr(nullptr), D0BeamspotSig(nullptr),
Dz(nullptr), DzErr(nullptr), DzSig(nullptr),
P(nullptr), Pt(nullptr), PtErr(nullptr), PtSig(nullptr),
MeanAngle(nullptr),
HitsGoodVsHitsValid(nullptr), MeanAngleVsHits(nullptr),
HitsPixelVsEta(nullptr), HitsPixelVsTheta(nullptr),
HitsStripVsEta(nullptr), HitsStripVsTheta(nullptr),
PtVsEta(nullptr), PtVsTheta(nullptr),
PHitsGoodVsHitsValid(nullptr), PMeanAngleVsHits(nullptr),
PHitsPixelVsEta(nullptr), PHitsPixelVsTheta(nullptr),
PHitsStripVsEta(nullptr), PHitsStripVsTheta(nullptr),
PPtVsEta(nullptr), PPtVsTheta(nullptr){}

TH1 *TrkSize, *TrkSizeGood,
*HitsSize, *HitsValid, *HitsInvalid, *Hits2D,
*HitsGood, *LayersMissed,
*HitsPixel, *HitsStrip,
*Charge,
*Chi2, *Ndof, *NorChi2, *Prob,
*Eta, *EtaErr, *EtaSig, *Theta,
*Phi,*PhiErr, *PhiSig,
*D0Beamspot, *D0BeamspotErr, *D0BeamspotSig,
*Dz, *DzErr, *DzSig,
*P, *Pt, *PtErr, *PtSig,
*MeanAngle;

TH2 *HitsGoodVsHitsValid, *MeanAngleVsHits,
*HitsPixelVsEta, *HitsPixelVsTheta,
*HitsStripVsEta, *HitsStripVsTheta,
struct TrackerDetectorStruct {
TrackerDetectorStruct()
: TrkSize(nullptr),
TrkSizeGood(nullptr),
HitsSize(nullptr),
HitsValid(nullptr),
HitsInvalid(nullptr),
Hits2D(nullptr),
HitsGood(nullptr),
LayersMissed(nullptr),
HitsPixel(nullptr),
HitsStrip(nullptr),
Charge(nullptr),
Chi2(nullptr),
Ndof(nullptr),
NorChi2(nullptr),
Prob(nullptr),
Eta(nullptr),
EtaErr(nullptr),
EtaSig(nullptr),
Theta(nullptr),
Phi(nullptr),
PhiErr(nullptr),
PhiSig(nullptr),
D0Beamspot(nullptr),
D0BeamspotErr(nullptr),
D0BeamspotSig(nullptr),
Dz(nullptr),
DzErr(nullptr),
DzSig(nullptr),
P(nullptr),
Pt(nullptr),
PtErr(nullptr),
PtSig(nullptr),
MeanAngle(nullptr),
HitsGoodVsHitsValid(nullptr),
MeanAngleVsHits(nullptr),
HitsPixelVsEta(nullptr),
HitsPixelVsTheta(nullptr),
HitsStripVsEta(nullptr),
HitsStripVsTheta(nullptr),
PtVsEta(nullptr),
PtVsTheta(nullptr),
PHitsGoodVsHitsValid(nullptr),
PMeanAngleVsHits(nullptr),
PHitsPixelVsEta(nullptr),
PHitsPixelVsTheta(nullptr),
PHitsStripVsEta(nullptr),
PHitsStripVsTheta(nullptr),
PPtVsEta(nullptr),
PPtVsTheta(nullptr) {}

TH1 *TrkSize, *TrkSizeGood, *HitsSize, *HitsValid, *HitsInvalid, *Hits2D, *HitsGood, *LayersMissed, *HitsPixel,
*HitsStrip, *Charge, *Chi2, *Ndof, *NorChi2, *Prob, *Eta, *EtaErr, *EtaSig, *Theta, *Phi, *PhiErr, *PhiSig,
*D0Beamspot, *D0BeamspotErr, *D0BeamspotSig, *Dz, *DzErr, *DzSig, *P, *Pt, *PtErr, *PtSig, *MeanAngle;

TH2 *HitsGoodVsHitsValid, *MeanAngleVsHits, *HitsPixelVsEta, *HitsPixelVsTheta, *HitsStripVsEta, *HitsStripVsTheta,
*PtVsEta, *PtVsTheta;

TProfile *PHitsGoodVsHitsValid, *PMeanAngleVsHits,
*PHitsPixelVsEta, *PHitsPixelVsTheta,
*PHitsStripVsEta, *PHitsStripVsTheta,
*PPtVsEta, *PPtVsTheta;


TProfile *PHitsGoodVsHitsValid, *PMeanAngleVsHits, *PHitsPixelVsEta, *PHitsPixelVsTheta, *PHitsStripVsEta,
*PHitsStripVsTheta, *PPtVsEta, *PPtVsTheta;
};

#endif
Loading

0 comments on commit 6fda101

Please sign in to comment.