Skip to content
Snippets Groups Projects

fix tracker module eta index calculation

Merged Deion Elgin Fellers requested to merge dfellers/calypso:fixTrackerMapping into master
2 files
+ 2
8
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -197,8 +197,6 @@ TrackerDataDecoderTool::convert(const DAQFormats::EventFull* re,
// continue;
// }
ATH_MSG_DEBUG("Processing online module #" << onlineModuleID);
// Offline module number
uint32_t module = m_moduleMap[onlineModuleID];
size_t chipIndex{0};
for (auto hitVector : sctEvent->GetHits())
{
@@ -218,8 +216,8 @@ TrackerDataDecoderTool::convert(const DAQFormats::EventFull* re,
uint32_t hitPattern = hit.second;
if (hitMode == HitMode::EDGE && (((hitPattern & 0x2) == 0 ) || ((hitPattern & 0x4) != 0) ) ) continue; // 01X
if (hitMode == HitMode::LEVEL && ((hitPattern & 0x2) == 0)) continue; // X1X
int phiModule = module % 4; // 0 to 3 from bottom to top
int etaModule = -1 + 2*((module%2 + module/4) % 2); // -1 or +1
int phiModule = 3 - (onlineModuleID % 4); // 0 to 3 from bottom to top: (module#,Phi#) = (0,3),(1,2),(2,1),(3,0),(4,3),(5,2),(6,1),(7,0)
int etaModule = -2*(onlineModuleID/4) + 1; // eta = +1 for modules 0,1,2,3 and eta = -1 for 4,5,6,7
// ATH_MSG_DEBUG("Getting wafer_id for station, plane, phi, eta, side = " << station << " " << plane << " " << phiModule << " " << etaModule << " " << side);
Identifier id = m_sctID->wafer_id(station, plane, phiModule, etaModule, side);
IdentifierHash waferHash = m_sctID->wafer_hash(id); // this will be the collection number in the container
Loading