Skip to content
Snippets Groups Projects
Commit 5f5336c4 authored by Walter Lampl's avatar Walter Lampl
Browse files

Merge branch 'master-const_cast' into 'master'

Remove unnecessary const_cast in FastSCT_Clusterization

See merge request !20877
parents 27af0ba4 c612d49c
9 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!45405updated ART test cron job,!42417Draft: DIRE and VINCIA Base Fragments for Pythia 8.3,!28528Revert 63f845ae,!27054Atr20369 210,!26342Monopole: Handle fractionally charged particles,!20877Remove unnecessary const_cast in FastSCT_Clusterization
......@@ -61,9 +61,6 @@ StatusCode SCT_RawDataToxAOD::execute(const EventContext& ctx) const {
phi_module_acc(*xrdo) = m_SCTHelper->phi_module(id);
eta_module_acc(*xrdo) = m_SCTHelper->eta_module(id);
side_acc(*xrdo) = m_SCTHelper->side(id);
// error condensed hit not used anymore (duplicates information from ByteStream errors)
// SCT3_RawData* rdo3 = const_cast<SCT3_RawData*>(dynamic_cast<const SCT3_RawData*>(rdo));
// if (rdo3) xrdo->setErrorCondensedHit(rdo3->getErrorCondensedHit());
}
}
ATH_MSG_DEBUG(" recorded SCT_RawData objects: size " << xaod->size());
......
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "TrigOnlineSpacePointTool/FastSCT_Clusterization.h"
......@@ -13,9 +13,9 @@
void FastSCT_Clusterization::initializeGeometry(const InDetDD::SCT_DetectorManager* manager){
///@todo WARNING - hack needed here for non-const method of SCT_DetectorManager
m_man = const_cast<InDetDD::SCT_DetectorManager*>(manager);
m_man = manager;
// Barrel geometry : get a barrel element (use layer 0, phi 1, eta 1, side 0)
InDetDD::SiDetectorElement* element = m_man->getDetectorElement(0, 0, 1, 1, 0);
const InDetDD::SiDetectorElement* element = m_man->getDetectorElement(0, 0, 1, 1, 0);
m_barrel_pitch = element->phiPitch();
m_deltaXlorentz=0.0026;
m_corrTable[0]= 1.0;
......@@ -30,7 +30,7 @@ std::cout << " barrel: pitch " << m_barrel_pitch << " lorentz shift " << m_delt
for (int disk=0; disk<s_ndisk; disk++)
for (int ieta=0; ieta<s_neta; ieta++){
// find the forward element. Use phi 0, side 0
InDetDD::SiDetectorElement* element = m_man->getDetectorElement(2, disk, 0, ieta, 0);
const InDetDD::SiDetectorElement* element = m_man->getDetectorElement(2, disk, 0, ieta, 0);
if (0==element) continue;
m_forward_pitch[disk][ieta]=element->phiPitch();
#ifdef CLUSTERING_DBG
......
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