Skip to content
Snippets Groups Projects

Adapt to updated UT channel ID class and geometry

Merged Xuhao Yuan requested to merge UT-newID-and-Geo into master
5 files
+ 8
300
Compare changes
  • Side-by-side
  • Inline
Files
5
@@ -49,8 +49,8 @@ namespace LHCb::Pr::UT {
if ( !aSector ) throw std::runtime_error{"DeUTDetector::getSector returned nullptr"};
sectors[idx] = aSector;
fullchan[idx] = {static_cast<unsigned int>(
::UT::HitHandler::HitsInUT::idx( sector.side(), sector.halflayer(), sector.stave(),
sector.face(), sector.module(), sector.subsector() ) ),
::UT::HitHandler::HitsInUT::idx( sector.side(), sector.layer(), sector.stave(),
sector.face(), sector.module(), sector.sector() ) ),
static_cast<unsigned int>( sector )};
}
}
@@ -107,7 +107,7 @@ namespace LHCb::Pr::UT {
const auto& fullChan = cache.fullchan[geomIdx];
// FIXME: move functionality into channelID -- why is this _different_ from UTChennelID::strip() ??
const auto strip = ( aWord.channelID() & 0x1ff ) + 1;
const auto strip = ( aWord.channelID() & 0x1ff ) + aSector->firstStrip();
hitHandler.AddHit( aSector, fullChan.idx, strip, aWord.fracStripBits(),
UTChannelID{fullChan.chanID + strip}, aWord.pseudoSizeBits(),
Loading