Skip to content

Commit

Permalink
Fix naming of BTOF hits (#1660)
Browse files Browse the repository at this point in the history
### Briefly, what does this PR introduce?
Changes the name of the BTOF hit collections to use Hits instead of Hit.
This was inconsistent between the name output from the hit
reconstruction and collection collector input.

### What kind of change does this PR introduce?
- [x] Bug fix (issue #1659 probably some of the cause at least)
- [ ] New feature (issue #__)
- [ ] Documentation update
- [ ] Other: __

### Please check if this PR fulfills the following:
- [ ] Tests for the changes have been added
- [ ] Documentation has been added / updated
- [ ] Changes have been communicated to collaborators

### Does this PR introduce breaking changes? What changes might users
need to make to their code?
No
### Does this PR change default behavior?
Hopefully adds the BTOF into the tracking
  • Loading branch information
simonge authored Nov 4, 2024
1 parent f0e9db0 commit f437575
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ void TofEfficiency_processor::InitWithGlobalRootLock(){
void TofEfficiency_processor::ProcessSequential(const std::shared_ptr<const JEvent>& event) {
const auto &mcParticles = *(event->GetCollection<edm4hep::MCParticle>("MCParticles"));
const auto &trackSegments = *(event->GetCollection<edm4eic::TrackSegment>("CentralTrackSegments"));
const auto &barrelHits = *(event->GetCollection<edm4eic::TrackerHit>("TOFBarrelRecHit"));
const auto &barrelHits = *(event->GetCollection<edm4eic::TrackerHit>("TOFBarrelRecHits"));
const auto &endcapHits = *(event->GetCollection<edm4eic::TrackerHit>("TOFEndcapRecHits"));

// List TOF Barrel hits from barrel
Expand Down
10 changes: 5 additions & 5 deletions src/detectors/BTOF/BTOF.cc
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ void InitPlugin(JApplication *app) {

// Digitization
app->Add(new JOmniFactoryGeneratorT<SiliconTrackerDigi_factory>(
"TOFBarrelRawHit",
"TOFBarrelRawHits",
{
"TOFBarrelHits"
},
{
"TOFBarrelRawHit",
"TOFBarrelRawHits",
"TOFBarrelRawHitAssociations"
},
{
Expand All @@ -46,9 +46,9 @@ void InitPlugin(JApplication *app) {

// Convert raw digitized hits into hits with geometry info (ready for tracking)
app->Add(new JOmniFactoryGeneratorT<TrackerHitReconstruction_factory>(
"TOFBarrelRecHit",
{"TOFBarrelRawHit"}, // Input data collection tags
{"TOFBarrelRecHit"}, // Output data tag
"TOFBarrelRecHits",
{"TOFBarrelRawHits"}, // Input data collection tags
{"TOFBarrelRecHits"}, // Output data tag
{
.timeResolution = 10,
},
Expand Down
2 changes: 1 addition & 1 deletion src/global/tracking/tracking.cc
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ void InitPlugin(JApplication *app) {
{"SiBarrelHits", "SiBarrelRawHits", "SiBarrelRawHitAssociations", "SiBarrelTrackerRecHits"},
{"VertexBarrelHits", "SiBarrelVertexRawHits", "SiBarrelVertexRawHitAssociations", "SiBarrelVertexRecHits"},
{"TrackerEndcapHits", "SiEndcapTrackerRawHits", "SiEndcapTrackerRawHitAssociations", "SiEndcapTrackerRecHits"},
{"TOFBarrelHits", "TOFBarrelRawHits", "TOFBarrelRawHitAssociations", "TOFBarrelRecHit"},
{"TOFBarrelHits", "TOFBarrelRawHits", "TOFBarrelRawHitAssociations", "TOFBarrelRecHits"},
{"TOFEndcapHits", "TOFEndcapRawHits", "TOFEndcapRawHitAssociations", "TOFEndcapRecHits"},
{"MPGDBarrelHits", "MPGDBarrelRawHits", "MPGDBarrelRawHitAssociations", "MPGDBarrelRecHits"},
{"OuterMPGDBarrelHits", "OuterMPGDBarrelRawHits", "OuterMPGDBarrelRawHitAssociations", "OuterMPGDBarrelRecHits"},
Expand Down
4 changes: 2 additions & 2 deletions src/services/io/podio/JEventProcessorPODIO.cc
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,10 @@ JEventProcessorPODIO::JEventProcessorPODIO() {
"SiEndcapTrackerRawHitAssociations",

// TOF
"TOFBarrelRecHit",
"TOFBarrelRecHits",
"TOFEndcapRecHits",

"TOFBarrelRawHit",
"TOFBarrelRawHits",
"TOFEndcapRawHits",

"TOFBarrelHits",
Expand Down

0 comments on commit f437575

Please sign in to comment.