Skip to content

Commit 4aa231c

Browse files
author
Sunanda
committed
Code check
1 parent 3981d1f commit 4aa231c

File tree

3 files changed

+36
-25
lines changed

3 files changed

+36
-25
lines changed

‎Geometry/HGCalCommonData/src/HGCalDDDConstants.cc‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,8 @@ std::array<int, 3> HGCalDDDConstants::assignCellTrap(float x, float y, float z,
200200
int irad(-1), iphi(-1), type(-1);
201201
const auto& indx = getIndex(layer, reco);
202202
#ifdef EDM_ML_DEBUG
203-
edm::LogVerbatim("HGCalGeom") << "assignCellTrap: Layer " << layer << ":" << reco << " indx " << indx.first << ":" << indx.second;
203+
edm::LogVerbatim("HGCalGeom") << "assignCellTrap: Layer " << layer << ":" << reco << " indx " << indx.first << ":"
204+
<< indx.second;
204205
#endif
205206
if (indx.first < 0)
206207
return std::array<int, 3>{{irad, iphi, type}};
@@ -1505,7 +1506,8 @@ std::pair<int, int> HGCalDDDConstants::tileType(int layer, int ring, int phi) co
15051506
sipm = ((itr->second).sipm == HGCalTypes::SiPMLarge) ? 0 : 1;
15061507
}
15071508
#ifdef EDM_ML_DEBUG
1508-
edm::LogVerbatim("HGCalGeom") << "tileType::Input layet:ring:phi " << layer << ":" << ring << ":" << phi << " Output Type:SiPM " << type << ":" << sipm;
1509+
edm::LogVerbatim("HGCalGeom") << "tileType::Input layet:ring:phi " << layer << ":" << ring << ":" << phi
1510+
<< " Output Type:SiPM " << type << ":" << sipm;
15091511
#endif
15101512
return std::make_pair(type, sipm);
15111513
}

‎Geometry/HGCalCommonData/test/HGCalConvert.cpp‎

