Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Phase2-hgx359M Add the dd4hep version of the new algorithm needed for the V19 version of HGCal Geometry #45696

Merged
merged 2 commits into from
Aug 14, 2024
Merged

Phase2-hgx359M Add the dd4hep version of the new algorithm needed for the V19 version of HGCal Geometry #45696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f3205b
Add the dd4hep version of the new algorithm needed for the V19 versio…
Aug 14, 2024
f1fd834
Code check
Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions Geometry/HGCalCommonData/plugins/DDHGCalMixRotatedFineCassette.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,16 +153,15 @@ void DDHGCalMixRotatedFineCassette::initialize(const DDNumericArguments& nArgs,
<< " PlaceOffset: " << placeOffset_ << "; number of cells along phi "
<< phiBinsFineScint_ << ":" << phiBinsScint_;
#endif
firstFineLayer_ = (int)(nArgs["FirstFineLayer"]);
firstCoarseLayer_ = (int)(nArgs["FirstCoarseLayer"]);
absorbMode_ = (int)(nArgs["AbsorberMode"]);
sensitiveMode_ = (int)(nArgs["SensitiveMode"]);
passiveMode_ = (int)(nArgs["PassiveMode"]);
firstFineLayer_ = static_cast<int>(nArgs["FirstFineLayer"]);
firstCoarseLayer_ = static_cast<int>(nArgs["FirstCoarseLayer"]);
absorbMode_ = static_cast<int>(nArgs["AbsorberMode"]);
sensitiveMode_ = static_cast<int>(nArgs["SensitiveMode"]);
passiveMode_ = static_cast<int>(nArgs["PassiveMode"]);
#ifdef EDM_ML_DEBUG
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette::First Layers " << firstFineLayer_ << ":"
<< firstCoarseLayer_ << " and "
<< "Absober:Sensitive mode " << absorbMode_ << ":" << sensitiveMode_ << ":"
<< passiveMode_;
<< firstCoarseLayer_ << " and Absober:Sensitive mode " << absorbMode_ << ":"
<< sensitiveMode_ << ":" << passiveMode_;
#endif
zMinBlock_ = nArgs["zMinBlock"];
waferSize_ = nArgs["waferSize"];
Expand Down
6 changes: 3 additions & 3 deletions Geometry/HGCalCommonData/plugins/DDHGCalSiliconRotatedCassette.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#include <unordered_set>
#include <vector>

#define EDM_ML_DEBUG
//#define EDM_ML_DEBUG
using namespace angle_units::operators;

class DDHGCalSiliconRotatedCassette : public DDAlgorithm {
Expand Down Expand Up @@ -662,13 +662,13 @@ void DDHGCalSiliconRotatedCassette::positionPassive2(const DDLogicalPart& glog,
double ypos = cshift.second;
int i = layer * cassettes_ + k;
#ifdef EDM_ML_DEBUG
edm::LogVerbatim("HGCalGeom") << "DDHGCalSiliconRotatedCassette::Passive: layer " << layer + 1 << " cassette "
edm::LogVerbatim("HGCalGeom") << "DDHGCalSiliconRotatedCassette::Passive2: layer " << layer + 1 << " cassette "
<< cassette << " Shift " << cshift.first << ":" << 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: Passive " << passive << " number " << cassette
edm::LogVerbatim("HGCalGeom") << " DDHGCalSiliconRotatedCassette: Passive2 " << passive << " number " << cassette
<< " pos " << xpos << ":" << ypos;
kount++;
#endif
Expand Down
Loading