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

Change lcdd() -> getDetector() #54

Merged
merged 2 commits into from
Oct 24, 2023
Merged

Change lcdd() -> getDetector() #54

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
536d2d2
Change lcdd() -> getDetector()
jmcarcell Oct 24, 2023
10c2881
Simplify getting the readouts
jmcarcell Oct 24, 2023
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
2 changes: 1 addition & 1 deletion Detector/DetComponents/src/RedoSegmentation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ StatusCode RedoSegmentation::initialize() {
m_segmentationType=2;
else
m_segmentationType=0;
m_oldSegmentation = m_geoSvc->lcdd()->readout(m_oldReadoutName).segmentation().segmentation();
m_oldSegmentation = m_geoSvc->getDetector()->readout(m_oldReadoutName).segmentation().segmentation();
info() << "Old segmentation is of type:\t" << m_oldSegmentation->type() << endmsg;
if (m_oldSegmentation->type() == "FCCSWGridModuleThetaMerged")
m_oldSegmentationType=2;
Expand Down
5 changes: 2 additions & 3 deletions SimG4Components/src/InspectHitsCollectionsTool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ StatusCode InspectHitsCollectionsTool::initialize() {
<< "Make sure you have GeoSvc and SimSvc in the right order in the configuration." << endmsg;
return StatusCode::FAILURE;
}
auto lcdd = m_geoSvc->lcdd();
auto allReadouts = lcdd->readouts();
auto allReadouts = m_geoSvc->getDetector()->readouts();
for (auto& readoutName : m_readoutNames) {
if (allReadouts.find(readoutName) == allReadouts.end()) {
error() << "Readout " << readoutName << " not found! Please check tool configuration." << endmsg;
Expand All @@ -62,7 +61,7 @@ StatusCode InspectHitsCollectionsTool::saveOutput(const G4Event& aEvent) {
info() << "\tcollection #: " << iter_coll << "\tname: " << collect->GetName()
<< "\tsize: " << collect->GetSize() << endmsg;
size_t n_hit = collect->GetSize();
auto decoder = m_geoSvc->lcdd()->readout(collect->GetName()).idSpec().decoder();
auto decoder = m_geoSvc->getDetector()->readout(collect->GetName()).idSpec().decoder();
for (size_t iter_hit = 0; iter_hit < n_hit; iter_hit++) {
hitT = dynamic_cast<k4::Geant4PreDigiTrackHit*>(collect->GetHit(iter_hit));
if (hitT) {
Expand Down
Loading