Skip to content
Snippets Groups Projects
Commit 5b3ef8d6 authored by Edward Moyse's avatar Edward Moyse
Browse files

Merge branch 'MG_fixOccupancy' into 'main'

fix float conversion in Phase-2 muon Spacepoint creation

See merge request !73284
parents f30bf3e4 43daebde
No related branches found
No related tags found
24 merge requests!78241Draft: FPGATrackSim: GenScan code refactor,!78236Draft: Switching Streams https://its.cern.ch/jira/browse/ATR-27417,!78056AFP monitoring: new synchronization and cleaning,!78041AFP monitoring: new synchronization and cleaning,!77990Updating TRT chip masks for L1TRT trigger simulation - ATR-28372,!77733Draft: add new HLT NN JVT, augmented with additional tracking information,!77731Draft: Updates to ZDC reconstruction,!77728Draft: updates to ZDC reconstruction,!77522Draft: sTGC Pad Trigger Emulator,!76725ZdcNtuple: Fix cppcheck warning.,!76611L1CaloFEXByteStream: Fix out-of-bounds array accesses.,!76475Punchthrough AF3 implementation in FastG4,!76474Punchthrough AF3 implementation in FastG4,!76343Draft: MooTrackBuilder: Recalibrate NSW hits in refine method,!75729New implementation of ZDC nonlinear FADC correction.,!75703Draft: Update to HI han config for HLT jets,!75184Draft: Update file heavyions_run.config,!74430Draft: Fixing upper bound for Delayed Jet Triggers,!73963Changing the path of the histograms to "Expert" area,!73875updating ID ART reference plots,!73874AtlasCLHEP_RandomGenerators: Fix cppcheck warnings.,!73449Add muon detectors to DarkJetPEBTLA partial event building,!73343Draft: [TrigEgamma] Add photon ringer chains on bootstrap mechanism,!73284fix float conversion in Phase-2 muon Spacepoint creation
......@@ -114,8 +114,8 @@ template <>
return false;
}
const MuonGMR4::TgcReadoutElement* re = etaHits[0]->readoutElement();
return (1.*etaHits.size() / (1.*re->numChannels(etaHits[0]->measurementHash()))) < m_maxOccTgcEta &&
(1.*phiHits.size() / (1.*re->numChannels(phiHits[0]->measurementHash()))) < m_maxOccTgcPhi;
return ((1.*etaHits.size()) / ((1.*re->numChannels(etaHits[0]->measurementHash())))) < m_maxOccTgcEta &&
((1.*phiHits.size()) / ((1.*re->numChannels(phiHits[0]->measurementHash())))) < m_maxOccTgcPhi;
}
template <>
bool MuonSpacePointMakerAlg::passOccupancy2D(const std::vector<const xAOD::RpcMeasurement*>& etaHits,
......@@ -124,8 +124,8 @@ template <>
return false;
}
const MuonGMR4::RpcReadoutElement* re = etaHits[0]->readoutElement();
return (1.*etaHits.size() / 1.*re->nEtaStrips()) < m_maxOccRpcEta &&
(1.*phiHits.size() / 1.*re->nPhiStrips()) < m_maxOccRpcPhi;
return ((1.*etaHits.size()) / (1.*re->nEtaStrips())) < m_maxOccRpcEta &&
((1.*phiHits.size()) / (1.*re->nPhiStrips())) < m_maxOccRpcPhi;
}
template <>
......@@ -135,8 +135,8 @@ template <>
return false;
}
const MuonGMR4::sTgcReadoutElement* re = etaHits[0]->readoutElement();
return (1.*etaHits.size() / 1.*re->numStrips(etaHits[0]->measurementHash())) < m_maxOccStgcEta &&
(1.*phiHits.size() / 1.*re->numWireGroups(phiHits[0]->measurementHash())) < m_maxOccStgcPhi;
return ((1.*etaHits.size()) / (1.*re->numStrips(etaHits[0]->measurementHash()))) < m_maxOccStgcEta &&
((1.*phiHits.size()) / (1.*re->numWireGroups(phiHits[0]->measurementHash()))) < m_maxOccStgcPhi;
}
template <class ContType>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment