From f1fd834389f6f654156b6f1f44b5a201ff6b84c7 Mon Sep 17 00:00:00 2001 From: Sunanda Date: Wed, 14 Aug 2024 03:52:54 +0200 Subject: [PATCH] Code check --- .../plugins/DDHGCalMixRotatedFineCassette.cc | 4 +- .../dd4hep/DDHGCalMixRotatedFineCassette.cc | 620 +++++++++++------- .../dd4hep/DDHGCalSiliconRotatedCassette.cc | 30 +- 3 files changed, 394 insertions(+), 260 deletions(-) diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalMixRotatedFineCassette.cc b/Geometry/HGCalCommonData/plugins/DDHGCalMixRotatedFineCassette.cc index b9a0f6ae17402..c698429f3007c 100644 --- a/Geometry/HGCalCommonData/plugins/DDHGCalMixRotatedFineCassette.cc +++ b/Geometry/HGCalCommonData/plugins/DDHGCalMixRotatedFineCassette.cc @@ -159,7 +159,9 @@ void DDHGCalMixRotatedFineCassette::initialize(const DDNumericArguments& nArgs, sensitiveMode_ = static_cast(nArgs["SensitiveMode"]); passiveMode_ = static_cast(nArgs["PassiveMode"]); #ifdef EDM_ML_DEBUG - edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette::First Layers " << firstFineLayer_ << ":" << firstCoarseLayer_ << " and Absober:Sensitive mode " << absorbMode_ << ":" << sensitiveMode_ << ":" << passiveMode_; + edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette::First Layers " << firstFineLayer_ << ":" + << firstCoarseLayer_ << " and Absober:Sensitive mode " << absorbMode_ << ":" + << sensitiveMode_ << ":" << passiveMode_; #endif zMinBlock_ = nArgs["zMinBlock"]; waferSize_ = nArgs["waferSize"]; diff --git a/Geometry/HGCalCommonData/plugins/dd4hep/DDHGCalMixRotatedFineCassette.cc b/Geometry/HGCalCommonData/plugins/dd4hep/DDHGCalMixRotatedFineCassette.cc index 31397e5b0089c..a51eb0750852c 100644 --- a/Geometry/HGCalCommonData/plugins/dd4hep/DDHGCalMixRotatedFineCassette.cc +++ b/Geometry/HGCalCommonData/plugins/dd4hep/DDHGCalMixRotatedFineCassette.cc @@ -53,10 +53,10 @@ struct HGCalMixRotatedFineCassette { phiBinsFineScint_ = args.value("NPhiBinFineScint"); #ifdef EDM_ML_DEBUG edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette::Number of types of wafers: " << waferTypes_ - << " passives: " << passiveTypes_ << " facings: " << facingTypes_ - << " Orientations: " << orientationTypes_ << " PartialTypes: " << partialTypes_ - << " PlaceOffset: " << placeOffset_ << "; number of cells along phi " - << phiBinsFineScint_ << ":" << phiBinsScint_; + << " passives: " << passiveTypes_ << " facings: " << facingTypes_ + << " Orientations: " << orientationTypes_ << " PartialTypes: " << partialTypes_ + << " PlaceOffset: " << placeOffset_ << "; number of cells along phi " + << phiBinsFineScint_ << ":" << phiBinsScint_; #endif firstFineLayer_ = args.value("FirstFineLayer"); firstCoarseLayer_ = args.value("FirstCoarseLayer"); @@ -64,7 +64,9 @@ struct HGCalMixRotatedFineCassette { sensitiveMode_ = args.value("SensitiveMode"); passiveMode_ = args.value("PassiveMode"); #ifdef EDM_ML_DEBUG - edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette::First Layers " << firstFineLayer_ << ":" << firstCoarseLayer_ << " and Absober:Sensitive mode " << absorbMode_ << ":" << sensitiveMode_ << ":" << passiveMode_; + edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette::First Layers " << firstFineLayer_ << ":" + << firstCoarseLayer_ << " and Absober:Sensitive mode " << absorbMode_ << ":" + << sensitiveMode_ << ":" << passiveMode_; #endif zMinBlock_ = args.value("zMinBlock"); waferSize_ = args.value("waferSize"); @@ -75,9 +77,9 @@ struct HGCalMixRotatedFineCassette { cosAlpha_ = cos(alpha_); #ifdef EDM_ML_DEBUG edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: zStart " << zMinBlock_ << " wafer width " - << waferSize_ << " separations " << waferSepar_ << " sectors " << sectors_ << ":" - << convertRadToDeg(alpha_) << ":" << cosAlpha_ << " with " << cassettes_ - << " cassettes"; + << waferSize_ << " separations " << waferSepar_ << " sectors " << sectors_ << ":" + << convertRadToDeg(alpha_) << ":" << cosAlpha_ << " with " << cassettes_ + << " cassettes"; #endif slopeB_ = args.value>("SlopeBottom"); zFrontB_ = args.value>("ZFrontBottom"); @@ -87,20 +89,24 @@ struct HGCalMixRotatedFineCassette { rMaxFront_ = args.value>("RMaxFront"); #ifdef EDM_ML_DEBUG for (unsigned int i = 0; i < slopeB_.size(); ++i) - edm::LogVerbatim("HGCalGeom") << "Bottom Block [" << i << "] Zmin " << zFrontB_[i] << " Rmin " << rMinFront_[i] << " Slope " << slopeB_[i]; + edm::LogVerbatim("HGCalGeom") << "Bottom Block [" << i << "] Zmin " << zFrontB_[i] << " Rmin " << rMinFront_[i] + << " Slope " << slopeB_[i]; for (unsigned int i = 0; i < slopeT_.size(); ++i) - edm::LogVerbatim("HGCalGeom") << "Top Block [" << i << "] Zmin " << zFrontT_[i] << " Rmax " << rMaxFront_[i] << " Slope " << slopeT_[i]; + edm::LogVerbatim("HGCalGeom") << "Top Block [" << i << "] Zmin " << zFrontT_[i] << " Rmax " << rMaxFront_[i] + << " Slope " << slopeT_[i]; #endif waferFull_ = args.value>("WaferNamesFull"); waferPart_ = args.value>("WaferNamesPartial"); #ifdef EDM_ML_DEBUG - edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: " << waferFull_.size() << " full and " << waferPart_.size() << " partial modules\nDDHGCalMixRotatedFineCassette:Full Modules:"; + edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: " << waferFull_.size() << " full and " + << waferPart_.size() + << " partial modules\nDDHGCalMixRotatedFineCassette:Full Modules:"; unsigned int i1max = static_cast(waferFull_.size()); for (unsigned int i1 = 0; i1 < i1max; i1 += 2) { std::ostringstream st1; unsigned int i2 = std::min((i1 + 2), i1max); for (unsigned int i = i1; i < i2; ++i) - st1 << " [" << i << "] " << waferFull_[i]; + st1 << " [" << i << "] " << waferFull_[i]; edm::LogVerbatim("HGCalGeom") << st1.str(); } edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Partial Modules:"; @@ -109,20 +115,21 @@ struct HGCalMixRotatedFineCassette { std::ostringstream st1; unsigned int i2 = std::min((i1 + 2), i1max); for (unsigned int i = i1; i < i2; ++i) - st1 << " [" << i << "] " << waferPart_[i]; + st1 << " [" << i << "] " << waferPart_[i]; edm::LogVerbatim("HGCalGeom") << st1.str(); } #endif passiveFull_ = args.value>("PassiveNamesFull"); passivePart_ = args.value>("PassiveNamesPartial"); #ifdef EDM_ML_DEBUG - edm::LogVerbatim("HGCalGeom") << "DDHGCalSiliconRotatedCassette: " << passiveFull_.size() << " full and " << passivePart_.size() << " partial passive modules"; + edm::LogVerbatim("HGCalGeom") << "DDHGCalSiliconRotatedCassette: " << passiveFull_.size() << " full and " + << passivePart_.size() << " partial passive modules"; i1max = static_cast(passiveFull_.size()); for (unsigned int i1 = 0; i1 < i1max; i1 += 2) { std::ostringstream st1; unsigned int i2 = std::min((i1 + 2), i1max); for (unsigned int i = i1; i < i2; ++i) - st1 << " [" << i << "] " << passiveFull_[i]; + st1 << " [" << i << "] " << passiveFull_[i]; edm::LogVerbatim("HGCalGeom") << st1.str(); } edm::LogVerbatim("HGCalGeom") << "DDHGCalSiliconRotatedCassette: Partial Modules:"; @@ -131,7 +138,7 @@ struct HGCalMixRotatedFineCassette { std::ostringstream st1; unsigned int i2 = std::min((i1 + 2), i1max); for (unsigned int i = i1; i < i2; ++i) - st1 << " [" << i << "] " << passivePart_[i]; + st1 << " [" << i << "] " << passivePart_[i]; edm::LogVerbatim("HGCalGeom") << st1.str(); } #endif @@ -142,14 +149,16 @@ struct HGCalMixRotatedFineCassette { #ifdef EDM_ML_DEBUG edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: " << materials_.size() << " types of volumes"; for (unsigned int i = 0; i < names_.size(); ++i) - edm::LogVerbatim("HGCalGeom") << "Volume [" << i << "] " << names_[i] << " of thickness " << thick_[i] << " filled with " << materials_[i] << " first copy number " << copyNumber_[i]; + edm::LogVerbatim("HGCalGeom") << "Volume [" << i << "] " << names_[i] << " of thickness " << thick_[i] + << " filled with " << materials_[i] << " first copy number " << copyNumber_[i]; #endif layers_ = args.value>("Layers"); layerThick_ = args.value>("LayerThick"); #ifdef EDM_ML_DEBUG edm::LogVerbatim("HGCalGeom") << "There are " << layers_.size() << " blocks"; for (unsigned int i = 0; i < layers_.size(); ++i) - edm::LogVerbatim("HGCalGeom") << "Block [" << i << "] of thickness " << layerThick_[i] << " with " << layers_[i] << " layers"; + edm::LogVerbatim("HGCalGeom") << "Block [" << i << "] of thickness " << layerThick_[i] << " with " << layers_[i] + << " layers"; #endif layerType_ = args.value>("LayerType"); layerSense_ = args.value>("LayerSense"); @@ -162,13 +171,14 @@ struct HGCalMixRotatedFineCassette { #endif if (firstFineLayer_ > 0) { for (unsigned int i = 0; i < layerType_.size(); ++i) { - if (layerSense_[i] != 0) { - int ii = layerType_[i]; - copyNumber_[ii] = firstFineLayer_; + if (layerSense_[i] != 0) { + int ii = layerType_[i]; + copyNumber_[ii] = firstFineLayer_; #ifdef EDM_ML_DEBUG - edm::LogVerbatim("HGCalGeom") << "First copy number for layer type " << i << ":" << ii << " with " << materials_[ii] << " changed to " << copyNumber_[ii]; + edm::LogVerbatim("HGCalGeom") << "First copy number for layer type " << i << ":" << ii << " with " + << materials_[ii] << " changed to " << copyNumber_[ii]; #endif - } + } } } else { firstFineLayer_ = 1; @@ -176,7 +186,8 @@ struct HGCalMixRotatedFineCassette { #ifdef EDM_ML_DEBUG edm::LogVerbatim("HGCalGeom") << "There are " << layerType_.size() << " layers"; for (unsigned int i = 0; i < layerType_.size(); ++i) - edm::LogVerbatim("HGCalGeom") << "Layer [" << i << "] with material type " << layerType_[i] << " sensitive class " << layerSense_[i]; + edm::LogVerbatim("HGCalGeom") << "Layer [" << i << "] with material type " << layerType_[i] << " sensitive class " + << layerSense_[i]; #endif materialTop_ = args.value>("TopMaterialNames"); namesTop_ = args.value>("TopVolumeNames"); @@ -186,9 +197,12 @@ struct HGCalMixRotatedFineCassette { coverTypeTop_ = args.value("TopCoverLayerType"); copyNumberCoverTop_ = firstFineLayer_; #ifdef EDM_ML_DEBUG - edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: " << materialTop_.size() << " types of volumes in the top part; cover Type " << coverTypeTop_ << " with initial copy number " << copyNumberCoverTop_; + edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: " << materialTop_.size() + << " types of volumes in the top part; cover Type " << coverTypeTop_ + << " with initial copy number " << copyNumberCoverTop_; for (unsigned int i = 0; i < materialTop_.size(); ++i) - edm::LogVerbatim("HGCalGeom") << "Volume [" << i << "] " << namesTop_[i] << " of thickness " << layerThickTop_[i] << " filled with " << materialTop_[i] << " first copy number " << copyNumberTop_[i]; + edm::LogVerbatim("HGCalGeom") << "Volume [" << i << "] " << namesTop_[i] << " of thickness " << layerThickTop_[i] + << " filled with " << materialTop_[i] << " first copy number " << copyNumberTop_[i]; edm::LogVerbatim("HGCalGeom") << "There are " << layerTypeTop_.size() << " layers in the top part"; for (unsigned int i = 0; i < layerTypeTop_.size(); ++i) edm::LogVerbatim("HGCalGeom") << "Layer [" << i << "] with material type " << layerTypeTop_[i]; @@ -198,24 +212,26 @@ struct HGCalMixRotatedFineCassette { waferLayerStart_ = args.value>("WaferLayerStart"); cassetteShift_ = args.value>("CassetteShift"); #ifdef EDM_ML_DEBUG - edm::LogVerbatim("HGCalGeom") << "waferProperties with " << waferIndex_.size() << " entries in " << waferLayerStart_.size() << " layers"; + edm::LogVerbatim("HGCalGeom") << "waferProperties with " << waferIndex_.size() << " entries in " + << waferLayerStart_.size() << " layers"; for (unsigned int k = 0; k < waferLayerStart_.size(); ++k) - edm::LogVerbatim("HGCalGeom") << "LayerStart[" << k << "] " << waferLayerStart_[k]; + edm::LogVerbatim("HGCalGeom") << "LayerStart[" << k << "] " << waferLayerStart_[k]; for (unsigned int k = 0; k < waferIndex_.size(); ++k) edm::LogVerbatim("HGCalGeom") << "[" << k << "] " << waferIndex_[k] << " (" - << HGCalWaferIndex::waferLayer(waferIndex_[k]) << ", " - << HGCalWaferIndex::waferU(waferIndex_[k]) << ", " - << HGCalWaferIndex::waferV(waferIndex_[k]) << ") : (" - << HGCalProperty::waferThick(waferProperty_[k]) << ":" - << HGCalProperty::waferPartial(waferProperty_[k]) << ":" - << HGCalProperty::waferOrient(waferProperty_[k]) << ")"; - edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: " << cassetteShift_.size() << " elements for cassette shifts"; + << HGCalWaferIndex::waferLayer(waferIndex_[k]) << ", " + << HGCalWaferIndex::waferU(waferIndex_[k]) << ", " + << HGCalWaferIndex::waferV(waferIndex_[k]) << ") : (" + << HGCalProperty::waferThick(waferProperty_[k]) << ":" + << HGCalProperty::waferPartial(waferProperty_[k]) << ":" + << HGCalProperty::waferOrient(waferProperty_[k]) << ")"; + edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: " << cassetteShift_.size() + << " elements for cassette shifts"; unsigned int j1max = cassetteShift_.size(); for (unsigned int j1 = 0; j1 < j1max; j1 += 6) { std::ostringstream st1; unsigned int j2 = std::min((j1 + 6), j1max); for (unsigned int j = j1; j < j2; ++j) - st1 << " [" << j << "] " << std::setw(9) << cassetteShift_[j]; + st1 << " [" << j << "] " << std::setw(9) << cassetteShift_[j]; edm::LogVerbatim("HGCalGeom") << st1.str(); } #endif @@ -230,30 +246,33 @@ struct HGCalMixRotatedFineCassette { tileCoarsePhis_ = args.value>("TilePhiRange"); tileCoarseLayerStart_ = args.value>("TileLayerStart"); #ifdef EDM_ML_DEBUG - edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette:: with " << tileFineRMin_.size() << ":" << tileCoarseRMin_.size() << " rings"; + edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette:: with " << tileFineRMin_.size() << ":" + << tileCoarseRMin_.size() << " rings"; for (unsigned int k = 0; k < tileFineRMin_.size(); ++k) edm::LogVerbatim("HGCalGeom") << "Fine Ring[" << k << "] " << tileFineRMin_[k] << " : " << tileFineRMax_[k]; for (unsigned int k = 0; k < tileCoarseRMin_.size(); ++k) edm::LogVerbatim("HGCalGeom") << "Coarse Ring[" << k << "] " << tileCoarseRMin_[k] << " : " << tileCoarseRMax_[k]; - edm::LogVerbatim("HGCalGeom") << "TileProperties with " << tileFineIndex_.size() << ":" << tileCoarseIndex_.size() << " entries in " << tileFineLayerStart_.size() << ":" << tileCoarseLayerStart_.size() << " layers"; + edm::LogVerbatim("HGCalGeom") << "TileProperties with " << tileFineIndex_.size() << ":" << tileCoarseIndex_.size() + << " entries in " << tileFineLayerStart_.size() << ":" << tileCoarseLayerStart_.size() + << " layers"; for (unsigned int k = 0; k < tileFineLayerStart_.size(); ++k) edm::LogVerbatim("HGCalGeom") << "FineLayerStart[" << k << "] " << tileFineLayerStart_[k]; for (unsigned int k = 0; k < tileCoarseLayerStart_.size(); ++k) edm::LogVerbatim("HGCalGeom") << "CoarseLayerStart[" << k << "] " << tileCoarseLayerStart_[k]; for (unsigned int k = 0; k < tileFineIndex_.size(); ++k) edm::LogVerbatim("HGCalGeom") << "[" << k << "] " << tileFineIndex_[k] << " (" - << "Layer " << std::get<0>(HGCalTileIndex::tileUnpack(tileFineIndex_[k])) << " Ring " - << std::get<1>(HGCalTileIndex::tileUnpack(tileFineIndex_[k])) << ":" - << std::get<2>(HGCalTileIndex::tileUnpack(tileFineIndex_[k])) << ") Phi " - << std::get<1>(HGCalTileIndex::tileUnpack(tileFinePhis_[k])) << ":" - << std::get<2>(HGCalTileIndex::tileUnpack(tileFinePhis_[k])); + << "Layer " << std::get<0>(HGCalTileIndex::tileUnpack(tileFineIndex_[k])) + << " Ring " << std::get<1>(HGCalTileIndex::tileUnpack(tileFineIndex_[k])) << ":" + << std::get<2>(HGCalTileIndex::tileUnpack(tileFineIndex_[k])) << ") Phi " + << std::get<1>(HGCalTileIndex::tileUnpack(tileFinePhis_[k])) << ":" + << std::get<2>(HGCalTileIndex::tileUnpack(tileFinePhis_[k])); for (unsigned int k = 0; k < tileCoarseIndex_.size(); ++k) edm::LogVerbatim("HGCalGeom") << "[" << k << "] " << tileCoarseIndex_[k] << " (" - << "Layer " << std::get<0>(HGCalTileIndex::tileUnpack(tileCoarseIndex_[k])) - << " Ring " << std::get<1>(HGCalTileIndex::tileUnpack(tileCoarseIndex_[k])) << ":" - << std::get<2>(HGCalTileIndex::tileUnpack(tileCoarseIndex_[k])) << ") Phi " - << std::get<1>(HGCalTileIndex::tileUnpack(tileCoarsePhis_[k])) << ":" - << std::get<2>(HGCalTileIndex::tileUnpack(tileCoarsePhis_[k])); + << "Layer " << std::get<0>(HGCalTileIndex::tileUnpack(tileCoarseIndex_[k])) + << " Ring " << std::get<1>(HGCalTileIndex::tileUnpack(tileCoarseIndex_[k])) << ":" + << std::get<2>(HGCalTileIndex::tileUnpack(tileCoarseIndex_[k])) << ") Phi " + << std::get<1>(HGCalTileIndex::tileUnpack(tileCoarsePhis_[k])) << ":" + << std::get<2>(HGCalTileIndex::tileUnpack(tileCoarsePhis_[k])); #endif std::vector retract = args.value>("ScintRetract"); double dphi = M_PI / cassettes_; @@ -268,7 +287,7 @@ struct HGCalMixRotatedFineCassette { std::ostringstream st1; unsigned int j2 = std::min((j1 + 6), j2max); for (unsigned int j = j1; j < j2; ++j) - st1 << " [" << j << "] " << std::setw(9) << cassetteShiftScnt_[j]; + st1 << " [" << j << "] " << std::setw(9) << cassetteShiftScnt_[j]; edm::LogVerbatim("HGCalGeom") << st1.str(); } #endif @@ -295,74 +314,101 @@ struct HGCalMixRotatedFineCassette { double thickTot(0); bool fine = (i < fineLayers) ? true : false; for (int ly = laymin; ly < laymax; ++ly) { - int ii = layerType_[ly]; - int copy = copyNumber_[ii]; - double hthick = 0.5 * thick_[ii]; - double rinB = HGCalGeomTools::radius(zo, zFrontB_, rMinFront_, slopeB_); - zz += hthick; - thickTot += thick_[ii]; + int ii = layerType_[ly]; + int copy = copyNumber_[ii]; + double hthick = 0.5 * thick_[ii]; + double rinB = HGCalGeomTools::radius(zo, zFrontB_, rMinFront_, slopeB_); + zz += hthick; + thickTot += thick_[ii]; - std::string name = names_[ii] + std::to_string(copy); + std::string name = names_[ii] + std::to_string(copy); #ifdef EDM_ML_DEBUG - edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Layer " << ly << ":" << ii << " Front " << cms::convert2mm(zi) << ", " << cms::convert2mm(routF) << " Back " << cms::convert2mm(zo) << ", " << cms::convert2mm(rinB) << " superlayer thickness " << layerThick_[i]; + edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Layer " << ly << ":" << ii << " Front " + << cms::convert2mm(zi) << ", " << cms::convert2mm(routF) << " Back " + << cms::convert2mm(zo) << ", " << cms::convert2mm(rinB) + << " superlayer thickness " << layerThick_[i]; #endif dd4hep::Material matter = ns.material(materials_[ii]); dd4hep::Volume glog; - if (layerSense_[ly] == 0) { - std::vector pgonZ, pgonRin, pgonRout; - double rmax = (std::min(routF, HGCalGeomTools::radius(zz + hthick, zFrontT_, rMaxFront_, slopeT_)) * cosAlpha_) - tol1; - HGCalGeomTools::radius(zz - hthick, zz + hthick, zFrontB_, rMinFront_, slopeB_, zFrontT_, rMaxFront_, slopeT_, -layerSense_[ly], pgonZ, pgonRin, pgonRout); - for (unsigned int isec = 0; isec < pgonZ.size(); ++isec) { - pgonZ[isec] -= zz; - if (layerSense_[ly] == 0 || absorbMode_ == 0) - pgonRout[isec] = rmax; - else - pgonRout[isec] = pgonRout[isec] * cosAlpha_ - tol1; - } + if (layerSense_[ly] == 0) { + std::vector pgonZ, pgonRin, pgonRout; + double rmax = + (std::min(routF, HGCalGeomTools::radius(zz + hthick, zFrontT_, rMaxFront_, slopeT_)) * cosAlpha_) - tol1; + HGCalGeomTools::radius(zz - hthick, + zz + hthick, + zFrontB_, + rMinFront_, + slopeB_, + zFrontT_, + rMaxFront_, + slopeT_, + -layerSense_[ly], + pgonZ, + pgonRin, + pgonRout); + for (unsigned int isec = 0; isec < pgonZ.size(); ++isec) { + pgonZ[isec] -= zz; + if (layerSense_[ly] == 0 || absorbMode_ == 0) + pgonRout[isec] = rmax; + else + pgonRout[isec] = pgonRout[isec] * cosAlpha_ - tol1; + } dd4hep::Solid solid = dd4hep::Polyhedra(sectors_, -alpha_, 2._pi, pgonZ, pgonRin, pgonRout); ns.addSolidNS(ns.prepend(name), solid); glog = dd4hep::Volume(solid.name(), solid, matter); ns.addVolumeNS(glog); #ifdef EDM_ML_DEBUG - edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: " << solid.name() << " polyhedra of " << sectors_ << " sectors covering " << convertRadToDeg(-alpha_) << ":" << convertRadToDeg(-alpha_ + 2._pi) << " with " << pgonZ.size() << " sections"; - for (unsigned int k = 0; k < pgonZ.size(); ++k) - edm::LogVerbatim("HGCalGeom") << "[" << k << "] z " << cms::convert2mm(pgonZ[k]) << " R " << cms::convert2mm(pgonRin[k]) << ":" << cms::convert2mm(pgonRout[k]); -#endif - } else { - int mode = (layerSense_[ly] > 0) ? sensitiveMode_ : absorbMode_; - double rins = (mode < 1) ? rinB : HGCalGeomTools::radius(zz + hthick, zFrontB_, rMinFront_, slopeB_); - double routs = (mode < 1) ? routF : HGCalGeomTools::radius(zz - hthick, zFrontT_, rMaxFront_, slopeT_); + edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: " << solid.name() << " polyhedra of " + << sectors_ << " sectors covering " << convertRadToDeg(-alpha_) << ":" + << convertRadToDeg(-alpha_ + 2._pi) << " with " << pgonZ.size() << " sections"; + for (unsigned int k = 0; k < pgonZ.size(); ++k) + edm::LogVerbatim("HGCalGeom") << "[" << k << "] z " << cms::convert2mm(pgonZ[k]) << " R " + << cms::convert2mm(pgonRin[k]) << ":" << cms::convert2mm(pgonRout[k]); +#endif + } else { + int mode = (layerSense_[ly] > 0) ? sensitiveMode_ : absorbMode_; + double rins = (mode < 1) ? rinB : HGCalGeomTools::radius(zz + hthick, zFrontB_, rMinFront_, slopeB_); + double routs = (mode < 1) ? routF : HGCalGeomTools::radius(zz - hthick, zFrontT_, rMaxFront_, slopeT_); dd4hep::Solid solid = dd4hep::Tube(rins, routs, hthick, 0.0, 2._pi); ns.addSolidNS(ns.prepend(name), solid); glog = dd4hep::Volume(solid.name(), solid, matter); ns.addVolumeNS(glog); #ifdef EDM_ML_DEBUG - edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: " << solid.name() << " Tubs made of " << matter.name() << " of dimensions " << cms::convert2mm(rinB) << ":" << cms::convert2mm(rins) << ", " << cms::convert2mm(routF) << ":" << cms::convert2mm(routs) << ", " << cms::convert2mm(hthick) << ", 0.0, 360.0 and positioned in: " << glog.name() << " number " << copy; + edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: " << solid.name() << " Tubs made of " + << matter.name() << " of dimensions " << cms::convert2mm(rinB) << ":" + << cms::convert2mm(rins) << ", " << cms::convert2mm(routF) << ":" + << cms::convert2mm(routs) << ", " << cms::convert2mm(hthick) + << ", 0.0, 360.0 and positioned in: " << glog.name() << " number " << copy; #endif - positionMix(ctxt, e, glog, name, copy, thick_[ii], matter, -layerSense_[ly], fine); - } - dd4hep::Position r1(0, 0, zz); + positionMix(ctxt, e, glog, name, copy, thick_[ii], matter, -layerSense_[ly], fine); + } + dd4hep::Position r1(0, 0, zz); mother.placeVolume(glog, copy, r1); - ++copyNumber_[ii]; + ++copyNumber_[ii]; #ifdef EDM_ML_DEBUG - edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: " << glog.name() << " number " << copy << " positioned in " << mother.name() << " at (0,0," << cms::convert2mm(zz) << ") with no rotation"; + edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: " << glog.name() << " number " << copy + << " positioned in " << mother.name() << " at (0,0," << cms::convert2mm(zz) + << ") with no rotation"; #endif - zz += hthick; + zz += hthick; } // End of loop over layers in a block zi = zo; laymin = laymax; // Make consistency check of all the partitions of the block if (std::abs(thickTot - layerThick_[i]) >= tol2_) { - if (thickTot > layerThick_[i]) { - edm::LogError("HGCalGeom") << "Thickness of the partition " << cms::convert2mm(layerThick_[i]) << " is smaller than " << cms::convert2mm(thickTot) << ": thickness of all its components **** ERROR ****"; - } else { - edm::LogWarning("HGCalGeom") << "Thickness of the partition " << cms::convert2mm(layerThick_[i]) << " does not match with " << cms::convert2mm(thickTot) << " of the components"; - } + if (thickTot > layerThick_[i]) { + edm::LogError("HGCalGeom") << "Thickness of the partition " << cms::convert2mm(layerThick_[i]) + << " is smaller than " << cms::convert2mm(thickTot) + << ": thickness of all its components **** ERROR ****"; + } else { + edm::LogWarning("HGCalGeom") << "Thickness of the partition " << cms::convert2mm(layerThick_[i]) + << " does not match with " << cms::convert2mm(thickTot) << " of the components"; + } } } // End of loop over blocks #ifdef EDM_ML_DEBUG edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: " << copies_.size() - << " different wafer copy numbers"; + << " different wafer copy numbers"; int k(0); for (std::unordered_set::const_iterator itr = copies_.begin(); itr != copies_.end(); ++itr, ++k) { edm::LogVerbatim("HGCalGeom") << "Copy [" << k << "] : " << (*itr); @@ -371,8 +417,16 @@ struct HGCalMixRotatedFineCassette { edm::LogVerbatim("HGCalGeom") << "<<== End of DDHGCalMixRotatedFineCassette construction..."; #endif } - - void positionMix(cms::DDParsingContext& ctxt, xml_h e, const dd4hep::Volume& glog, const std::string& nameM, int copyM, double thick, const dd4hep::Material& matter, int absType, bool fine) { + + void positionMix(cms::DDParsingContext& ctxt, + xml_h e, + const dd4hep::Volume& glog, + const std::string& nameM, + int copyM, + double thick, + const dd4hep::Material& matter, + int absType, + bool fine) { cms::DDNamespace ns(ctxt, e, true); // Make the top part first @@ -385,68 +439,92 @@ struct HGCalMixRotatedFineCassette { double thickTot(0), zpos(-hthick); if (absType < 0) { for (unsigned int ly = 0; ly < layerTypeTop_.size(); ++ly) { - int ii = layerTypeTop_[ly]; - int copy = copyNumberTop_[ii]; - int layer = (fine) ? (copy - firstFineLayer_) : (copy - firstCoarseLayer_); - double hthickl = 0.5 * layerThickTop_[ii]; - thickTot += layerThickTop_[ii]; - zpos += hthickl; + int ii = layerTypeTop_[ly]; + int copy = copyNumberTop_[ii]; + int layer = (fine) ? (copy - firstFineLayer_) : (copy - firstCoarseLayer_); + double hthickl = 0.5 * layerThickTop_[ii]; + thickTot += layerThickTop_[ii]; + zpos += hthickl; dd4hep::Material matter1 = ns.material(materialTop_[ii]); - unsigned int k = 0; - int firstTile = (fine) ? tileFineLayerStart_[layer] : tileCoarseLayerStart_[layer]; - int lastTile = (fine) ? ((layer + 1 < static_cast(tileFineLayerStart_.size())) ? tileFineLayerStart_[layer + 1] : static_cast(tileFineIndex_.size())) : ((layer + 1 < static_cast(tileCoarseLayerStart_.size())) ? tileCoarseLayerStart_[layer + 1] : static_cast(tileCoarseIndex_.size())); -#ifdef EDM_ML_DEBUG - edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Layer " << ly << ":" << ii << " Copy " << copy << " Tiles " << firstTile << ":" << lastTile; -#endif - for (int ti = firstTile; ti < lastTile; ++ti) { - double r1, r2; - int cassette, fimin, fimax; - if (fine) { - r1 = tileFineRMin_[std::get<1>(HGCalTileIndex::tileUnpack(tileFineIndex_[ti])) - 1]; - r2 = tileFineRMax_[std::get<2>(HGCalTileIndex::tileUnpack(tileFineIndex_[ti])) - 1]; - cassette = std::get<0>(HGCalTileIndex::tileUnpack(tileFinePhis_[ti])); - fimin = std::get<1>(HGCalTileIndex::tileUnpack(tileFinePhis_[ti])); - fimax = std::get<2>(HGCalTileIndex::tileUnpack(tileFinePhis_[ti])); - } else { - r1 = tileCoarseRMin_[std::get<1>(HGCalTileIndex::tileUnpack(tileCoarseIndex_[ti])) - 1]; - r2 = tileCoarseRMax_[std::get<2>(HGCalTileIndex::tileUnpack(tileCoarseIndex_[ti])) - 1]; - cassette = std::get<0>(HGCalTileIndex::tileUnpack(tileCoarsePhis_[ti])); - fimin = std::get<1>(HGCalTileIndex::tileUnpack(tileCoarsePhis_[ti])); - fimax = std::get<2>(HGCalTileIndex::tileUnpack(tileCoarsePhis_[ti])); - } - double phi1 = dphi * (fimin - 1); - double phi2 = dphi * (fimax - fimin + 1); - auto cshift = cassette_.getShift(layer + 1, 1, cassette, true); -#ifdef EDM_ML_DEBUG - int cassette0 = HGCalCassette::cassetteType(2, 1, cassette); // - int ir1 = (fine) ? std::get<1>(HGCalTileIndex::tileUnpack(tileFineIndex_[ti])) : std::get<1>(HGCalTileIndex::tileUnpack(tileCoarseIndex_[ti])); - int ir2 = (fine) ? std::get<2>(HGCalTileIndex::tileUnpack(tileFineIndex_[ti])) : std::get<2>(HGCalTileIndex::tileUnpack(tileCoarseIndex_[ti])); - edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Layer " << copy << ":" << (layer + 1) << " iR " << ir1 << ":" << ir2 << " R " << cms::convert2mm(r1) << ":" << cms::convert2mm(r2) << " Thick " << cms::convert2mm(2.0 * hthickl) << " phi " << fimin << ":" << fimax << ":" << convertRadToDeg(phi1) << ":" << convertRadToDeg(phi2) << " cassette " << cassette << ":" << cassette0 << " Shift " << cms::convert2mm(cshift.first) << ":" << cms::convert2mm(cshift.second); -#endif - std::string name = namesTop_[ii] + "L" + std::to_string(copy) + "F" + std::to_string(k); - ++k; + unsigned int k = 0; + int firstTile = (fine) ? tileFineLayerStart_[layer] : tileCoarseLayerStart_[layer]; + int lastTile = (fine) ? ((layer + 1 < static_cast(tileFineLayerStart_.size())) + ? tileFineLayerStart_[layer + 1] + : static_cast(tileFineIndex_.size())) + : ((layer + 1 < static_cast(tileCoarseLayerStart_.size())) + ? tileCoarseLayerStart_[layer + 1] + : static_cast(tileCoarseIndex_.size())); +#ifdef EDM_ML_DEBUG + edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Layer " << ly << ":" << ii << " Copy " << copy + << " Tiles " << firstTile << ":" << lastTile; +#endif + for (int ti = firstTile; ti < lastTile; ++ti) { + double r1, r2; + int cassette, fimin, fimax; + if (fine) { + r1 = tileFineRMin_[std::get<1>(HGCalTileIndex::tileUnpack(tileFineIndex_[ti])) - 1]; + r2 = tileFineRMax_[std::get<2>(HGCalTileIndex::tileUnpack(tileFineIndex_[ti])) - 1]; + cassette = std::get<0>(HGCalTileIndex::tileUnpack(tileFinePhis_[ti])); + fimin = std::get<1>(HGCalTileIndex::tileUnpack(tileFinePhis_[ti])); + fimax = std::get<2>(HGCalTileIndex::tileUnpack(tileFinePhis_[ti])); + } else { + r1 = tileCoarseRMin_[std::get<1>(HGCalTileIndex::tileUnpack(tileCoarseIndex_[ti])) - 1]; + r2 = tileCoarseRMax_[std::get<2>(HGCalTileIndex::tileUnpack(tileCoarseIndex_[ti])) - 1]; + cassette = std::get<0>(HGCalTileIndex::tileUnpack(tileCoarsePhis_[ti])); + fimin = std::get<1>(HGCalTileIndex::tileUnpack(tileCoarsePhis_[ti])); + fimax = std::get<2>(HGCalTileIndex::tileUnpack(tileCoarsePhis_[ti])); + } + double phi1 = dphi * (fimin - 1); + double phi2 = dphi * (fimax - fimin + 1); + auto cshift = cassette_.getShift(layer + 1, 1, cassette, true); +#ifdef EDM_ML_DEBUG + int cassette0 = HGCalCassette::cassetteType(2, 1, cassette); // + int ir1 = (fine) ? std::get<1>(HGCalTileIndex::tileUnpack(tileFineIndex_[ti])) + : std::get<1>(HGCalTileIndex::tileUnpack(tileCoarseIndex_[ti])); + int ir2 = (fine) ? std::get<2>(HGCalTileIndex::tileUnpack(tileFineIndex_[ti])) + : std::get<2>(HGCalTileIndex::tileUnpack(tileCoarseIndex_[ti])); + edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Layer " << copy << ":" << (layer + 1) + << " iR " << ir1 << ":" << ir2 << " R " << cms::convert2mm(r1) << ":" + << cms::convert2mm(r2) << " Thick " << cms::convert2mm(2.0 * hthickl) << " phi " + << fimin << ":" << fimax << ":" << convertRadToDeg(phi1) << ":" + << convertRadToDeg(phi2) << " cassette " << cassette << ":" << cassette0 + << " Shift " << cms::convert2mm(cshift.first) << ":" + << cms::convert2mm(cshift.second); +#endif + std::string name = namesTop_[ii] + "L" + std::to_string(copy) + "F" + std::to_string(k); + ++k; dd4hep::Solid solid = dd4hep::Tube(r1, r2, hthickl, phi1, phi2); ns.addSolidNS(ns.prepend(name), solid); dd4hep::Volume glog1 = dd4hep::Volume(solid.name(), solid, matter1); ns.addVolumeNS(glog1); #ifdef EDM_ML_DEBUG - edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: " << glog1.name() << " Tubs made of " << matter1.name() << " of dimensions " << cms::convert2mm(r1) << ", " << cms::convert2mm(r2) << ", " << cms::convert2mm(hthickl) << ", " << convertRadToDeg(phi1) << ", " << convertRadToDeg(phi2); + edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: " << glog1.name() << " Tubs made of " + << matter1.name() << " of dimensions " << cms::convert2mm(r1) << ", " + << cms::convert2mm(r2) << ", " << cms::convert2mm(hthickl) << ", " + << convertRadToDeg(phi1) << ", " << convertRadToDeg(phi2); #endif dd4hep::Position tran(-cshift.first, cshift.second, zpos); glog.placeVolume(glog1, copy, tran); #ifdef EDM_ML_DEBUG - edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Position " << glog1.name() << " number " << copy << " in " << glog.name() << " at ("<< cms::convert2mm(cshift.first) << ", " << cms::convert2mm(cshift.second) << ", " << cms::convert2mm(zpos) << ") with no rotation"; + edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Position " << glog1.name() << " number " + << copy << " in " << glog.name() << " at (" << cms::convert2mm(cshift.first) + << ", " << cms::convert2mm(cshift.second) << ", " << cms::convert2mm(zpos) + << ") with no rotation"; #endif - } - ++copyNumberTop_[ii]; - zpos += hthickl; + } + ++copyNumberTop_[ii]; + zpos += hthickl; } if (std::abs(thickTot - thick) >= tol2_) { - if (thickTot > thick) { - edm::LogError("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Thickness of the partition " << cms::convert2mm(thick) << " is smaller than " << cms::convert2mm(thickTot) << ": thickness of all its components in the top part **** ERROR ****"; - } else { - edm::LogWarning("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Thickness of the partition " << cms::convert2mm(thick) << " does not match with " << cms::convert2mm(thickTot) << " of the components in top part"; - } + if (thickTot > thick) { + edm::LogError("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Thickness of the partition " + << cms::convert2mm(thick) << " is smaller than " << cms::convert2mm(thickTot) + << ": thickness of all its components in the top part **** ERROR ****"; + } else { + edm::LogWarning("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Thickness of the partition " + << cms::convert2mm(thick) << " does not match with " << cms::convert2mm(thickTot) + << " of the components in top part"; + } } } else { int ii = coverTypeTop_; @@ -457,49 +535,67 @@ struct HGCalMixRotatedFineCassette { dd4hep::Material matter1 = ns.material(materialTop_[ii]); unsigned int k = 0; int firstTile = (fine) ? tileFineLayerStart_[layer] : tileCoarseLayerStart_[layer]; - int lastTile = (fine) ? (((layer + 1) < static_cast(tileFineLayerStart_.size())) ? tileFineLayerStart_[layer + 1] : static_cast(tileFineIndex_.size())) : (((layer + 1) < static_cast(tileCoarseLayerStart_.size())) ? tileCoarseLayerStart_[layer + 1] : static_cast(tileCoarseIndex_.size())); + int lastTile = (fine) ? (((layer + 1) < static_cast(tileFineLayerStart_.size())) + ? tileFineLayerStart_[layer + 1] + : static_cast(tileFineIndex_.size())) + : (((layer + 1) < static_cast(tileCoarseLayerStart_.size())) + ? tileCoarseLayerStart_[layer + 1] + : static_cast(tileCoarseIndex_.size())); #ifdef EDM_ML_DEBUG edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Layer " << layer << ":" << ii << " Copy " << copy - << " Tiles " << firstTile << ":" << lastTile; + << " Tiles " << firstTile << ":" << lastTile; #endif for (int ti = firstTile; ti < lastTile; ++ti) { - double r1, r2; - int cassette, fimin, fimax; - if (fine) { - r1 = tileFineRMin_[std::get<1>(HGCalTileIndex::tileUnpack(tileFineIndex_[ti])) - 1]; - r2 = tileFineRMax_[std::get<2>(HGCalTileIndex::tileUnpack(tileFineIndex_[ti])) - 1]; - cassette = std::get<0>(HGCalTileIndex::tileUnpack(tileFinePhis_[ti])); - fimin = std::get<1>(HGCalTileIndex::tileUnpack(tileFinePhis_[ti])); - fimax = std::get<2>(HGCalTileIndex::tileUnpack(tileFinePhis_[ti])); - } else { - r1 = tileCoarseRMin_[std::get<1>(HGCalTileIndex::tileUnpack(tileCoarseIndex_[ti])) - 1]; - r2 = tileCoarseRMax_[std::get<2>(HGCalTileIndex::tileUnpack(tileCoarseIndex_[ti])) - 1]; - cassette = std::get<0>(HGCalTileIndex::tileUnpack(tileCoarsePhis_[ti])); - fimin = std::get<1>(HGCalTileIndex::tileUnpack(tileCoarsePhis_[ti])); - fimax = std::get<2>(HGCalTileIndex::tileUnpack(tileCoarsePhis_[ti])); - } - double phi1 = dphi * (fimin - 1); - double phi2 = dphi * (fimax - fimin + 1); - auto cshift = cassette_.getShift(layer + 1, 1, cassette, true); -#ifdef EDM_ML_DEBUG - int cassette0 = HGCalCassette::cassetteType(2, 1, cassette); // - int ir1 = (fine) ? std::get<1>(HGCalTileIndex::tileUnpack(tileFineIndex_[ti])) : std::get<1>(HGCalTileIndex::tileUnpack(tileCoarseIndex_[ti])); - int ir2 = (fine) ? std::get<2>(HGCalTileIndex::tileUnpack(tileFineIndex_[ti])) : std::get<2>(HGCalTileIndex::tileUnpack(tileCoarseIndex_[ti])); - edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Layer " << copy << ":" << (layer + 1) << " iR " << ir1 << ":" << ir2 << " R " << cms::convert2mm(r1) << ":" << cms::convert2mm(r2) << " Thick " << cms::convert2mm(2.0 * hthickl) << " phi " << fimin << ":" << fimax << ":" << convertRadToDeg(phi1) << ":" << convertRadToDeg(phi2) << " cassette " << cassette << ":" << cassette0 << " Shift " << cms::convert2mm(cshift.first) << ":" << cms::convert2mm(cshift.second); -#endif - std::string name = namesTop_[ii] + "L" + std::to_string(copy) + "F" + std::to_string(k); - ++k; + double r1, r2; + int cassette, fimin, fimax; + if (fine) { + r1 = tileFineRMin_[std::get<1>(HGCalTileIndex::tileUnpack(tileFineIndex_[ti])) - 1]; + r2 = tileFineRMax_[std::get<2>(HGCalTileIndex::tileUnpack(tileFineIndex_[ti])) - 1]; + cassette = std::get<0>(HGCalTileIndex::tileUnpack(tileFinePhis_[ti])); + fimin = std::get<1>(HGCalTileIndex::tileUnpack(tileFinePhis_[ti])); + fimax = std::get<2>(HGCalTileIndex::tileUnpack(tileFinePhis_[ti])); + } else { + r1 = tileCoarseRMin_[std::get<1>(HGCalTileIndex::tileUnpack(tileCoarseIndex_[ti])) - 1]; + r2 = tileCoarseRMax_[std::get<2>(HGCalTileIndex::tileUnpack(tileCoarseIndex_[ti])) - 1]; + cassette = std::get<0>(HGCalTileIndex::tileUnpack(tileCoarsePhis_[ti])); + fimin = std::get<1>(HGCalTileIndex::tileUnpack(tileCoarsePhis_[ti])); + fimax = std::get<2>(HGCalTileIndex::tileUnpack(tileCoarsePhis_[ti])); + } + double phi1 = dphi * (fimin - 1); + double phi2 = dphi * (fimax - fimin + 1); + auto cshift = cassette_.getShift(layer + 1, 1, cassette, true); +#ifdef EDM_ML_DEBUG + int cassette0 = HGCalCassette::cassetteType(2, 1, cassette); // + int ir1 = (fine) ? std::get<1>(HGCalTileIndex::tileUnpack(tileFineIndex_[ti])) + : std::get<1>(HGCalTileIndex::tileUnpack(tileCoarseIndex_[ti])); + int ir2 = (fine) ? std::get<2>(HGCalTileIndex::tileUnpack(tileFineIndex_[ti])) + : std::get<2>(HGCalTileIndex::tileUnpack(tileCoarseIndex_[ti])); + edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Layer " << copy << ":" << (layer + 1) << " iR " + << ir1 << ":" << ir2 << " R " << cms::convert2mm(r1) << ":" << cms::convert2mm(r2) + << " Thick " << cms::convert2mm(2.0 * hthickl) << " phi " << fimin << ":" << fimax + << ":" << convertRadToDeg(phi1) << ":" << convertRadToDeg(phi2) << " cassette " + << cassette << ":" << cassette0 << " Shift " << cms::convert2mm(cshift.first) + << ":" << cms::convert2mm(cshift.second); +#endif + std::string name = namesTop_[ii] + "L" + std::to_string(copy) + "F" + std::to_string(k); + ++k; dd4hep::Solid solid = dd4hep::Tube(r1, r2, hthickl, phi1, phi2); ns.addSolidNS(ns.prepend(name), solid); dd4hep::Volume glog1 = dd4hep::Volume(solid.name(), solid, matter1); ns.addVolumeNS(glog1); #ifdef EDM_ML_DEBUG - edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: " << glog1.name() << " Tubs made of " << matter1.name() << " of dimensions " << cms::convert2mm(r1) << ", " << cms::convert2mm(r2) << ", " << cms::convert2mm(hthickl) << ", " << convertRadToDeg(phi1) << ", " << convertRadToDeg(phi2); + edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: " << glog1.name() << " Tubs made of " + << matter1.name() << " of dimensions " << cms::convert2mm(r1) << ", " + << cms::convert2mm(r2) << ", " << cms::convert2mm(hthickl) << ", " + << convertRadToDeg(phi1) << ", " << convertRadToDeg(phi2); #endif dd4hep::Position tran(-cshift.first, cshift.second, zpos); glog.placeVolume(glog1, copy, tran); #ifdef EDM_ML_DEBUG - edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Position " << glog1.name() << " number " << copy << " in " << glog.name() << " at (" << cms::convert2mm(-cshift.first) << ", " << cms::convert2mm(cshift.second) << ", " << cms::convert2mm(zpos) << ") with no rotation"; + edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Position " << glog1.name() << " number " + << copy << " in " << glog.name() << " at (" << cms::convert2mm(-cshift.first) + << ", " << cms::convert2mm(cshift.second) << ", " << cms::convert2mm(zpos) + << ") with no rotation"; #endif } ++copyNumberCoverTop_; @@ -512,34 +608,43 @@ struct HGCalMixRotatedFineCassette { int kount(0); #endif for (int k = 0; k < cassettes_; ++k) { - int cassette = k + 1; - auto cshift = cassette_.getShift(layer + 1, -1, cassette); - double xpos = -cshift.first; - double ypos = cshift.second; - int i = layer * cassettes_ + k; + int cassette = k + 1; + auto cshift = cassette_.getShift(layer + 1, -1, cassette); + double xpos = -cshift.first; + double ypos = cshift.second; + int i = layer * cassettes_ + k; #ifdef EDM_ML_DEBUG - edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette::Passive: layer " << layer + 1 << " cassette " << cassette << " Shift " << cms::convert2mm(-cshift.first) << ":" << cms::convert2mm(cshift.second) << " PassiveIndex " << i << ":" << passiveFull_.size() << ":" << passivePart_.size(); + edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette::Passive: layer " << layer + 1 << " cassette " + << cassette << " Shift " << cms::convert2mm(-cshift.first) << ":" + << cms::convert2mm(cshift.second) << " PassiveIndex " << i << ":" + << passiveFull_.size() << ":" << passivePart_.size(); #endif - std::string passive = (absType <= waferTypes_) ? passiveFull_[i] : passivePart_[i]; + std::string passive = (absType <= waferTypes_) ? passiveFull_[i] : passivePart_[i]; #ifdef EDM_ML_DEBUG - edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Passive " << passive << " number " << cassette << " pos " << cms::convert2mm(xpos) << ":" << cms::convert2mm(ypos); - kount++; + edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Passive " << passive << " number " << cassette + << " pos " << cms::convert2mm(xpos) << ":" << cms::convert2mm(ypos); + kount++; #endif - dd4hep::Position tran(xpos, ypos, 0.0); - glog.placeVolume(ns.volume(passive), cassette, tran); + dd4hep::Position tran(xpos, ypos, 0.0); + glog.placeVolume(ns.volume(passive), cassette, tran); #ifdef EDM_ML_DEBUG - edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: " << passive << " number " << cassette << " positioned in " << glog.name() << " at (" << cms::convert2mm(xpos) << "," << cms::convert2mm(ypos) << ",0) with no rotation"; + edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: " << passive << " number " << cassette + << " positioned in " << glog.name() << " at (" << cms::convert2mm(xpos) << "," + << cms::convert2mm(ypos) << ",0) with no rotation"; #endif } #ifdef EDM_ML_DEBUG - edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: " << kount << " passives of type " << absType << " for " << glog.name(); + edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: " << kount << " passives of type " << absType + << " for " << glog.name(); #endif } else { static const double sqrt3 = std::sqrt(3.0); int layercenter = layerOrient_[layer]; int layertype = HGCalTypes::layerFrontBack(layerOrient_[layer]); int firstWafer = waferLayerStart_[layer]; - int lastWafer = (((layer + 1) < static_cast(waferLayerStart_.size())) ? waferLayerStart_[layer + 1] : static_cast(waferIndex_.size())); + int lastWafer = + (((layer + 1) < static_cast(waferLayerStart_.size())) ? waferLayerStart_[layer + 1] + : static_cast(waferIndex_.size())); double delx = 0.5 * (waferSize_ + waferSepar_); double dely = 2.0 * delx / sqrt3; double dy = 0.75 * dely; @@ -547,75 +652,96 @@ struct HGCalMixRotatedFineCassette { #ifdef EDM_ML_DEBUG int ium(0), ivm(0), kount(0); std::vector ntype(3, 0); - edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette::Bottom: " << glog.name() << " r " << cms::convert2mm(delx) << " R " << cms::convert2mm(dely) << " dy " << cms::convert2mm(dy) << " Shift " << cms::convert2mm(xyoff.first) << ":" << cms::convert2mm(xyoff.second) << " WaferSize " << cms::convert2mm(waferSize_ + waferSepar_) << " index " << firstWafer << ":" << (lastWafer - 1) << " Copy " << copyM << ":" << layer; + edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette::Bottom: " << glog.name() << " r " + << cms::convert2mm(delx) << " R " << cms::convert2mm(dely) << " dy " + << cms::convert2mm(dy) << " Shift " << cms::convert2mm(xyoff.first) << ":" + << cms::convert2mm(xyoff.second) << " WaferSize " + << cms::convert2mm(waferSize_ + waferSepar_) << " index " << firstWafer << ":" + << (lastWafer - 1) << " Copy " << copyM << ":" << layer; #endif for (int k = firstWafer; k < lastWafer; ++k) { - int u = HGCalWaferIndex::waferU(waferIndex_[k]); - int v = HGCalWaferIndex::waferV(waferIndex_[k]); -#ifdef EDM_ML_DEBUG - int iu = std::abs(u); - int iv = std::abs(v); -#endif - int nr = 2 * v; - int nc = -2 * u + v; - int type = HGCalProperty::waferThick(waferProperty_[k]); - int part = HGCalProperty::waferPartial(waferProperty_[k]); - int orien = HGCalProperty::waferOrient(waferProperty_[k]); - int cassette = HGCalProperty::waferCassette(waferProperty_[k]); - int place = HGCalCell::cellPlacementIndex(1, layertype, orien); -#ifdef EDM_ML_DEBUG - edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette::index:Property:layertype:type:part:orien:cassette:place:offsets:ind " << k << waferProperty_[k] << ":" << layertype << ":" << type << ":" << part << ":" << orien << ":" << cassette << ":" << place; -#endif - auto cshift = cassette_.getShift(layer + 1, -1, cassette, false); - double xpos = xyoff.first - cshift.first + nc * delx; - double ypos = xyoff.second + cshift.second + nr * dy; -#ifdef EDM_ML_DEBUG - double xorig = xyoff.first + nc * delx; - double yorig = xyoff.second + nr * dy; - double angle = std::atan2(yorig, xorig); - edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette::Wafer: layer " << layer + 1 << " cassette " << cassette << " Shift " << cms::convert2mm(cshift.first) << ":" << cms::convert2mm(cshift.second) << " Original " << cms::convert2mm(xorig) << ":" << cms::convert2mm(yorig) << ":" << convertRadToDeg(angle) << " Final " << cms::convert2mm(xpos) << ":" << cms::convert2mm(ypos); -#endif - std::string wafer; - int i(999); - if (part == HGCalTypes::WaferFull) { - i = type * facingTypes_ * orientationTypes_ + place - placeOffset_; -#ifdef EDM_ML_DEBUG - edm::LogVerbatim("HGCalGeom") << " FullWafer type:place:ind " << type << ":" << place << ":" << i << ":" << waferFull_.size(); -#endif - wafer = waferFull_[i]; - } else { - int partoffset = (part >= HGCalTypes::WaferHDTop) ? HGCalTypes::WaferPartHDOffset : HGCalTypes::WaferPartLDOffset; - i = (part - partoffset) * facingTypes_ * orientationTypes_ + HGCalTypes::WaferTypeOffset[type] * facingTypes_ * orientationTypes_ + place - placeOffset_; -#ifdef EDM_ML_DEBUG - edm::LogVerbatim("HGCalGeom") << " layertype:type:part:orien:cassette:place:offsets:ind " << layertype << ":" << type << ":" << part << ":" << orien << ":" << cassette << ":" << place << ":" << partoffset << ":" << HGCalTypes::WaferTypeOffset[type] << ":" << i << ":" << waferPart_.size(); -#endif - wafer = waferPart_[i]; - } - int copy = HGCalTypes::packTypeUV(type, u, v); -#ifdef EDM_ML_DEBUG - edm::LogVerbatim("HGCalGeom") << " DDHGCalMixRotatedFineCassette: Layer " - << HGCalWaferIndex::waferLayer(waferIndex_[k]) << " Wafer " << wafer << " number " - << copy << " type :part:orien:ind " << type << ":" << part << ":" << orien << ":" - << i << " layer:u:v " << (layer + firstFineLayer_) << ":" << u << ":" << v; - if (iu > ium) - ium = iu; - if (iv > ivm) - ivm = iv; - kount++; - if (copies_.count(copy) == 0) - copies_.insert(copy); -#endif - dd4hep::Position tran(xpos, ypos, 0.0); - glog.placeVolume(ns.volume(wafer), copy, tran); -#ifdef EDM_ML_DEBUG - ++ntype[type]; - edm::LogVerbatim("HGCalGeom") << " DDHGCalMixRotatedFineCassette: " << wafer << " number " << copy << " type " << layertype << ":" << type << " positioned in " << glog.name() << " at (" << cms::convert2mm(xpos) << "," << cms::convert2mm(ypos) << ",0) with no rotation"; + int u = HGCalWaferIndex::waferU(waferIndex_[k]); + int v = HGCalWaferIndex::waferV(waferIndex_[k]); +#ifdef EDM_ML_DEBUG + int iu = std::abs(u); + int iv = std::abs(v); +#endif + int nr = 2 * v; + int nc = -2 * u + v; + int type = HGCalProperty::waferThick(waferProperty_[k]); + int part = HGCalProperty::waferPartial(waferProperty_[k]); + int orien = HGCalProperty::waferOrient(waferProperty_[k]); + int cassette = HGCalProperty::waferCassette(waferProperty_[k]); + int place = HGCalCell::cellPlacementIndex(1, layertype, orien); +#ifdef EDM_ML_DEBUG + edm::LogVerbatim("HGCalGeom") + << "DDHGCalMixRotatedFineCassette::index:Property:layertype:type:part:orien:cassette:place:offsets:ind " + << k << waferProperty_[k] << ":" << layertype << ":" << type << ":" << part << ":" << orien << ":" + << cassette << ":" << place; +#endif + auto cshift = cassette_.getShift(layer + 1, -1, cassette, false); + double xpos = xyoff.first - cshift.first + nc * delx; + double ypos = xyoff.second + cshift.second + nr * dy; +#ifdef EDM_ML_DEBUG + double xorig = xyoff.first + nc * delx; + double yorig = xyoff.second + nr * dy; + double angle = std::atan2(yorig, xorig); + edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette::Wafer: layer " << layer + 1 << " cassette " + << cassette << " Shift " << cms::convert2mm(cshift.first) << ":" + << cms::convert2mm(cshift.second) << " Original " << cms::convert2mm(xorig) << ":" + << cms::convert2mm(yorig) << ":" << convertRadToDeg(angle) << " Final " + << cms::convert2mm(xpos) << ":" << cms::convert2mm(ypos); +#endif + std::string wafer; + int i(999); + if (part == HGCalTypes::WaferFull) { + i = type * facingTypes_ * orientationTypes_ + place - placeOffset_; +#ifdef EDM_ML_DEBUG + edm::LogVerbatim("HGCalGeom") << " FullWafer type:place:ind " << type << ":" << place << ":" << i << ":" + << waferFull_.size(); +#endif + wafer = waferFull_[i]; + } else { + int partoffset = + (part >= HGCalTypes::WaferHDTop) ? HGCalTypes::WaferPartHDOffset : HGCalTypes::WaferPartLDOffset; + i = (part - partoffset) * facingTypes_ * orientationTypes_ + + HGCalTypes::WaferTypeOffset[type] * facingTypes_ * orientationTypes_ + place - placeOffset_; +#ifdef EDM_ML_DEBUG + edm::LogVerbatim("HGCalGeom") << " layertype:type:part:orien:cassette:place:offsets:ind " << layertype << ":" + << type << ":" << part << ":" << orien << ":" << cassette << ":" << place << ":" + << partoffset << ":" << HGCalTypes::WaferTypeOffset[type] << ":" << i << ":" + << waferPart_.size(); +#endif + wafer = waferPart_[i]; + } + int copy = HGCalTypes::packTypeUV(type, u, v); +#ifdef EDM_ML_DEBUG + edm::LogVerbatim("HGCalGeom") << " DDHGCalMixRotatedFineCassette: Layer " + << HGCalWaferIndex::waferLayer(waferIndex_[k]) << " Wafer " << wafer << " number " + << copy << " type :part:orien:ind " << type << ":" << part << ":" << orien << ":" + << i << " layer:u:v " << (layer + firstFineLayer_) << ":" << u << ":" << v; + if (iu > ium) + ium = iu; + if (iv > ivm) + ivm = iv; + kount++; + if (copies_.count(copy) == 0) + copies_.insert(copy); +#endif + dd4hep::Position tran(xpos, ypos, 0.0); + glog.placeVolume(ns.volume(wafer), copy, tran); +#ifdef EDM_ML_DEBUG + ++ntype[type]; + edm::LogVerbatim("HGCalGeom") << " DDHGCalMixRotatedFineCassette: " << wafer << " number " << copy << " type " + << layertype << ":" << type << " positioned in " << glog.name() << " at (" + << cms::convert2mm(xpos) << "," << cms::convert2mm(ypos) + << ",0) with no rotation"; #endif } #ifdef EDM_ML_DEBUG edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Maximum # of u " << ium << " # of v " << ivm - << " and " << kount << " wafers (" << ntype[0] << ":" << ntype[1] << ":" << ntype[2] - << ") for " << glog.name(); + << " and " << kount << " wafers (" << ntype[0] << ":" << ntype[1] << ":" << ntype[2] + << ") for " << glog.name(); #endif } } diff --git a/Geometry/HGCalCommonData/plugins/dd4hep/DDHGCalSiliconRotatedCassette.cc b/Geometry/HGCalCommonData/plugins/dd4hep/DDHGCalSiliconRotatedCassette.cc index 9ddb1d23c7509..76eb27f63e84e 100644 --- a/Geometry/HGCalCommonData/plugins/dd4hep/DDHGCalSiliconRotatedCassette.cc +++ b/Geometry/HGCalCommonData/plugins/dd4hep/DDHGCalSiliconRotatedCassette.cc @@ -294,13 +294,13 @@ struct HGCalSiliconRotatedCassette { << ", 0.0, 360.0 and position " << glog.name() << " number " << copy << ":" << layerOrient_[copy - firstLayer_] << " Z " << cms::convert2mm(zz); #endif - if (layerSense_[ly] > 0) { - positionSensitive(ctxt, e, glog, (copy - firstLayer_)); - } else if (passiveMode_ > 0) { - positionPassive2(ctxt, e, glog, (copy - firstLayer_), -layerSense_[ly]); - } else { - positionPassive(ctxt, e, glog, (copy - firstLayer_), -layerSense_[ly]); - } + if (layerSense_[ly] > 0) { + positionSensitive(ctxt, e, glog, (copy - firstLayer_)); + } else if (passiveMode_ > 0) { + positionPassive2(ctxt, e, glog, (copy - firstLayer_), -layerSense_[ly]); + } else { + positionPassive(ctxt, e, glog, (copy - firstLayer_), -layerSense_[ly]); + } } dd4hep::Position r1(0, 0, zz); dd4hep::Rotation3D rot; @@ -559,7 +559,6 @@ struct HGCalSiliconRotatedCassette { #endif } - // Position the passive modules (mode > 0) void positionPassive2(cms::DDParsingContext& ctxt, xml_h e, const dd4hep::Volume& glog, int layer, int absType) { cms::DDNamespace ns(ctxt, e, true); @@ -574,21 +573,28 @@ struct HGCalSiliconRotatedCassette { double ypos = cshift.second; int i = layer * cassettes_ + k; #ifdef EDM_ML_DEBUG - edm::LogVerbatim("HGCalGeom") << "DDHGCalSiliconRotatedCassette::Passive2: layer " << layer + 1 << " cassette " << cassette << " Shift " << cms::convert2mm(cshift.first) << ":" << cms::convert2mm(cshift.second) << " PassiveIndex " << i << ":" << passiveFull_.size() << ":" << passivePart_.size(); + edm::LogVerbatim("HGCalGeom") << "DDHGCalSiliconRotatedCassette::Passive2: layer " << layer + 1 << " cassette " + << cassette << " Shift " << cms::convert2mm(cshift.first) << ":" + << cms::convert2mm(cshift.second) << " PassiveIndex " << i << ":" + << passiveFull_.size() << ":" << passivePart_.size(); #endif std::string passive = (absType <= waferTypes_) ? passiveFull_[i] : passivePart_[i]; #ifdef EDM_ML_DEBUG - edm::LogVerbatim("HGCalGeom") << " DDHGCalSiliconRotatedCassette: Passive2 " << passive << " number " << cassette << " pos " << cms::convert2mm(xpos) << ":" << cms::convert2mm(ypos); + edm::LogVerbatim("HGCalGeom") << " DDHGCalSiliconRotatedCassette: Passive2 " << passive << " number " << cassette + << " pos " << cms::convert2mm(xpos) << ":" << cms::convert2mm(ypos); kount++; #endif dd4hep::Position tran(xpos, ypos, 0.0); glog.placeVolume(ns.volume(passive), cassette, tran); #ifdef EDM_ML_DEBUG - edm::LogVerbatim("HGCalGeom") << " DDHGCalSiliconRotatedCassette: " << passive << " number " << cassette << " positioned in " << glog.name() << " at (" << cms::convert2mm(xpos) << "," << cms::convert2mm(ypos) << ",0) with no rotation"; + edm::LogVerbatim("HGCalGeom") << " DDHGCalSiliconRotatedCassette: " << passive << " number " << cassette + << " positioned in " << glog.name() << " at (" << cms::convert2mm(xpos) << "," + << cms::convert2mm(ypos) << ",0) with no rotation"; #endif } #ifdef EDM_ML_DEBUG - edm::LogVerbatim("HGCalGeom") << "DDHGCalSiliconRotatedCassette: " << kount << " passives of type " << absType << " for " << glog.name(); + edm::LogVerbatim("HGCalGeom") << "DDHGCalSiliconRotatedCassette: " << kount << " passives of type " << absType + << " for " << glog.name(); #endif }