Skip to content

Commit 988e88b

Browse files
author
Sunanda
committed
Code check
1 parent c4157b7 commit 988e88b

File tree

6 files changed

+12
-10
lines changed

6 files changed

+12
-10
lines changed

Geometry/HGCalCommonData/interface/HGCalDDDConstants.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,8 @@ class HGCalDDDConstants {
222222
std::pair<double, double> waferParameters(bool reco) const;
223223
std::pair<double, double> waferPosition(int wafer, bool reco) const;
224224
std::pair<double, double> waferPosition(int lay, int waferU, int waferV, bool reco, bool debug) const;
225-
std::pair<double, double> waferPositionWithCshift(int lay, int waferU, int waferV, bool norot, bool reco, bool debug) const;
225+
std::pair<double, double> waferPositionWithCshift(
226+
int lay, int waferU, int waferV, bool norot, bool reco, bool debug) const;
226227
inline unsigned int waferFileSize() const { return hgpar_->waferInfoMap_.size(); }
227228
int waferFileIndex(unsigned int kk) const;
228229
std::tuple<int, int, int, int> waferFileInfo(unsigned int kk) const;

Geometry/HGCalCommonData/interface/HGCalWaferMask.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class HGCalWaferMask {
6868
const double& xpos,
6969
const double& ypos,
7070
const bool& v17,
71-
const bool& air = false);
71+
const bool& air = false);
7272

7373
static std::array<double, 4> maskCut(
7474
const int& part, const int& place, const double& waferSize, const double& offset, const bool& v17OrLess);

Geometry/HGCalCommonData/plugins/DDHGCalWaferPartialRotated.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ void DDHGCalWaferPartialRotated::execute(DDCompactView& cpv) {
128128
for (unsigned int m = 0; m < placementIndex_.size(); ++m) {
129129
// First the mother
130130
std::string mother = parentName + placementIndexTags_[m] + waferTag_ + tags_[k];
131-
std::vector<std::pair<double, double> > wxy =
132-
HGCalWaferMask::waferXY(partialTypes_[k], placementIndex_[m], waferSize_, 0.0, 0.0, 0.0, (waferMode_ > 0), true);
131+
std::vector<std::pair<double, double> > wxy = HGCalWaferMask::waferXY(
132+
partialTypes_[k], placementIndex_[m], waferSize_, 0.0, 0.0, 0.0, (waferMode_ > 0), true);
133133
std::vector<double> xM, yM;
134134
for (unsigned int i = 0; i < (wxy.size() - 1); ++i) {
135135
xM.emplace_back(wxy[i].first);

Geometry/HGCalCommonData/plugins/dd4hep/DDHGCalWaferPartialRotated.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ static long algorithm(dd4hep::Detector& /* description */, cms::DDParsingContext
8888
// First the mother
8989
std::string mother = parentName + placementIndexTags[m] + waferTag + tags[k];
9090
std::vector<std::pair<double, double>> wxy =
91-
HGCalWaferMask::waferXY(partialTypes[k], placementIndex[m], waferSize, 0.0, 0.0, 0.0, (waferMode > 0), true);
91+
HGCalWaferMask::waferXY(partialTypes[k], placementIndex[m], waferSize, 0.0, 0.0, 0.0, (waferMode > 0), true);
9292
std::vector<double> xM, yM;
9393
for (unsigned int i = 0; i < (wxy.size() - 1); ++i) {
9494
xM.emplace_back(wxy[i].first);

Geometry/HGCalCommonData/src/HGCalDDDConstants.cc

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -933,7 +933,7 @@ std::pair<float, float> HGCalDDDConstants::locateCell(int zside,
933933
int indx = HGCalWaferIndex::waferIndex(lay, waferU, waferV);
934934
auto itr = hgpar_->typesInLayers_.find(indx);
935935
int type = ((itr == hgpar_->typesInLayers_.end()) ? 2 : hgpar_->waferTypeL_[itr->second]);
936-
int fineCoarse = (type == HGCSiliconDetId::HGCalHD120) || (type == HGCSiliconDetId::HGCalHD200)? 0 : 1;
936+
int fineCoarse = (type == HGCSiliconDetId::HGCalHD120) || (type == HGCSiliconDetId::HGCalHD200) ? 0 : 1;
937937
int layertype = layerType(lay);
938938
bool rotx = (norot) ? false : (layertype == HGCalTypes::WaferCenterR);
939939
if (debug) {
@@ -1842,7 +1842,8 @@ void HGCalDDDConstants::waferFromPosition(const double x,
18421842
<< " place " << place << " part " << part;
18431843
}
18441844
}
1845-
bool fineCoarse = ((celltype == HGCSiliconDetId::HGCalHD120) || (celltype == HGCSiliconDetId::HGCalHD200))? 0: 1;
1845+
bool fineCoarse =
1846+
((celltype == HGCSiliconDetId::HGCalHD120) || (celltype == HGCSiliconDetId::HGCalHD200)) ? false : true;
18461847
cellHex(xx, yy, fineCoarse, place, part, cellU, cellV, extend, debug);
18471848
wt = ((((celltype == HGCSiliconDetId::HGCalHD120) || (celltype == HGCSiliconDetId::HGCalHD200)) &&
18481849
(hgpar_->useSimWt_ > 0))
@@ -1931,7 +1932,8 @@ std::pair<double, double> HGCalDDDConstants::waferPosition(
19311932
return xy0;
19321933
}
19331934

1934-
std::pair<double, double> HGCalDDDConstants::waferPositionWithCshift(int lay, int waferU, int waferV, bool norot, bool reco, bool debug) const{
1935+
std::pair<double, double> HGCalDDDConstants::waferPositionWithCshift(
1936+
int lay, int waferU, int waferV, bool norot, bool reco, bool debug) const {
19351937
auto xy_noshift = waferPositionNoRot(lay, waferU, waferV, reco, debug);
19361938
double x = xy_noshift.first;
19371939
double y = xy_noshift.second;
@@ -1955,7 +1957,6 @@ std::pair<double, double> HGCalDDDConstants::waferPositionWithCshift(int lay, in
19551957
return (rotx ? getXY(lay, x, y, false) : std::make_pair(x, y));
19561958
}
19571959

1958-
19591960
int HGCalDDDConstants::waferFileIndex(unsigned int kk) const {
19601961
if (kk < hgpar_->waferInfoMap_.size()) {
19611962
auto itr = hgpar_->waferInfoMap_.begin();

Geometry/HGCalCommonData/src/HGCalWaferMask.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1452,7 +1452,7 @@ std::vector<std::pair<double, double> > HGCalWaferMask::waferXY(const int& part,
14521452
const double& xpos,
14531453
const double& ypos,
14541454
const bool& v17OrLess,
1455-
const bool& air) {
1455+
const bool& air) {
14561456
std::vector<std::pair<double, double> > xy;
14571457
// Good for V17 version and uses partial wafer type & placement index
14581458
#ifdef EDM_ML_DEBUG

0 commit comments

Comments
 (0)