Skip to content

Commit e044d64

Browse files
alibuildalibuild
committed
Please consider the following formatting changes
1 parent e5fb734 commit e044d64

File tree

2 files changed

+51
-54
lines changed

2 files changed

+51
-54
lines changed

‎Detectors/FIT/FT0/base/include/FT0Base/Geometry.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,12 @@ class Geometry
6868
// Calculate the coordinates of all the channels.
6969
void calculateChannelCenter();
7070
// Get the coordinates of the center of the channel channelId.
71-
TVector3 getChannelCenter(UInt_t channelId) {return mChannelCenter[channelId];}
71+
TVector3 getChannelCenter(UInt_t channelId) { return mChannelCenter[channelId]; }
7272

7373
private:
7474
TVector3 mMCP[52];
7575
TVector3 mAngles[28];
76-
std::array<TVector3, Nchannels> mChannelCenter; /// Center of each channel in FT0 A (96) and C (112) combined.
77-
76+
std::array<TVector3, Nchannels> mChannelCenter; /// Center of each channel in FT0 A (96) and C (112) combined.
7877

7978
ClassDefNV(Geometry, 2);
8079
};

‎Detectors/FIT/FT0/base/src/Geometry.cxx‎

Lines changed: 49 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -129,66 +129,64 @@ void Geometry::calculateChannelCenter()
129129

130130
// Calculate first the positions for the channels for FT0-A. These correspond to the
131131
// channels 0-95 in the modules mMCP[0-23].
132-
Double_t delta = 5.3/4.; // Half-channel width (TODO: ask if it actually corresponds to ChannelWidth)
133-
Double_t xLocalChannels[Nchannels]; // x-positions of all channels ordered according to xi and internal numbering.
134-
Double_t yLocalChannels[Nchannels]; // y-positions of all channels ordered according to yi and internal numbering.
135-
Double_t zLocalChannels[Nchannels]; // z-positions of all channels ordered according to zi and internal numbering.
136-
// INFO: We assume here the modules are perpendicular to z, so z(channel) = z(module).
132+
Double_t delta = 5.3 / 4.; // Half-channel width (TODO: ask if it actually corresponds to ChannelWidth)
133+
Double_t xLocalChannels[Nchannels]; // x-positions of all channels ordered according to xi and internal numbering.
134+
Double_t yLocalChannels[Nchannels]; // y-positions of all channels ordered according to yi and internal numbering.
135+
Double_t zLocalChannels[Nchannels]; // z-positions of all channels ordered according to zi and internal numbering.
136+
// INFO: We assume here the modules are perpendicular to z, so z(channel) = z(module).
137137

138138
for (int iModA = 0; iModA < NCellsA; iModA++) {
139-
xLocalChannels[4*iModA+0] = mMCP[iModA].X() - delta;
140-
xLocalChannels[4*iModA+1] = mMCP[iModA].X() + delta;
141-
xLocalChannels[4*iModA+2] = mMCP[iModA].X() - delta;
142-
xLocalChannels[4*iModA+3] = mMCP[iModA].X() + delta;
143-
144-
yLocalChannels[4*iModA+0] = mMCP[iModA].Y() + delta;
145-
yLocalChannels[4*iModA+1] = mMCP[iModA].Y() + delta;
146-
yLocalChannels[4*iModA+2] = mMCP[iModA].Y() - delta;
147-
yLocalChannels[4*iModA+3] = mMCP[iModA].Y() - delta;
148-
149-
zLocalChannels[4*iModA+0] = mMCP[iModA].Z();
150-
zLocalChannels[4*iModA+1] = mMCP[iModA].Z();
151-
zLocalChannels[4*iModA+2] = mMCP[iModA].Z();
152-
zLocalChannels[4*iModA+3] = mMCP[iModA].Z();
139+
xLocalChannels[4 * iModA + 0] = mMCP[iModA].X() - delta;
140+
xLocalChannels[4 * iModA + 1] = mMCP[iModA].X() + delta;
141+
xLocalChannels[4 * iModA + 2] = mMCP[iModA].X() - delta;
142+
xLocalChannels[4 * iModA + 3] = mMCP[iModA].X() + delta;
143+
144+
yLocalChannels[4 * iModA + 0] = mMCP[iModA].Y() + delta;
145+
yLocalChannels[4 * iModA + 1] = mMCP[iModA].Y() + delta;
146+
yLocalChannels[4 * iModA + 2] = mMCP[iModA].Y() - delta;
147+
yLocalChannels[4 * iModA + 3] = mMCP[iModA].Y() - delta;
148+
149+
zLocalChannels[4 * iModA + 0] = mMCP[iModA].Z();
150+
zLocalChannels[4 * iModA + 1] = mMCP[iModA].Z();
151+
zLocalChannels[4 * iModA + 2] = mMCP[iModA].Z();
152+
zLocalChannels[4 * iModA + 3] = mMCP[iModA].Z();
153153
}
154154

