Skip to content

Commit f69824a

Browse files
author
Sunanda
committed
Code Check
1 parent 14818ca commit f69824a

File tree

1 file changed

+47
-47
lines changed

1 file changed

+47
-47
lines changed

‎Geometry/HGCalCommonData/src/HGCalWaferMask.cc‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -448,12 +448,12 @@ std::pair<int, int> HGCalWaferMask::getTypeMode(const double& xpos,
448448
static constexpr int base = 10;
449449
double rin2 = rin * rin;
450450
double rout2 = rout * rout;
451-
double dx0[corners] = {HGCalTypes::c00 * delX,
452-
HGCalTypes::c10 * delX,
453-
HGCalTypes::c10 * delX,
454-
HGCalTypes::c00 * delX,
455-
-HGCalTypes::c10 * delX,
456-
-HGCalTypes::c10 * delX};
451+
double dx0[corners] = {HGCalTypes::c00 * delX,
452+
HGCalTypes::c10 * delX,
453+
HGCalTypes::c10 * delX,
454+
HGCalTypes::c00 * delX,
455+
-HGCalTypes::c10 * delX,
456+
-HGCalTypes::c10 * delX};
457457
double dy0[corners] = {-HGCalTypes::c10 * delY,
458458
-HGCalTypes::c50 * delY,
459459
HGCalTypes::c50 * delY,
@@ -487,29 +487,29 @@ std::pair<int, int> HGCalWaferMask::getTypeMode(const double& xpos,
487487
-HGCalTypes::c10 * delX,
488488
-HGCalTypes::c50 * delX};
489489
double dy1[corners] = {-HGCalTypes::c75 * delY,
490-
HGCalTypes::c00 * delY,
491-
HGCalTypes::c75 * delY,
492-
HGCalTypes::c75 * delY,
493-
HGCalTypes::c00 * delY,
494-
-HGCalTypes::c75 * delY};
490+
HGCalTypes::c00 * delY,
491+
HGCalTypes::c75 * delY,
492+
HGCalTypes::c75 * delY,
493+
HGCalTypes::c00 * delY,
494+
-HGCalTypes::c75 * delY};
495495
double dx2[corners] = {HGCalTypes::c50 * delX,
496496
-HGCalTypes::c50 * delX,
497497
-HGCalTypes::c10 * delX,
498498
-HGCalTypes::c50 * delX,
499499
HGCalTypes::c50 * delX,
500500
HGCalTypes::c10 * delX};
501-
double dy2[corners] = {HGCalTypes::c75 * delY,
502-
HGCalTypes::c75 * delY,
503-
HGCalTypes::c00 * delY,
504-
-HGCalTypes::c75 * delY,
505-
-HGCalTypes::c75 * delY,
506-
HGCalTypes::c00 * delY};
501+
double dy2[corners] = {HGCalTypes::c75 * delY,
502+
HGCalTypes::c75 * delY,
503+
HGCalTypes::c00 * delY,
504+
-HGCalTypes::c75 * delY,
505+
-HGCalTypes::c75 * delY,
506+
HGCalTypes::c00 * delY};
507507
double dx3[corners] = {HGCalTypes::c22 * delX,
508-
HGCalTypes::c10 * delX,
509-
HGCalTypes::c77 * delX,
510-
-HGCalTypes::c22 * delX,
511-
-HGCalTypes::c10 * delX,
512-
-HGCalTypes::c77 * delX};
508+
HGCalTypes::c10 * delX,
509+
HGCalTypes::c77 * delX,
510+
-HGCalTypes::c22 * delX,
511+
-HGCalTypes::c10 * delX,
512+
-HGCalTypes::c77 * delX};
513513
double dy3[corners] = {-HGCalTypes::c88 * delY,
514514
-HGCalTypes::c27 * delY,
515515
HGCalTypes::c61 * delY,
@@ -534,12 +534,12 @@ std::pair<int, int> HGCalWaferMask::getTypeMode(const double& xpos,
534534
HGCalTypes::c50 * delX,
535535
HGCalTypes::c10 * delX,
536536
HGCalTypes::c50 * delX};
537-
double dy5[corners] = {HGCalTypes::c75 * delY,
538-
HGCalTypes::c00 * delY,
539-
-HGCalTypes::c75 * delY,
540-
-HGCalTypes::c75 * delY,
541-
HGCalTypes::c00 * delY,
542-
HGCalTypes::c75 * delY};
537+
double dy5[corners] = {HGCalTypes::c75 * delY,
538+
HGCalTypes::c00 * delY,
539+
-HGCalTypes::c75 * delY,
540+
-HGCalTypes::c75 * delY,
541+
HGCalTypes::c00 * delY,
542+
HGCalTypes::c75 * delY};
543543
double dx6[corners] = {-HGCalTypes::c77 * delX,
544544
-HGCalTypes::c10 * delX,
545545
-HGCalTypes::c22 * delX,
@@ -633,13 +633,13 @@ std::pair<int, int> HGCalWaferMask::getTypeMode(const double& xpos,
633633
if ((type == HGCalTypes::WaferThree) && (wType == 0)) {
634634
rpos12 = ((xpos + dx1[rotn]) * (xpos + dx1[rotn]) + (ypos + dy1[rotn]) * (ypos + dy1[rotn]));
635635
if (rpos12 <= rout2 && rpos12 >= rin2) {
636-
rpos22 = ((xpos + dx5[rotn]) * (xpos + dx5[rotn]) + (ypos + dy5[rotn]) * (ypos + dy5[rotn]));
637-
if (rpos22 <= rout2 && rpos22 >= rin2)
638-
type = HGCalTypes::WaferSemi;
636+
rpos22 = ((xpos + dx5[rotn]) * (xpos + dx5[rotn]) + (ypos + dy5[rotn]) * (ypos + dy5[rotn]));
637+
if (rpos22 <= rout2 && rpos22 >= rin2)
638+
type = HGCalTypes::WaferSemi;
639639
}
640640
if (debug)
641-
edm::LogVerbatim("HGCalGeom") << "Test for Semi " << std::sqrt(rpos12) << ":" << std::sqrt(rpos22) << " Type "
642-
<< type;
641+
edm::LogVerbatim("HGCalGeom") << "Test for Semi " << std::sqrt(rpos12) << ":" << std::sqrt(rpos22) << " Type "
642+
<< type;
643643
}
644644
if ((type == HGCalTypes::WaferThree) && (wType == 0)) {
645645
rpos12 = ((xpos + dx3[rotn]) * (xpos + dx3[rotn]) + (ypos + dy3[rotn]) * (ypos + dy3[rotn]));
@@ -662,7 +662,7 @@ std::pair<int, int> HGCalWaferMask::getTypeMode(const double& xpos,
662662
if (rpos22 <= rout2 && rpos22 >= rin2)
663663
type = HGCalTypes::WaferHalf2;
664664
else
665-
rotn = HGCalTypes::WaferCorner0;
665+
rotn = HGCalTypes::WaferCorner0;
666666
}
667667
if (debug)
668668
edm::LogVerbatim("HGCalGeom") << "Test for Half2 " << std::sqrt(rpos12) << ":" << std::sqrt(rpos22) << " Type "
@@ -690,12 +690,12 @@ bool HGCalWaferMask::goodTypeMode(
690690
static constexpr int corner2 = 2 * HGCalTypes::WaferCornerMax;
691691
static constexpr int base = 10;
692692
static constexpr int base2 = 100;
693-
double dx0[corners] = {HGCalTypes::c00 * delX,
694-
HGCalTypes::c10 * delX,
695-
HGCalTypes::c10 * delX,
696-
HGCalTypes::c00 * delX,
697-
-HGCalTypes::c10 * delX,
698-
-HGCalTypes::c10 * delX};
693+
double dx0[corners] = {HGCalTypes::c00 * delX,
694+
HGCalTypes::c10 * delX,
695+
HGCalTypes::c10 * delX,
696+
HGCalTypes::c00 * delX,
697+
-HGCalTypes::c10 * delX,
698+
-HGCalTypes::c10 * delX};
699699
double dy0[corners] = {-HGCalTypes::c10 * delY,
700700
-HGCalTypes::c50 * delY,
701701
HGCalTypes::c50 * delY,
@@ -709,11 +709,11 @@ bool HGCalWaferMask::goodTypeMode(
709709
-HGCalTypes::c10 * delX,
710710
-HGCalTypes::c50 * delX};
711711
double dy1[corners] = {-HGCalTypes::c75 * delY,
712-
HGCalTypes::c00 * delY,
713-
HGCalTypes::c75 * delY,
714-
HGCalTypes::c75 * delY,
715-
HGCalTypes::c00 * delY,
716-
-HGCalTypes::c75 * delY};
712+
HGCalTypes::c00 * delY,
713+
HGCalTypes::c75 * delY,
714+
HGCalTypes::c75 * delY,
715+
HGCalTypes::c00 * delY,
716+
-HGCalTypes::c75 * delY};
717717
double dx2[corner2] = {HGCalTypes::c22 * delX,
718718
HGCalTypes::c77 * delX,
719719
HGCalTypes::c10 * delX,
@@ -917,7 +917,7 @@ bool HGCalWaferMask::goodTypeMode(
917917
}
918918
case (HGCalTypes::WaferFive2): {
919919
static constexpr int nc60[corners] = {450, 150, 201, 312, 423, 534};
920-
static constexpr int nc61[corners] = {601, 803,1005, 7, 209, 411};
920+
static constexpr int nc61[corners] = {601, 803, 1005, 7, 209, 411};
921921
int nc = nc60[rotn];
922922
for (int k1 = 0; k1 < 3; ++k1) {
923923
int k = nc % base;
@@ -948,7 +948,7 @@ bool HGCalWaferMask::goodTypeMode(
948948
}
949949
case (HGCalTypes::WaferHalf2): {
950950
static constexpr int nc70[corners] = {45, 50, 1, 12, 23, 34};
951-
static constexpr int nc71[corners] = {611, 801,1003, 5, 207, 409};
951+
static constexpr int nc71[corners] = {611, 801, 1003, 5, 207, 409};
952952
int nc = nc70[rotn];
953953
for (int k1 = 0; k1 < 2; ++k1) {
954954
int k = nc % base;

0 commit comments

Comments
 (0)