Lines changed: 30 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1774,7 +1774,8 @@ void ConvertScintillatorV1::makeTitle(std::ofstream& fout,
17741774
}
17751775
}
17761776
if (((debug / 100) % 10) > 0)
1777-
std::cout << "Layer Phi Ring " << layer << ":" << phi << ":" << irmin << ":" << irmax << " nphi " << nphis << std::endl;
1777+
std::cout << "Layer Phi Ring " << layer << ":" << phi << ":" << irmin << ":" << irmax << " nphi " << nphis
1778+
<< std::endl;
17781779
if (phi == 1) {
17791780
tile0.layer = layer;
17801781
tile0.rmin = irmin;
@@ -1788,17 +1789,21 @@ void ConvertScintillatorV1::makeTitle(std::ofstream& fout,
17881789
do {
17891790
int phimax = tile0.phimax;
17901791
tile0.phimax = tile0.cassette * tilePhisWord;
1791-
if (((debug / 1000) % 10) > 0)
1792-
std::cout << "1Layer " << tile0.layer << " R " << tile0.rmin << ":" << tile0.rmax << " Cassett " << tile0.cassette << " Phi " << tile0.phimin << ":" << tile0.phimax << " Word " << tilePhisWord << ":" << tile0.phimax << std::endl;
1792+
if (((debug / 1000) % 10) > 0)
1793+
std::cout << "1Layer " << tile0.layer << " R " << tile0.rmin << ":" << tile0.rmax << " Cassett "
1794+
<< tile0.cassette << " Phi " << tile0.phimin << ":" << tile0.phimax << " Word "
1795+
<< tilePhisWord << ":" << tile0.phimax << std::endl;
17931796
zones.push_back(tile0);
17941797
tile0.phimin = tile0.phimax + 1;
17951798
tile0.phimax = phimax;
17961799
++tile0.cassette;
17971800
} while (tile0.cassette * tilePhisWord <= tile0.phimax);
17981801
}
17991802
}
1800-
if (((debug / 1000) % 10) > 0)
1801-
std::cout << "2Layer " << tile0.layer << " R " << tile0.rmin << ":" << tile0.rmax << " Cassett " << tile0.cassette << " Phi " << tile0.phimin << ":" << tile0.phimax << " Word " << tilePhisWord << ":" << tile0.phimax << std::endl;
1803+
if (((debug / 1000) % 10) > 0)
1804+
std::cout << "2Layer " << tile0.layer << " R " << tile0.rmin << ":" << tile0.rmax << " Cassett "
1805+
<< tile0.cassette << " Phi " << tile0.phimin << ":" << tile0.phimax << " Word " << tilePhisWord
1806+
<< ":" << tile0.phimax << std::endl;
18021807
zones.push_back(tile0);
18031808
int cassette = (cassette_ == 0) ? 0 : (1 + ((phi - 1) / tilePhisWord));
18041809
tile0.layer = layer;
@@ -1808,17 +1813,21 @@ void ConvertScintillatorV1::makeTitle(std::ofstream& fout,
18081813
tile0.phimax = phi;
18091814
tile0.cassette = cassette;
18101815
if (phi == nphis) {
1811-
if (((debug / 1000) % 10) > 0)
1812-
std::cout << "3Layer " << tile0.layer << " R " << tile0.rmin << ":" << tile0.rmax << " Cassett " << tile0.cassette << " Phi " << tile0.phimin << ":" << tile0.phimax << " Word " << tilePhisWord << ":" << tile0.phimax << std::endl;
1816+
if (((debug / 1000) % 10) > 0)
1817+
std::cout << "3Layer " << tile0.layer << " R " << tile0.rmin << ":" << tile0.rmax << " Cassett "
1818+
<< tile0.cassette << " Phi " << tile0.phimin << ":" << tile0.phimax << " Word " << tilePhisWord
1819+
<< ":" << tile0.phimax << std::endl;
18131820
zones.push_back(tile0);
1814-
}
1821+
}
18151822
} else {
18161823
tile0.phimax = phi;
18171824
if (phi == nphis) {
1818-
if (((debug / 1000) % 10) > 0)
1819-
std::cout << "4Layer " << tile0.layer << " R " << tile0.rmin << ":" << tile0.rmax << " Cassett " << tile0.cassette << " Phi " << tile0.phimin << ":" << tile0.phimax << " Word " << tilePhisWord << ":" << tile0.phimax << std::endl;
1825+
if (((debug / 1000) % 10) > 0)
1826+
std::cout << "4Layer " << tile0.layer << " R " << tile0.rmin << ":" << tile0.rmax << " Cassett "
1827+
<< tile0.cassette << " Phi " << tile0.phimin << ":" << tile0.phimax << " Word " << tilePhisWord
1828+
<< ":" << tile0.phimax << std::endl;
18201829
zones.push_back(tile0);
1821-
}
1830+
}
18221831
}
18231832
}
18241833
}
@@ -1839,17 +1848,17 @@ void ConvertScintillatorV1::makeTitle(std::ofstream& fout,
18391848
<< " nEntries=" << apost << ringR.size() << apost << ">";
18401849
if ((debug % 10) > 0)
18411850
std::cout << " <Vector name=" << apost << head << "RMin" << apost << " type=" << apost << "numeric" << apost
1842-
<< " nEntries=" << apost << ringR.size() << apost << ">";
1851+
<< " nEntries=" << apost << ringR.size() << apost << ">";
18431852
for (it1 = ringR.begin(); it1 != ringR.end(); ++it1) {
18441853
std::string last = ((l1 + 1) == ringR.size()) ? " " : ",";
18451854
if (l1 % 6 == 0) {
18461855
fout << "\n " << std::setw(8) << std::setprecision(6) << (it1->second).first << "*mm" << last;
1847-
if ((debug % 10) > 0)
1848-
std::cout << "\n " << std::setw(8) << std::setprecision(6) << (it1->second).first << "*mm" << last;
1856+
if ((debug % 10) > 0)
1857+
std::cout << "\n " << std::setw(8) << std::setprecision(6) << (it1->second).first << "*mm" << last;
18491858
} else {
18501859
fout << std::setw(8) << std::setprecision(6) << (it1->second).first << "*mm" << last;
1851-
if ((debug % 10) > 0)
1852-
std::cout << std::setw(8) << std::setprecision(6) << (it1->second).first << "*mm" << last;
1860+
if ((debug % 10) > 0)
1861+
std::cout << std::setw(8) << std::setprecision(6) << (it1->second).first << "*mm" << last;
18531862
}
18541863
++l1;
18551864
}
@@ -1859,18 +1868,18 @@ void ConvertScintillatorV1::makeTitle(std::ofstream& fout,
18591868
if ((debug % 10) > 0) {
18601869
std::cout << "\n </Vector>\n";
18611870
std::cout << " <Vector name=" << apost << head << "RMax" << apost << " type=" << apost << "numeric" << apost
1862-
<< " nEntries=" << apost << ringR.size() << apost << ">";
1871+
<< " nEntries=" << apost << ringR.size() << apost << ">";
18631872
}
18641873
for (it1 = ringR.begin(); it1 != ringR.end(); ++it1) {
18651874
std::string last = ((l2 + 1) == ringR.size()) ? " " : ",";
18661875
if (l2 % 6 == 0) {
18671876
fout << "\n " << std::setw(8) << std::setprecision(6) << (it1->second).second << "*mm" << last;
1868-
if ((debug % 10) > 0)
1869-
std::cout << "\n " << std::setw(8) << std::setprecision(6) << (it1->second).second << "*mm" << last;
1877+
if ((debug % 10) > 0)
1878+
std::cout << "\n " << std::setw(8) << std::setprecision(6) << (it1->second).second << "*mm" << last;
18701879
} else {
18711880
fout << std::setw(8) << std::setprecision(6) << (it1->second).second << "*mm" << last;
1872-
if ((debug % 10) > 0)
1873-
std::cout << std::setw(8) << std::setprecision(6) << (it1->second).second << "*mm" << last;
1881+
if ((debug % 10) > 0)
1882+
std::cout << std::setw(8) << std::setprecision(6) << (it1->second).second << "*mm" << last;
18741883
}
18751884
++l2;
18761885
}
@@ -1948,7 +1957,6 @@ void ConvertScintillatorV1::makeTitle(std::ofstream& fout,
19481957
}
19491958
if ((debug & 10) > 0)
19501959
std::cout << "\n\n";
1951-
19521960
}
19531961

19541962
ConvertNoseV0::ConvertNoseV0(unsigned int layMax1, unsigned int layMax2) : layMax1_(layMax1), layMax2_(layMax2) {

‎SimG4CMS/Calo/src/HGCalNumberingScheme.cc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,8 @@ uint32_t HGCalNumberingScheme::getUnitID(int layer, int module, int cell, int iz
158158
} else if (hgcons_.tileTrapezoid()) {
159159
std::array<int, 3> id = hgcons_.assignCellTrap(pos.x(), pos.y(), pos.z(), layer, false);
160160
#ifdef EDM_ML_DEBUG
161-
edm::LogVerbatim("HGCSim") << "Trapezoid Position Layer " << layer << " Position " << pos.x() << ":" << pos.y() << ":" << pos.z() << " ID " << id[0] << ":" << id[1] << ":" << id[2];
161+
edm::LogVerbatim("HGCSim") << "Trapezoid Position Layer " << layer << " Position " << pos.x() << ":" << pos.y()
162+
<< ":" << pos.z() << " ID " << id[0] << ":" << id[1] << ":" << id[2];
162163
#endif
163164
if (id[2] >= 0) {
164165
std::pair<int, int> typm = hgcons_.tileType(layer, id[0], 0);

0 commit comments

Comments
 (0)