155155
// Calculate then the positions for the channels for FT0-C, corresponding to the
156156
// channels 96-207 in the modules mMCP[24-51].
157157
for (int iModC = 0; iModC < NCellsC; iModC++) {
158-
xLocalChannels[4*(iModC+NCellsA)+0] = mMCP[iModC+NCellsA].X() - delta;
159-
xLocalChannels[4*(iModC+NCellsA)+1] = mMCP[iModC+NCellsA].X() + delta;
160-
xLocalChannels[4*(iModC+NCellsA)+2] = mMCP[iModC+NCellsA].X() - delta;
161-
xLocalChannels[4*(iModC+NCellsA)+3] = mMCP[iModC+NCellsA].X() + delta;
162-
163-
yLocalChannels[4*(iModC+NCellsA)+0] = mMCP[iModC+NCellsA].Y() + delta;
164-
yLocalChannels[4*(iModC+NCellsA)+1] = mMCP[iModC+NCellsA].Y() + delta;
165-
yLocalChannels[4*(iModC+NCellsA)+2] = mMCP[iModC+NCellsA].Y() - delta;
166-
yLocalChannels[4*(iModC+NCellsA)+3] = mMCP[iModC+NCellsA].Y() - delta;
167-
168-
zLocalChannels[4*(iModC+NCellsA)+0] = mMCP[iModC+NCellsA].Z();
169-
zLocalChannels[4*(iModC+NCellsA)+1] = mMCP[iModC+NCellsA].Z();
170-
zLocalChannels[4*(iModC+NCellsA)+2] = mMCP[iModC+NCellsA].Z();
171-
zLocalChannels[4*(iModC+NCellsA)+3] = mMCP[iModC+NCellsA].Z();
158+
xLocalChannels[4 * (iModC + NCellsA) + 0] = mMCP[iModC + NCellsA].X() - delta;
159+
xLocalChannels[4 * (iModC + NCellsA) + 1] = mMCP[iModC + NCellsA].X() + delta;
160+
xLocalChannels[4 * (iModC + NCellsA) + 2] = mMCP[iModC + NCellsA].X() - delta;
161+
xLocalChannels[4 * (iModC + NCellsA) + 3] = mMCP[iModC + NCellsA].X() + delta;
162+
163+
yLocalChannels[4 * (iModC + NCellsA) + 0] = mMCP[iModC + NCellsA].Y() + delta;
164+
yLocalChannels[4 * (iModC + NCellsA) + 1] = mMCP[iModC + NCellsA].Y() + delta;
165+
yLocalChannels[4 * (iModC + NCellsA) + 2] = mMCP[iModC + NCellsA].Y() - delta;
166+
yLocalChannels[4 * (iModC + NCellsA) + 3] = mMCP[iModC + NCellsA].Y() - delta;
167+
168+
zLocalChannels[4 * (iModC + NCellsA) + 0] = mMCP[iModC + NCellsA].Z();
169+
zLocalChannels[4 * (iModC + NCellsA) + 1] = mMCP[iModC + NCellsA].Z();
170+
zLocalChannels[4 * (iModC + NCellsA) + 2] = mMCP[iModC + NCellsA].Z();
171+
zLocalChannels[4 * (iModC + NCellsA) + 3] = mMCP[iModC + NCellsA].Z();
172172
}
173173

