Skip to content

Commit a3102cf

Browse files
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent 262799a commit a3102cf

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

src/forwardEcal_geo.cpp

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ double blocksize, blockgap, offsetX[2], offsetY[2], insert_dx[2];
2020

2121
double xBlock(int ns, int row, int col) {
2222
if (row >= 18 && row <= 20) {
23-
return (1 - 2 * ns) *
24-
(offsetX[ns] + insert_dx[ns] + (blocksize + blockgap) * (col + 0.5));
23+
return (1 - 2 * ns) * (offsetX[ns] + insert_dx[ns] + (blocksize + blockgap) * (col + 0.5));
2524
} else {
2625
return (1 - 2 * ns) * (offsetX[ns] + (blocksize + blockgap) * (col + 0.5));
2726
}
@@ -31,7 +30,6 @@ double yBlock(int ns, int row) {
3130
return offsetY[ns] + (blocksize + blockgap) * (mMaxRowBlock / 2.0 - row - 0.5);
3231
}
3332

34-
3533
static Ref_t createDetector(Detector& desc, xml_h handle, SensitiveDetector sens) {
3634
//forwardEcalMap* map = new forwardEcalMap();
3735
//double blocksize = map->blockSize(); // X,Y size of block
@@ -59,16 +57,16 @@ static Ref_t createDetector(Detector& desc, xml_h handle, SensitiveDetector sens
5957
//double rFiber = 0.0235; //fiber radius (PMMA outside)
6058
//double rScfi = 0.02209; //Scintillating fiber core radius
6159

62-
blocksize = desc.constant<double>("EcalEndcapP_blockSize");
63-
blockgap = desc.constant<double>("EcalEndcapP_spaceBetweenBlock");
64-
double nsgap = desc.constant<double>("EcalEndcapP_xOffsetNorth") +
60+
blocksize = desc.constant<double>("EcalEndcapP_blockSize");
61+
blockgap = desc.constant<double>("EcalEndcapP_spaceBetweenBlock");
62+
double nsgap = desc.constant<double>("EcalEndcapP_xOffsetNorth") +
6563
desc.constant<double>("EcalEndcapP_xOffsetSouth");
66-
double rmin = 0.0; // Dummy variable. Set to 0 since cutting out insert
67-
double rmax = desc.constant<double>("EcalEndcapP_rmax");
68-
double rmaxWithGap = desc.constant<double>("EcalEndcapP_rmaxWithGap");
69-
double zmax = desc.constant<double>("EcalEndcapP_zmax");
70-
double length = desc.constant<double>("EcalEndcapP_length");
71-
double zmin = desc.constant<double>("EcalEndcapP_zmin");
64+
double rmin = 0.0; // Dummy variable. Set to 0 since cutting out insert
65+
double rmax = desc.constant<double>("EcalEndcapP_rmax");
66+
double rmaxWithGap = desc.constant<double>("EcalEndcapP_rmaxWithGap");
67+
double zmax = desc.constant<double>("EcalEndcapP_zmax");
68+
double length = desc.constant<double>("EcalEndcapP_length");
69+
double zmin = desc.constant<double>("EcalEndcapP_zmin");
7270
offsetX[0] = desc.constant<double>("EcalEndcapP_xOffsetNorth");
7371
offsetX[1] = desc.constant<double>("EcalEndcapP_xOffsetSouth");
7472
offsetY[0] = desc.constant<double>("EcalEndcapP_yOffsetNorth");

0 commit comments

Comments
 (0)