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

Jump to bottom

refactor(DD4hep): change logger level for conversion fail #3092

Merged
merged 9 commits into from
Apr 10, 2024
Merged

refactor(DD4hep): change logger level for conversion fail #3092

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bdf2b49
first steps
AJPfleger Dec 11, 2023
1dee56a
Revert "first steps"
AJPfleger Dec 11, 2023
413523f
Update ConvertDD4hepDetector.cpp
AJPfleger Apr 9, 2024
3835059
Merge branch 'main' into dd4hepconversionwarning
AJPfleger Apr 9, 2024
bd1688e
format
AJPfleger Apr 10, 2024
0537e63
Merge branch 'main' into dd4hepconversionwarning
AJPfleger Apr 10, 2024
3d1c426
fix other ' : '
AJPfleger Apr 10, 2024
13b3101
remove std::string from logger
AJPfleger Apr 10, 2024
88f5538
Merge branch 'main' into dd4hepconversionwarning
kodiakhq[bot] Apr 10, 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
22 changes: 11 additions & 11 deletions Plugins/DD4hep/src/ConvertDD4hepDetector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@ std::shared_ptr<const CylinderVolumeBuilder> volumeBuilder_dd4hep(
<< (subDetector.type() == "compound" ? "yes" : "no"));

if (subDetector.type() == "compound") {
ACTS_VERBOSE("Subdetector : '" << subDetector.name()
<< "' has type compound ");
ACTS_VERBOSE("Subdetector: '" << subDetector.name()
<< "' has type compound ");
AJPfleger marked this conversation as resolved.
Show resolved Hide resolved
ACTS_VERBOSE(
"handling as a compound volume (a hierarchy of a "
"barrel-endcap structure) and resolving the "
Expand Down Expand Up @@ -196,7 +196,7 @@ std::shared_ptr<const CylinderVolumeBuilder> volumeBuilder_dd4hep(
bool pEndCap = false;
bool barrel = false;
for (auto& volumeDetElement : compounds) {
ACTS_VERBOSE("Volume : '"
ACTS_VERBOSE("Volume: '"
<< subDetector.name()
<< "' is a compound volume -> resolve the sub volumes");

Expand All @@ -219,8 +219,8 @@ std::shared_ptr<const CylinderVolumeBuilder> volumeBuilder_dd4hep(
dd4hep::DetType type{volumeDetElement.typeFlag()};

if (type.is(dd4hep::DetType::ENDCAP)) {
ACTS_VERBOSE(std::string("Subvolume : '") + volumeDetElement.name() +
std::string("' is marked ENDCAP"));
ACTS_VERBOSE("Subvolume: '" << volumeDetElement.name()
<< "' is marked ENDCAP");
if (zPos < 0.) {
if (nEndCap) {
throw std::logic_error(
Expand Down Expand Up @@ -293,8 +293,8 @@ std::shared_ptr<const CylinderVolumeBuilder> volumeBuilder_dd4hep(
"hierarchy.");
}
barrel = true;
ACTS_VERBOSE("Subvolume : " << volumeDetElement.name()
<< " is marked as BARREL");
ACTS_VERBOSE("Subvolume: " << volumeDetElement.name()
<< " is marked as BARREL");
ACTS_VERBOSE("-> collecting layers");
collectLayers_dd4hep(volumeDetElement, centralLayers, logger);
// Fill the volume material for barrel case
Expand Down Expand Up @@ -391,8 +391,8 @@ std::shared_ptr<const CylinderVolumeBuilder> volumeBuilder_dd4hep(
return cylinderVolumeBuilder;
} else if (subDetType.is(dd4hep::DetType::BEAMPIPE) ||
getParamOr<bool>("passive_layer", subDetector, false)) {
ACTS_VERBOSE("Subdetector : " << subDetector.name()
<< " - building a passive cylinder.");
ACTS_VERBOSE("Subdetector: " << subDetector.name()
<< " - building a passive cylinder.");

if (subDetType.is(dd4hep::DetType::BEAMPIPE)) {
ACTS_VERBOSE("This is the beam pipe - will be built to r -> 0.");
Expand Down Expand Up @@ -529,8 +529,8 @@ std::shared_ptr<const CylinderVolumeBuilder> volumeBuilder_dd4hep(
logger.clone(std::string("D2A_V:") + subDetector.name()));
return cylinderVolumeBuilder;
} else {
ACTS_INFO(
"Subdetector with name : '"
ACTS_WARNING(
"Subdetector with name: '"
<< subDetector.name()
<< "' has inconsistent information for translation and is not of type "
"'compound'. If you want to have this DetElement be translated "
Expand Down
Loading