174174
// Convert the local ordering of the channels to the official one and apply it to the channel map.
175175
// localChannelOrder[local channel index] = official channel.
176-
Int_t localChannelOrder[Nchannels] = {
177-
58, 56, 59, 57, 54, 52, 55, 53, 50, 49, 51, 48, 47, 45, 46, 44, 43, 42, 41, 40,
178-
61, 60, 63, 62, 14, 12, 15, 13, 10, 9, 11, 8, 7, 6, 5, 4, 39, 38, 37, 36,
179-
65, 64, 66, 67, 17, 16, 18, 19, 3, 2, 0, 1, 35, 34, 32, 33,
180-
68, 69, 70, 71, 20, 21, 22, 23, 24, 27, 25, 26, 29, 31, 28, 30, 94, 95, 92, 93,
181-
72, 73, 74, 75, 76, 78, 77, 79, 80, 83, 81, 82, 85, 87, 84, 86, 89, 91, 88, 90,
182-
173, 172, 175, 174, 206, 207, 204, 205, 169, 168, 171, 170, 202, 203, 200, 201,
183-
117, 116, 119, 118, 142, 143, 140, 141, 114, 112, 115, 113, 137, 139, 136, 138,
184-
166, 164, 167, 165, 197, 199, 196, 198, 110, 108, 111, 109, 133, 135, 132, 134,
185-
162, 160, 163, 161, 193, 195, 192, 194, 107, 105, 106, 104, 128, 130, 129, 131,
186-
159, 157, 158, 156, 188, 190, 189, 191, 99, 98, 97, 96, 120, 121, 122, 123,
187-
103, 102, 101, 100, 124, 125, 126, 127, 155, 153, 154, 152, 184, 186, 185, 187,
188-
147, 146, 145, 144, 176, 177, 178, 179, 151, 150, 149, 148, 180, 181, 182, 183
189-
};
190-
for (int iChannel = 0; iChannel < Nchannels; iChannel++) {
191-
mChannelCenter[localChannelOrder[iChannel]].SetXYZ(xLocalChannels[iChannel], yLocalChannels[iChannel], zLocalChannels[iChannel]);
192-
}
193-
176+
Int_t localChannelOrder[Nchannels] = {
177+
58, 56, 59, 57, 54, 52, 55, 53, 50, 49, 51, 48, 47, 45, 46, 44, 43, 42, 41, 40,
178+
61, 60, 63, 62, 14, 12, 15, 13, 10, 9, 11, 8, 7, 6, 5, 4, 39, 38, 37, 36,
179+
65, 64, 66, 67, 17, 16, 18, 19, 3, 2, 0, 1, 35, 34, 32, 33,
180+
68, 69, 70, 71, 20, 21, 22, 23, 24, 27, 25, 26, 29, 31, 28, 30, 94, 95, 92, 93,
181+
72, 73, 74, 75, 76, 78, 77, 79, 80, 83, 81, 82, 85, 87, 84, 86, 89, 91, 88, 90,
182+
173, 172, 175, 174, 206, 207, 204, 205, 169, 168, 171, 170, 202, 203, 200, 201,
183+
117, 116, 119, 118, 142, 143, 140, 141, 114, 112, 115, 113, 137, 139, 136, 138,
184+
166, 164, 167, 165, 197, 199, 196, 198, 110, 108, 111, 109, 133, 135, 132, 134,
185+
162, 160, 163, 161, 193, 195, 192, 194, 107, 105, 106, 104, 128, 130, 129, 131,
186+
159, 157, 158, 156, 188, 190, 189, 191, 99, 98, 97, 96, 120, 121, 122, 123,
187+
103, 102, 101, 100, 124, 125, 126, 127, 155, 153, 154, 152, 184, 186, 185, 187,
188+
147, 146, 145, 144, 176, 177, 178, 179, 151, 150, 149, 148, 180, 181, 182, 183};
189+
for (int iChannel = 0; iChannel < Nchannels; iChannel++) {
190+
mChannelCenter[localChannelOrder[iChannel]].SetXYZ(xLocalChannels[iChannel], yLocalChannels[iChannel], zLocalChannels[iChannel]);
191+
}
194192
}

0 commit comments

Comments
 (0)