Skip to content
Merged
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion Detectors/TOF/simulation/src/Detector.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,9 @@ Bool_t Detector::ProcessHits(FairVolume* v)
Geo::getPadDxDyDz(pos, det, delta);
auto channel = Geo::getIndex(det);
HitType newhit(posx, posy, posz, time, enDep, trackID, sensID);
if (channel != mLastChannelID || !isMergable(newhit, mHits->back())) {
// an invalid channel (getIndex returns -1 off a valid pad) never merges, and
// there is nothing to merge with before the first hit of the event
if (channel < 0 || mHits->empty() || channel != mLastChannelID || !isMergable(newhit, mHits->back())) {
mHits->push_back(newhit);
stack->addHit(GetDetId());
} else {
Expand Down
Loading