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

[GEM] GEMGeometryBuilder update for the 2024 geometry #43948

Merged
merged 2 commits into from
Feb 18, 2024
Merged

[GEM] GEMGeometryBuilder update for the 2024 geometry #43948

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
85bee25
Merged Run3-gex175 from repository bsunanda with cms-merge-topic
yeckang Feb 6, 2024
c4711e6
Allow GE2/1 demonstrator to be built while 2 GE2/1 layers are in the …
yeckang Feb 13, 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
9 changes: 5 additions & 4 deletions Geometry/GEMGeometryBuilder/src/GEMGeometryBuilder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
Updated: 7 August 2020
Updated by Ian J. Watson ([email protected]) to allow GE2/1 demonstrator to be built
Updated: 7 December 2021
Updated by Yechan Kang ([email protected]) to allow GE2/1 demonstrator to be built while 2 GE2/1 layers are in the other region during 2024
Updated : 13 Feburary 2024
*/
#include "Geometry/GEMGeometryBuilder/src/GEMGeometryBuilder.h"
#include "Geometry/GEMGeometry/interface/GEMGeometry.h"
Expand Down Expand Up @@ -74,7 +76,7 @@ void GEMGeometryBuilder::build(GEMGeometry& theGeometry,
fvGE2.parent();
doSuper = fvGE2.nextSibling();
}
bool demonstratorGeometry = nGE21 == 1;
bool demonstratorGeometry = nGE21 % 2 == 1;

#ifdef EDM_ML_DEBUG
edm::LogVerbatim("Geometry") << "Found " << nGE21 << " GE2/1 chambers. Demonstrator geometry on? "
Expand Down Expand Up @@ -369,7 +371,7 @@ void GEMGeometryBuilder::build(GEMGeometry& theGeometry,
}
}

bool demonstratorGeometry = nGE21 == 1;
bool demonstratorGeometry = nGE21 % 2 == 1;
#ifdef EDM_ML_DEBUG
edm::LogVerbatim("Geometry") << "Found " << nGE21 << " GE2/1 chambers. Demonstrator geometry on? "
<< demonstratorGeometry;
Expand Down Expand Up @@ -585,8 +587,7 @@ void GEMGeometryBuilder::buildRegions(GEMGeometry& theGeometry,
auto chamber = theGeometry.chamber(chId);
if (!chamber) {
// this particular layer 1 chamber *should* be missing in the demonstrator geometry (we only have layer 2)
if (!demonstratorGeometry or
not(chId.region() == 1 and chId.station() == 2 and chId.chamber() == 16 and chId.layer() == 1)) {
if (!demonstratorGeometry or not(chId.station() == 2)) {
edm::LogWarning("GEMGeometryBuilder") << "Missing chamber " << chId;
}
} else {
Expand Down
4 changes: 2 additions & 2 deletions Geometry/GEMGeometryBuilder/src/GEMGeometryParsFromDD.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ void GEMGeometryParsFromDD::buildGeometry(DDFilteredView& fv,
edm::LogError("GEMGeometryParsFromDD") << "Failed to find next child volume. Cannot determine presence of GE 2/1";
}
}
bool demonstratorGeometry = nGE21 == 1;
bool demonstratorGeometry = nGE21 % 2 == 1;

#ifdef EDM_ML_DEBUG
edm::LogVerbatim("Geometry") << "Found " << nGE21 << " GE2/1 chambers. Demonstrator geometry on? "
Expand Down Expand Up @@ -296,7 +296,7 @@ void GEMGeometryParsFromDD::buildGeometry(cms::DDFilteredView& fv,
nGE21++;
}
}
bool demonstratorGeometry = nGE21 == 1;
bool demonstratorGeometry = nGE21 % 2 == 1;
#ifdef EDM_ML_DEBUG
edm::LogVerbatim("Geometry") << "Found " << nGE21 << " GE2/1 chambers. Demonstrator geometry on? "
<< demonstratorGeometry;
Expand Down