diff --git a/MuonSpectrometer/MuonCablings/MuonCablingData/MuonCablingData/MuonMDT_CablingMap.h b/MuonSpectrometer/MuonCablings/MuonCablingData/MuonCablingData/MuonMDT_CablingMap.h index 1c8e34e58bf0d63ce2cfc33d8bd303103c7fb5ef..c2ee5f755afd39bede1f88b49822a8ac7ecc7546 100644 --- a/MuonSpectrometer/MuonCablings/MuonCablingData/MuonCablingData/MuonMDT_CablingMap.h +++ b/MuonSpectrometer/MuonCablings/MuonCablingData/MuonCablingData/MuonMDT_CablingMap.h @@ -66,10 +66,10 @@ class MuonMDT_CablingMap : public MdtMapBase<MdtSubdetectorMap> { MdtSubdetectorMap* getSubdetectorMap(uint8_t subdetectorId) const; /** return the ROD id of a given chamber, given station, eta, phi */ - uint32_t getROBId(int station, int eta, int phi); + uint32_t getROBId(int station, int eta, int phi) const; /** return the ROD id of a given chamber, given the hash id */ - uint32_t getROBId(const IdentifierHash stationCode); + uint32_t getROBId(const IdentifierHash stationCode) const; /** return a vector of HashId lists for a given list of ROD's */ const std::vector<IdentifierHash> getChamberHashVec(const std::vector< uint32_t> &ROBId_list) const; @@ -90,7 +90,7 @@ class MuonMDT_CablingMap : public MdtMapBase<MdtSubdetectorMap> { bool getOnlineId(int stationName, int stationEta, int stationPhi, int multiLayer, int layer, int tube, uint8_t& subdetectorId, uint8_t& rodId, uint8_t& csmId, - uint8_t& tdcId, uint8_t& channelId); + uint8_t& tdcId, uint8_t& channelId) const; private: @@ -113,7 +113,7 @@ class MuonMDT_CablingMap : public MdtMapBase<MdtSubdetectorMap> { ListOfROD* m_listOfROD; /** private function to compute a station code for the chamber to ROD map */ - bool getStationCode(int station, int eta, int phi, IdentifierHash& mdtIdHash); + bool getStationCode(int station, int eta, int phi, IdentifierHash& mdtIdHash) const; /** Pointer to the MdtIdHelper */ const MdtIdHelper* m_mdtIdHelper; diff --git a/MuonSpectrometer/MuonCablings/MuonCablingData/src/MuonMDT_CablingMap.cxx b/MuonSpectrometer/MuonCablings/MuonCablingData/src/MuonMDT_CablingMap.cxx index 7765b16154f745402682c65ea179410546db5c6b..9e598e05feaf1a253a2cf97dcd3fa4d0cf3dbe2e 100644 --- a/MuonSpectrometer/MuonCablings/MuonCablingData/src/MuonMDT_CablingMap.cxx +++ b/MuonSpectrometer/MuonCablings/MuonCablingData/src/MuonMDT_CablingMap.cxx @@ -367,7 +367,7 @@ bool MuonMDT_CablingMap::addChamberToRODMap(int station, int eta, int phi, * */ bool MuonMDT_CablingMap::getStationCode(int station, int eta, int phi, - IdentifierHash& mdtHashId) + IdentifierHash& mdtHashId) const { // create the station identifier Identifier elementId = m_mdtIdHelper->elementID(station,eta,phi); @@ -387,7 +387,7 @@ bool MuonMDT_CablingMap::getStationCode(int station, int eta, int phi, * return the ROBid of a given station, identified through station, eta, phi * */ -uint32_t MuonMDT_CablingMap::getROBId(int station, int eta, int phi) +uint32_t MuonMDT_CablingMap::getROBId(int station, int eta, int phi) const { int rodId = 0; @@ -407,7 +407,7 @@ uint32_t MuonMDT_CablingMap::getROBId(int station, int eta, int phi) } // get the ROBid given the identifier hash -uint32_t MuonMDT_CablingMap::getROBId(const IdentifierHash stationCode) +uint32_t MuonMDT_CablingMap::getROBId(const IdentifierHash stationCode) const { int rodId = 0; @@ -587,7 +587,7 @@ bool MuonMDT_CablingMap::getOnlineId(int stationName, int stationEta, int statio int multiLayer, int layer, int tube, uint8_t& subdetectorId, uint8_t& rodId, uint8_t& csmId, uint8_t& tdcId, - uint8_t& channelId) + uint8_t& channelId) const { diff --git a/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/MdtTestCabling.cxx b/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/MdtTestCabling.cxx index f2f37b26e61ba7e24a163ed41be41368720fa26f..6d032dfc921cf9e1c491a74171b7f71eba6bd730 100644 --- a/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/MdtTestCabling.cxx +++ b/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/MdtTestCabling.cxx @@ -183,8 +183,12 @@ bool MdtTestCabling::testMap() // test the back-conversion to online indeces m_chronoSvc->chronoStart(m_chrono3); + /* cabling = m_cablingSvc->getOnlineId(station,eta,phi,multi,layer,tube, newSubdet,newRod,newCsm,newAmt,newChan); + */ + cabling = readCdo->getOnlineId(station,eta,phi,multi,layer,tube,newSubdet,newRod,newCsm,newAmt,newChan); + m_chronoSvc->chronoStop(m_chrono3); if (!cabling) {