Skip to content
Snippets Groups Projects
Commit 2fc7a8aa authored by Chikuma Kato's avatar Chikuma Kato
Browse files

replaced MuonMDT_CablingSvc to readCdo in MdtDigitToMdtRDO

parent 7cacde5d
No related branches found
No related tags found
No related merge requests found
...@@ -122,10 +122,10 @@ StatusCode MdtDigitToMdtRDO::fill_MDTdata() const { ...@@ -122,10 +122,10 @@ StatusCode MdtDigitToMdtRDO::fill_MDTdata() const {
uint8_t tdc; uint8_t tdc;
uint8_t channel; uint8_t channel;
bool cabling = m_cabling->getOnlineId(name, eta, phi, bool cabling = readCdo->getOnlineId(name, eta, phi,
1, 1, 1, 1, 1, 1,
subsystem, mrod, link, subsystem, mrod, link,
tdc, channel); tdc, channel);
if (!cabling) { if (!cabling) {
ATH_MSG_ERROR( "MDTcabling can't return an online ID for the channel : " ); ATH_MSG_ERROR( "MDTcabling can't return an online ID for the channel : " );
...@@ -173,10 +173,10 @@ StatusCode MdtDigitToMdtRDO::fill_MDTdata() const { ...@@ -173,10 +173,10 @@ StatusCode MdtDigitToMdtRDO::fill_MDTdata() const {
if ( name == 53 ) { if ( name == 53 ) {
uint8_t subsystem_2ndcsm, mrod_2ndcsm, link_2ndcsm, tdc_2ndcsm, channel_2ndcsm; uint8_t subsystem_2ndcsm, mrod_2ndcsm, link_2ndcsm, tdc_2ndcsm, channel_2ndcsm;
cabling = m_cabling->getOnlineId(name, eta, phi, 1, 1, 43, cabling = readCdo->getOnlineId(name, eta, phi, 1, 1, 43,
subsystem_2ndcsm, mrod_2ndcsm, subsystem_2ndcsm, mrod_2ndcsm,
link_2ndcsm, tdc_2ndcsm, channel_2ndcsm); link_2ndcsm, tdc_2ndcsm, channel_2ndcsm);
if (!cabling) { if (!cabling) {
ATH_MSG_ERROR( "MDTcabling can't return an online ID for the channel : " ); ATH_MSG_ERROR( "MDTcabling can't return an online ID for the channel : " );
ATH_MSG_ERROR( name << " " ATH_MSG_ERROR( name << " "
...@@ -204,10 +204,10 @@ StatusCode MdtDigitToMdtRDO::fill_MDTdata() const { ...@@ -204,10 +204,10 @@ StatusCode MdtDigitToMdtRDO::fill_MDTdata() const {
int tube = m_mdtIdHelper->tube(channelId); int tube = m_mdtIdHelper->tube(channelId);
// Get the online Id of the channel // Get the online Id of the channel
cabling = m_cabling->getOnlineId(name, eta, phi, cabling = readCdo->getOnlineId(name, eta, phi,
multilayer, layer, tube, multilayer, layer, tube,
subsystem, mrod, link, subsystem, mrod, link,
tdc, channel); tdc, channel);
if (!cabling) { if (!cabling) {
ATH_MSG_ERROR( "MDTcabling can't return an online ID for the channel : " ); ATH_MSG_ERROR( "MDTcabling can't return an online ID for the channel : " );
...@@ -273,7 +273,7 @@ StatusCode MdtDigitToMdtRDO::fillTagInfo() const { ...@@ -273,7 +273,7 @@ StatusCode MdtDigitToMdtRDO::fillTagInfo() const {
ServiceHandle<ITagInfoMgr> tagInfoMgr ("TagInfoMgr", name()); ServiceHandle<ITagInfoMgr> tagInfoMgr ("TagInfoMgr", name());
if (tagInfoMgr.retrieve().isFailure()) if (tagInfoMgr.retrieve().isFailure())
return StatusCode::FAILURE; return StatusCode::FAILURE;
/*
std::string cablingType=""; std::string cablingType="";
if (m_cabling->usingOldCabling() ) { if (m_cabling->usingOldCabling() ) {
cablingType="OldMDT_Cabling"; cablingType="OldMDT_Cabling";
...@@ -281,7 +281,9 @@ StatusCode MdtDigitToMdtRDO::fillTagInfo() const { ...@@ -281,7 +281,9 @@ StatusCode MdtDigitToMdtRDO::fillTagInfo() const {
else { else {
cablingType="NewMDT_Cabling"; cablingType="NewMDT_Cabling";
} }
*/
//this should be new from Run2 so the switch can be removed
std::string cablingType="NewMDT_Cabling";
StatusCode sc = tagInfoMgr->addTag("MDT_CablingType",cablingType); StatusCode sc = tagInfoMgr->addTag("MDT_CablingType",cablingType);
if(sc.isFailure()) { if(sc.isFailure()) {
......
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