Skip to content

Commit

Permalink
Code check
Browse files Browse the repository at this point in the history
  • Loading branch information
Sunanda committed Dec 12, 2019
1 parent 8e10965 commit a93f717
Showing 1 changed file with 63 additions and 36 deletions.
99 changes: 63 additions & 36 deletions Geometry/HcalAlgo/plugins/dd4hep/DDHCalBarrelAlgo.cc
View file
Expand Up @@ -168,10 +168,12 @@ struct HcalBarrelAlgo {
#ifdef EDM_ML_DEBUG
edm::LogVerbatim("HCalGeom") << "DDHCalBarrelAlgo: General material " << genMaterial << "\tSectors " << nsectors
<< ", " << nsectortot << "\tHalves " << nhalf << "\tRotation matrix " << rotns << ":"
<< rotHalf << "\n\t\t" << convertCmToMm(rinner) << "\t" << convertCmToMm(router) << "\t" << rzones;
<< rotHalf << "\n\t\t" << convertCmToMm(rinner) << "\t" << convertCmToMm(router)
<< "\t" << rzones;
for (int i = 0; i < rzones; i++)
edm::LogVerbatim("HCalGeom") << "\tTheta[" << i << "] = " << theta[i] << "\trmax[" << i << "] = " << convertCmToMm(rmax[i])
<< "\tzoff[" << i << "] = " << convertCmToMm(zoff[i]);
edm::LogVerbatim("HCalGeom") << "\tTheta[" << i << "] = " << theta[i] << "\trmax[" << i
<< "] = " << convertCmToMm(rmax[i]) << "\tzoff[" << i
<< "] = " << convertCmToMm(zoff[i]);
#endif
///////////////////////////////////////////////////////////////
//Layers
Expand All @@ -193,9 +195,10 @@ struct HcalBarrelAlgo {
#ifdef EDM_ML_DEBUG
for (int i = 0; i < nLayers; i++)
edm::LogVerbatim("HCalGeom") << layerLabel[i] << "\t" << layerId[i] << "\t" << layerMat[i] << "\t"
<< convertCmToMm(layerWidth[i]) << "\t" << convertCmToMm(layerD1[i]) << "\t" << convertCmToMm(layerD2[i]) << "\t" << layerAlpha[i]
<< "\t" << convertCmToMm(layerT1[i]) << "\t" << convertCmToMm(layerT2[i]) << "\t" << layerAbsorb[i] << "\t"
<< convertCmToMm(layerGap[i]);
<< convertCmToMm(layerWidth[i]) << "\t" << convertCmToMm(layerD1[i]) << "\t"
<< convertCmToMm(layerD2[i]) << "\t" << layerAlpha[i] << "\t"
<< convertCmToMm(layerT1[i]) << "\t" << convertCmToMm(layerT2[i]) << "\t"
<< layerAbsorb[i] << "\t" << convertCmToMm(layerGap[i]);
#endif

///////////////////////////////////////////////////////////////
Expand All @@ -214,8 +217,8 @@ struct HcalBarrelAlgo {
middleD = args.value<double>("MiddleD");
middleW = args.value<double>("MiddleW");
#ifdef EDM_ML_DEBUG
edm::LogVerbatim("HCalGeom") << "DDHCalBarrelAlgo: Middle material " << middleMat << " d " << convertCmToMm(middleD) << " w "
<< convertCmToMm(middleW);
edm::LogVerbatim("HCalGeom") << "DDHCalBarrelAlgo: Middle material " << middleMat << " d " << convertCmToMm(middleD)
<< " w " << convertCmToMm(middleW);
#endif
midName = args.value<std::vector<std::string> >("MidAbsName");
midMat = args.value<std::vector<std::string> >("MidAbsMat");
Expand All @@ -234,8 +237,8 @@ struct HcalBarrelAlgo {
sideT = args.value<std::vector<double> >("SideT");
#ifdef EDM_ML_DEBUG
for (unsigned int i = 0; i < sideMat.size(); i++)
edm::LogVerbatim("HCalGeom") << "DDHCalBarrelAlgo: Side material " << sideMat[i] << " d " << convertCmToMm(sideD[i]) << " t "
<< convertCmToMm(sideT[i]);
edm::LogVerbatim("HCalGeom") << "DDHCalBarrelAlgo: Side material " << sideMat[i] << " d "
<< convertCmToMm(sideD[i]) << " t " << convertCmToMm(sideT[i]);
#endif
sideAbsName = args.value<std::vector<std::string> >("SideAbsName");
sideAbsMat = args.value<std::vector<std::string> >("SideAbsMat");
Expand Down Expand Up @@ -271,9 +274,12 @@ struct HcalBarrelAlgo {
detPosY = args.value<std::vector<int> >("DetPosY");
#ifdef EDM_ML_DEBUG
for (int i = 0; i < nLayers; i++)
edm::LogVerbatim("HCalGeom") << i + 1 << "\t" << detType[i] << "\t" << convertCmToMm(detdP1[i]) << ", " << convertCmToMm(detdP2[i]) << "\t"
<< convertCmToMm(detT11[i]) << ", " << convertCmToMm(detT12[i]) << "\t" << convertCmToMm(detTsc[i]) << "\t" << convertCmToMm(detT21[i]) << ", "
<< convertCmToMm(detT22[i]) << "\t" << convertCmToMm(detWidth1[i]) << "\t" << convertCmToMm(detWidth2[i]) << "\t" << detPosY[i];
edm::LogVerbatim("HCalGeom") << i + 1 << "\t" << detType[i] << "\t" << convertCmToMm(detdP1[i]) << ", "
<< convertCmToMm(detdP2[i]) << "\t" << convertCmToMm(detT11[i]) << ", "
<< convertCmToMm(detT12[i]) << "\t" << convertCmToMm(detTsc[i]) << "\t"
<< convertCmToMm(detT21[i]) << ", " << convertCmToMm(detT22[i]) << "\t"
<< convertCmToMm(detWidth1[i]) << "\t" << convertCmToMm(detWidth2[i]) << "\t"
<< detPosY[i];
#endif

// idName = parentName.name();
Expand Down Expand Up @@ -363,7 +369,8 @@ struct HcalBarrelAlgo {
<< convertRadToDeg(-alpha + dphi) << " and with " << nsec << " sections ";
for (unsigned int i = 0; i < pgonZHalf.size(); i++)
edm::LogVerbatim("HCalGeom") << "\t"
<< "\tZ = " << convertCmToMm(pgonZHalf[i]) << "\tRmin = " << convertCmToMm(pgonRminHalf[i])
<< "\tZ = " << convertCmToMm(pgonZHalf[i])
<< "\tRmin = " << convertCmToMm(pgonRminHalf[i])
<< "\tRmax = " << convertCmToMm(pgonRmaxHalf[i]);
#endif
}
Expand All @@ -386,7 +393,8 @@ struct HcalBarrelAlgo {
<< convertRadToDeg(-alpha + dphi) << " and with " << nf << " sections ";
for (unsigned int i = 0; i < pgonZHalf.size(); i++)
edm::LogVerbatim("HCalGeom") << "\t"
<< "\tZ = " << convertCmToMm(pgonZHalf[i]) << "\tRmin = " << convertCmToMm(pgonRminHalf[i])
<< "\tZ = " << convertCmToMm(pgonZHalf[i])
<< "\tRmin = " << convertCmToMm(pgonRminHalf[i])
<< "\tRmax = " << convertCmToMm(pgonRmaxHalf[i]);
#endif
dd4hep::Volume genlogich(solid.name(), solid, matter);
Expand All @@ -413,7 +421,8 @@ struct HcalBarrelAlgo {
<< " with 1 sector from " << convertRadToDeg(-alpha) << " to "
<< convertRadToDeg(alpha) << " and with " << nf << " sections";
for (unsigned int i = 0; i < pgonZHalf.size(); i++)
edm::LogVerbatim("HCalGeom") << "\t\tZ = " << convertCmToMm(pgonZHalf[i]) << "\tRmin = " << convertCmToMm(pgonRminHalf[i])
edm::LogVerbatim("HCalGeom") << "\t\tZ = " << convertCmToMm(pgonZHalf[i])
<< "\tRmin = " << convertCmToMm(pgonRminHalf[i])
<< "\tRmax = " << convertCmToMm(pgonRmaxHalf[i]);
#endif

Expand Down Expand Up @@ -515,7 +524,8 @@ struct HcalBarrelAlgo {
alpha1 = atan(width / rmid);
#ifdef EDM_ML_DEBUG
edm::LogVerbatim("HCalGeom") << "\tAlpha_1 modified from " << convertRadToDeg(alpha) << " to "
<< convertRadToDeg(alpha1) << " Rmid " << convertCmToMm(rmid) << " Reduced width " << convertCmToMm(width);
<< convertRadToDeg(alpha1) << " Rmid " << convertCmToMm(rmid) << " Reduced width "
<< convertCmToMm(width);
#endif
}
solid = dd4hep::Polyhedra(ns.prepend(name), 1, -alpha1, 2 * alpha1, pgonZ, pgonRmin, pgonRmax);
Expand All @@ -525,7 +535,8 @@ struct HcalBarrelAlgo {
<< matter.name() << " with 1 sector from " << convertRadToDeg(-alpha1) << " to "
<< convertRadToDeg(alpha1) << " and with " << nsec << " sections";
for (unsigned int k = 0; k < pgonZ.size(); k++)
edm::LogVerbatim("HCalGeom") << "\t\t" << convertCmToMm(pgonZ[k]) << "\t" << convertCmToMm(pgonRmin[k]) << "\t" << convertCmToMm(pgonRmax[k]);
edm::LogVerbatim("HCalGeom") << "\t\t" << convertCmToMm(pgonZ[k]) << "\t" << convertCmToMm(pgonRmin[k]) << "\t"
<< convertCmToMm(pgonRmax[k]);
#endif

seclogic.placeVolume(glog, layerId[i]);
Expand All @@ -548,7 +559,7 @@ struct HcalBarrelAlgo {
rin = rout;
}
}

void constructInsideLayers(dd4hep::Volume& laylog,
const std::string& nm,
int id,
Expand Down Expand Up @@ -596,7 +607,8 @@ struct HcalBarrelAlgo {
solid = dd4hep::Box(ns.prepend(name + "1"), dx, dy, dz);
#ifdef EDM_ML_DEBUG
edm::LogVerbatim("HCalGeom") << "DDHCalBarrelAlgo: " << solid.name() << " Box made of " << matter.name()
<< " of dimensions " << convertCmToMm(dx) << ", " << convertCmToMm(dy) << ", " << convertCmToMm(dz);
<< " of dimensions " << convertCmToMm(dx) << ", " << convertCmToMm(dy) << ", "
<< convertCmToMm(dz);
#endif
glog = dd4hep::Volume(solid.name(), solid, matter);

Expand All @@ -609,9 +621,11 @@ struct HcalBarrelAlgo {
mother.placeVolume(glog, idOffset + 2, dd4hep::Transform3D(rot, r12));
#ifdef EDM_ML_DEBUG
edm::LogVerbatim("HCalGeom") << "DDHCalBarrelAlgo: " << glog.name() << " Number " << idOffset + 1
<< " positioned in " << mother.name() << " at (" << convertCmToMm(x) << "," << convertCmToMm(y) << "," << convertCmToMm(dz) << ") with no rotation\n"
<< " positioned in " << mother.name() << " at (" << convertCmToMm(x) << ","
<< convertCmToMm(y) << "," << convertCmToMm(dz) << ") with no rotation\n"
<< "DDHCalBarrelAlgo: " << glog.name() << " Number " << idOffset + 2
<< " positioned in " << mother.name() << " at (" << convertCmToMm(x) << "," << -convertCmToMm(y) << "," << convertCmToMm(dz) << ") with " << rot;
<< " positioned in " << mother.name() << " at (" << convertCmToMm(x) << ","
<< -convertCmToMm(y) << "," << convertCmToMm(dz) << ") with " << rot;
#endif
//Constructin the plastics and scintillators inside
constructInsideDetectors(glog, nam0 + "1", id, dx, dy, dz, 1, ns);
Expand All @@ -634,7 +648,8 @@ struct HcalBarrelAlgo {
solid = dd4hep::Box(ns.prepend(name + "2"), dx, dy, dz);
#ifdef EDM_ML_DEBUG
edm::LogVerbatim("HCalGeom") << "DDHCalBarrelAlgo: " << solid.name() << " Box made of " << matter.name()
<< " of dimensions " << convertCmToMm(dx) << ", " << convertCmToMm(dy) << ", " << convertCmToMm(dz);
<< " of dimensions " << convertCmToMm(dx) << ", " << convertCmToMm(dy) << ", "
<< convertCmToMm(dz);
#endif
glog = dd4hep::Volume(solid.name(), solid, matter);

Expand All @@ -647,9 +662,11 @@ struct HcalBarrelAlgo {
mother.placeVolume(glog, idOffset + 4, dd4hep::Transform3D(rot, r22));
#ifdef EDM_ML_DEBUG
edm::LogVerbatim("HCalGeom") << "DDHCalBarrelAlgo: " << glog.name() << " Number " << idOffset + 3
<< " positioned in " << mother.name() << " at (" << convertCmToMm(x) << "," << convertCmToMm(dy) << "," << convertCmToMm(dz)
<< ") with no rotation\nDDHCalBarrelAlgo: " << glog.name() << " Number " << idOffset + 4
<< " positioned in " << mother.name() << " at (" << convertCmToMm(x) << "," << -convertCmToMm(dy) << "," << convertCmToMm(dz) << ") with " << rot;
<< " positioned in " << mother.name() << " at (" << convertCmToMm(x) << ","
<< convertCmToMm(dy) << "," << convertCmToMm(dz)
<< ") with no rotation\nDDHCalBarrelAlgo: " << glog.name() << " Number "
<< idOffset + 4 << " positioned in " << mother.name() << " at (" << convertCmToMm(x)
<< "," << -convertCmToMm(dy) << "," << convertCmToMm(dz) << ") with " << rot;
#endif
//Constructin the plastics and scintillators inside
constructInsideDetectors(glog, nam0 + "2", id, dx, dy, dz, 2, ns);
Expand Down Expand Up @@ -687,7 +704,8 @@ struct HcalBarrelAlgo {
<< " with 1 sector from " << convertRadToDeg(-alpha) << " to "
<< convertRadToDeg(alpha) << " and with " << pgonZ.size() << " sections";
for (unsigned int ii = 0; ii < pgonZ.size(); ii++)
edm::LogVerbatim("HCalGeom") << "\t\tZ = " << convertCmToMm(pgonZ[ii]) << "\tRmin = " << convertCmToMm(pgonRmin[ii])
edm::LogVerbatim("HCalGeom") << "\t\tZ = " << convertCmToMm(pgonZ[ii])
<< "\tRmin = " << convertCmToMm(pgonRmin[ii])
<< "\tRmax = " << convertCmToMm(pgonRmax[ii]);
#endif

Expand All @@ -711,7 +729,8 @@ struct HcalBarrelAlgo {
<< " with 1 sector from " << convertRadToDeg(-alpha1) << " to "
<< convertRadToDeg(alpha1) << " and with " << pgonZ.size() << " sections";
for (unsigned int ii = 0; ii < pgonZ.size(); ii++)
edm::LogVerbatim("HCalGeom") << "\t\tZ = " << convertCmToMm(pgonZ[ii]) << "\tRmin = " << convertCmToMm(pgonRmin[ii])
edm::LogVerbatim("HCalGeom") << "\t\tZ = " << convertCmToMm(pgonZ[ii])
<< "\tRmin = " << convertCmToMm(pgonRmin[ii])
<< "\tRmax = " << convertCmToMm(pgonRmax[ii]);
#endif

Expand Down Expand Up @@ -761,7 +780,8 @@ struct HcalBarrelAlgo {
<< " with 1 sector from " << convertRadToDeg(-alpha) << " to "
<< convertRadToDeg(alpha) << " and with " << pgonZ.size() << " sections";
for (unsigned int ii = 0; ii < pgonZ.size(); ii++)
edm::LogVerbatim("HCalGeom") << "\t\tZ = " << convertCmToMm(pgonZ[ii]) << "\tRmin = " << convertCmToMm(pgonRmin[ii])
edm::LogVerbatim("HCalGeom") << "\t\tZ = " << convertCmToMm(pgonZ[ii])
<< "\tRmin = " << convertCmToMm(pgonRmin[ii])
<< "\tRmax = " << convertCmToMm(pgonRmax[ii]);
#endif

Expand All @@ -785,7 +805,8 @@ struct HcalBarrelAlgo {
<< matter1.name() << " with 1 sector from " << convertRadToDeg(-alpha1) << " to "
<< convertRadToDeg(alpha1) << " and with " << pgonZ.size() << " sections";
for (unsigned int ii = 0; ii < pgonZ.size(); ii++)
edm::LogVerbatim("HCalGeom") << "\t\tZ = " << convertCmToMm(pgonZ[ii]) << "\tRmin = " << convertCmToMm(pgonRmin[ii])
edm::LogVerbatim("HCalGeom") << "\t\tZ = " << convertCmToMm(pgonZ[ii])
<< "\tRmin = " << convertCmToMm(pgonRmin[ii])
<< "\tRmax = " << convertCmToMm(pgonRmax[ii]);
#endif

Expand Down Expand Up @@ -816,7 +837,8 @@ struct HcalBarrelAlgo {
<< " with 1 sector from " << convertRadToDeg(-alpha1) << " to "
<< convertRadToDeg(alpha1) << " and with " << pgonZ.size() << " sections";
for (unsigned int ii = 0; ii < pgonZ.size(); ii++)
edm::LogVerbatim("HCalGeom") << "\t\tZ = " << convertCmToMm(pgonZ[ii]) << "\tRmin = " << convertCmToMm(pgonRmin[ii])
edm::LogVerbatim("HCalGeom") << "\t\tZ = " << convertCmToMm(pgonZ[ii])
<< "\tRmin = " << convertCmToMm(pgonRmin[ii])
<< "\tRmax = " << convertCmToMm(pgonRmax[ii]);
#endif

Expand Down Expand Up @@ -846,7 +868,8 @@ struct HcalBarrelAlgo {
<< matter2.name() << " with 1 sector from " << convertRadToDeg(-alpha1) << " to "
<< convertRadToDeg(alpha1) << " and with " << pgonZ.size() << " sections";
for (unsigned int ii = 0; ii < pgonZ.size(); ii++)
edm::LogVerbatim("HCalGeom") << "\t\tZ = " << convertCmToMm(pgonZ[ii]) << "\tRmin = " << convertCmToMm(pgonRmin[ii])
edm::LogVerbatim("HCalGeom") << "\t\tZ = " << convertCmToMm(pgonZ[ii])
<< "\tRmin = " << convertCmToMm(pgonRmin[ii])
<< "\tRmax = " << convertCmToMm(pgonRmax[ii]);
#endif

Expand Down Expand Up @@ -903,7 +926,8 @@ struct HcalBarrelAlgo {
glog = dd4hep::Volume(solid.name(), solid, plmatter);
#ifdef EDM_ML_DEBUG
edm::LogVerbatim("HCalGeom") << "DDHCalBarrelAlgo: " << solid.name() << " Box made of " << plmatter.name()
<< " of dimensions " << convertCmToMm(dx1) << ", " << convertCmToMm(wid) << ", " << convertCmToMm(dz);
<< " of dimensions " << convertCmToMm(dx1) << ", " << convertCmToMm(wid) << ", "
<< convertCmToMm(dz);
#endif

double x = shiftX + dx1 - dx;
Expand All @@ -916,21 +940,24 @@ struct HcalBarrelAlgo {
glog = dd4hep::Volume(solid.name(), solid, scmatter);
#ifdef EDM_ML_DEBUG
edm::LogVerbatim("HCalGeom") << "DDHCalBarrelAlgo: " << solid.name() << " Box made of " << scmatter.name()
<< " of dimensions " << convertCmToMm(0.5 * detTsc[id]) << ", " << convertCmToMm(wid) << ", " << convertCmToMm(dz);
<< " of dimensions " << convertCmToMm(0.5 * detTsc[id]) << ", " << convertCmToMm(wid)
<< ", " << convertCmToMm(dz);
#endif

x += dx1 + 0.5 * detTsc[id];
int copyNo = id * 10 + detType[id];
detector.placeVolume(glog, copyNo, dd4hep::Position(x, y, 0));
#ifdef EDM_ML_DEBUG
edm::LogVerbatim("HCalGeom") << "DDHCalBarrelAlgo: " << glog.name() << " Number " << copyNo << " positioned in "
<< detector.name() << " at (" << convertCmToMm(x) << "," << convertCmToMm(y) << ",0) with no rotation";
<< detector.name() << " at (" << convertCmToMm(x) << "," << convertCmToMm(y)
<< ",0) with no rotation";
#endif
solid = dd4hep::Box(ns.prepend(plname + "2"), dx2, wid, dz);
glog = dd4hep::Volume(solid.name(), solid, plmatter);
#ifdef EDM_ML_DEBUG
edm::LogVerbatim("HCalGeom") << "DDHCalBarrelAlgo: " << solid.name() << " Box made of " << plmatter.name()
<< " of dimensions " << convertCmToMm(dx2) << ", " << convertCmToMm(wid) << ", " << convertCmToMm(dz);
<< " of dimensions " << convertCmToMm(dx2) << ", " << convertCmToMm(wid) << ", "
<< convertCmToMm(dz);
#endif

x += 0.5 * detTsc[id] + dx2;
Expand Down

0 comments on commit a93f717

Please sign in to comment.