Skip to content

Commit cdab3d6

Browse files
committed
fixing names of structures
1 parent 1e4126a commit cdab3d6

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

L1Trigger/L1CaloTrigger/interface/Phase2L1CaloPFClusterEmulator.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ namespace gctpf {
4444

4545
typedef struct {
4646
GCTint_t t[nTowerPhiSLR];
47-
} gctEtaStrip_t;
47+
} GCTEtaStrip_t;
4848

4949
typedef struct {
5050
GCTint_t p[nTowerEtaSLR - 2];
51-
} gctEtaStripPeak_t;
51+
} GCTEtaStripPeak_t;
5252

5353
typedef struct {
54-
gctEtaStrip_t s[nTowerEtaSLR];
55-
} region_t;
54+
GCTEtaStrip_t s[nTowerEtaSLR];
55+
} Region_t;
5656

5757
inline GCTint_t bestOf2(const GCTint_t& t0, const GCTint_t& t1) {
5858
GCTint_t x;
@@ -61,7 +61,7 @@ namespace gctpf {
6161
return x;
6262
}
6363

64-
inline GCTint_t getPeakOfStrip(const gctEtaStrip_t& etaStrip) {
64+
inline GCTint_t getPeakOfStrip(const GCTEtaStrip_t& etaStrip) {
6565
GCTint_t best12 = bestOf2(etaStrip.t[1], etaStrip.t[2]);
6666
GCTint_t best34 = bestOf2(etaStrip.t[3], etaStrip.t[4]);
6767
GCTint_t best56 = bestOf2(etaStrip.t[5], etaStrip.t[6]);
@@ -71,7 +71,7 @@ namespace gctpf {
7171
return bestAll;
7272
}
7373

74-
inline GCTint_t getPeakBin(const gctEtaStripPeak_t& etaStripPeak) {
74+
inline GCTint_t getPeakBin(const GCTEtaStripPeak_t& etaStripPeak) {
7575
GCTint_t best01 = bestOf2(etaStripPeak.p[0], etaStripPeak.p[1]);
7676
GCTint_t best23 = bestOf2(etaStripPeak.p[2], etaStripPeak.p[3]);
7777
GCTint_t best45 = bestOf2(etaStripPeak.p[4], etaStripPeak.p[5]);
@@ -94,8 +94,8 @@ namespace gctpf {
9494
return bestAll;
9595
}
9696

97-
inline GCTint_t getPeakPosition(const region_t& region) {
98-
gctEtaStripPeak_t etaPeak;
97+
inline GCTint_t getPeakPosition(const Region_t& region) {
98+
GCTEtaStripPeak_t etaPeak;
9999
for (int i = 0; i < nTowerEtaSLR - 2; i++) {
100100
etaPeak.p[i] = getPeakOfStrip(region.s[i + 1]);
101101
}
@@ -104,8 +104,8 @@ namespace gctpf {
104104
return max;
105105
}
106106

107-
inline region_t initStructure(float temp[nTowerEtaSLR][nTowerPhiSLR]) {
108-
region_t r;
107+
inline Region_t initStructure(float temp[nTowerEtaSLR][nTowerPhiSLR]) {
108+
Region_t r;
109109

110110
for (int i = 0; i < nTowerPhiSLR; i++) {
111111
for (int j = 0; j < nTowerEtaSLR; j++) {
@@ -153,7 +153,7 @@ namespace gctpf {
153153
inline GCTpfcluster_t recoPfcluster(float temporary[nTowerEtaSLR][nTowerPhiSLR], int etaoffset, int phioffset) {
154154
GCTpfcluster_t pfclusterReturn;
155155

156-
region_t region;
156+
Region_t region;
157157

158158
region = initStructure(temporary);
159159

0 commit comments

Comments
 (0)