Skip to content
Snippets Groups Projects

Remove MuonDetectorManager calls from MuonAlignmentCondAlg (ATLASRECTS-5533)

Merged Remove MuonDetectorManager calls from MuonAlignmentCondAlg (ATLASRECTS-5533)
nkoehler/athena:rec5533 into master
Merged Nicolas Koehler requested to merge nkoehler/athena:rec5533 into master
Compare
and
1 file
+ 0
− 36
Compare changes
  • Side-by-side
  • Inline
MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/src/MuonAlignmentCondAlg.cxx
+ 0
− 36
@@ -249,18 +249,6 @@ StatusCode MuonAlignmentCondAlg::loadAlignABLines() {
}
ATH_MSG_INFO("recorded new " << writeALineHandle.key() << " with range " << rangeALineW << " into Conditions Store");
// >>>>>>>>>>>> START: This code should be REMOVED after MuonDetectorManger in MuonEventTPCnv moves to Conditions Store >>>>>>>>>>>>
// =======================
// FIRST Update the MuonDetectorManager and THEN record the BLine.
// =======================
// FIXME: const_cast
if (const_cast<MuonGM::MuonDetectorManager*>(m_muonDetMgrDS)->updateDeformations(*writeBLineCdo).isFailure()) ATH_MSG_ERROR("Unable to updateDeformations" );
else ATH_MSG_DEBUG("updateDeformations DONE" );
// if (m_muonDetMgrDS->updateDeformations(writeBLineCdo.get()).isFailure()) ATH_MSG_ERROR("Unable to updateDeformations" );
// else ATH_MSG_DEBUG("updateDeformations DONE" );
// <<<<<<<<<<<<< END: This code should be REMOVED after MuonDetectorManger in MuonEventTPCnv moves to Conditions Store <<<<<<<<<<<<<
if (writeBLineHandle.record(rangeBLineW, std::move(writeBLineCdo)).isFailure()) {
ATH_MSG_FATAL("Could not record BLineMapContainer " << writeBLineHandle.key()
<< " with EventRange " << rangeBLineW
@@ -884,18 +872,6 @@ StatusCode MuonAlignmentCondAlg::loadAlignILines(std::string folderName)
// dump I-lines to log file TBA
if (m_dumpILines && (int)writeCdo->size()>0) dumpILines(folderName, writeCdo.get());
// >>>>>>>>>>>> START: This code should be REMOVED after MuonDetectorManger in MuonEventTPCnv moves to Conditions Store >>>>>>>>>>>>
// =======================
// FIRST update MuonDetectorManager and THEN record the output cond object.
// =======================
// FIXME: const_cast
if (const_cast<MuonGM::MuonDetectorManager*>(m_muonDetMgrDS)->updateCSCInternalAlignmentMap(*writeCdo).isFailure()) ATH_MSG_ERROR("Unable to updateCSCInternalAlignmentMap" );
else ATH_MSG_DEBUG("updateCSCInternalAlignmentMap DONE" );
// if (m_muonDetMgrDS->updateCSCInternalAlignmentMap(writeCdo.get()).isFailure()) ATH_MSG_ERROR("Unable to updateCSCInternalAlignmentMap" );
// else ATH_MSG_DEBUG("updateCSCInternalAlignmentMap DONE" );
// <<<<<<<<<<<<< END: This code should be REMOVED after MuonDetectorManger in MuonEventTPCnv moves to Conditions Store <<<<<<<<<<<<<
if (writeHandle.record(rangeCscILinesW, std::move(writeCdo)).isFailure()) {
ATH_MSG_FATAL("Could not record CscInternalAlignmentMapContainer " << writeHandle.key()
<< " with EventRange " << rangeCscILinesW
@@ -1019,18 +995,6 @@ StatusCode MuonAlignmentCondAlg::loadAlignAsBuilt(std::string folderName)
// !!!!!!!!!!!!!! In the MuonAlignmentDbTool this was in loadAlignABLines. I moved it here
if ( m_asBuiltFile!="" ) setAsBuiltFromAscii(writeCdo.get());
// >>>>>>>>>>>> START: This code should be REMOVED after MuonDetectorManger in MuonEventTPCnv moves to Conditions Store >>>>>>>>>>>>
// =======================
// FIRST update MuonDetectorManager and THEN record the output cond object.
// =======================
// FIXME: const_cast
if (const_cast<MuonGM::MuonDetectorManager*>(m_muonDetMgrDS)->updateAsBuiltParams(*writeCdo).isFailure()) ATH_MSG_ERROR("Unable to updateAsBuiltParams" );
else ATH_MSG_DEBUG("updateAsBuiltParams DONE" );
// if (m_muonDetMgrDS->updateAsBuiltParams(writeCdo.get()).isFailure()) ATH_MSG_ERROR("Unable to updateAsBuiltParams" );
// else ATH_MSG_DEBUG("updateAsBuiltParams DONE" );
// <<<<<<<<<<<<< END: This code should be REMOVED after MuonDetectorManger in MuonEventTPCnv moves to Conditions Store <<<<<<<<<<<<<
if (writeHandle.record(rangeMdtAsBuiltW, std::move(writeCdo)).isFailure()) {
ATH_MSG_FATAL("Could not record MdtAsBuiltMapContainer " << writeHandle.key()
<< " with EventRange " << rangeMdtAsBuiltW