Skip to content
Snippets Groups Projects
Commit b98c642e authored by Frank Winklmeier's avatar Frank Winklmeier
Browse files

Merge branch 'hasHelper.MuonIdHelpers-20191018' into 'master'

MuonIdHelpers: Add methods to test for the existence of subdetector helpers.

See merge request !27297
parents 25705b3b b6269d55
No related branches found
No related tags found
7 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,!27297MuonIdHelpers: Add methods to test for the existence of subdetector helpers.
......@@ -119,21 +119,39 @@ namespace Muon {
/** @brief access to MdtIdHelper */
const MdtIdHelper& mdtIdHelper() const { return m_muonIdHelperSvc->mdtIdHelper(); }
/** @brief Test presence of MdtIdHelper */
bool hasMdtIdHelper() const { return m_mdtIdHelper != nullptr; }
/** @brief access to RpcIdHelper */
const RpcIdHelper& rpcIdHelper() const { return m_muonIdHelperSvc->rpcIdHelper(); }
/** @brief Test presence of RpcIdHelper */
bool hasRpcIdHelper() const { return m_rpcIdHelper != nullptr; }
/** @brief access to TgcIdHelper */
const TgcIdHelper& tgcIdHelper() const { return m_muonIdHelperSvc->tgcIdHelper(); }
/** @brief Test presence of TgcIdHelper */
bool hasTgcIdHelper() const { return m_tgcIdHelper != nullptr; }
/** @brief access to CscIdHelper */
const CscIdHelper& cscIdHelper() const { return m_muonIdHelperSvc->cscIdHelper(); }
/** @brief Test presence of CscIdHelper */
bool hasCscIdHelper() const { return m_cscIdHelper != nullptr; }
/** @brief access to TgcIdHelper */
const sTgcIdHelper& stgcIdHelper() const { return m_muonIdHelperSvc->stgcIdHelper(); }
/** @brief Test presence of sTgcIdHelper */
bool hassTgcIdHelper() const { return m_stgcIdHelper != nullptr; }
/** @brief access to CscIdHelper */
const MmIdHelper& mmIdHelper() const { return m_muonIdHelperSvc->mmIdHelper(); }
/** @brief Test presence of sTgcIdHelper */
bool hasMmIdHelper() const { return m_mmIdHelper != nullptr; }
/** @brief calculate chamber index from Identifier */
MuonStationIndex::ChIndex chamberIndex( const Identifier& id ) const { return m_muonIdHelperSvc->chamberIndex(id); }
......
  • Hi @fwinkl, did you merge this in without a successful CI? Adding also @pboescho. We think that this cannot compile like it is (e.g. m_mdtIdHelper is not a member of MuonIdHelperTool.h. Best, Nico

  • Could just use the m_muonIdHelperSvc->hasCSC() etc methods for a quick fix

  • or just revert the merge, since the methods are never called anyway

  • Author Maintainer

    You are right, the release is broken: !27317 (merged)

    Strange, because the CI did succeed before the weekend. Anyhow, reverting this now.

  • yes, the reason is that !27297 (merged) was made with a nightly which still had the MuonIdHelperTool which was then migrated to a Service. Thus, now !27297 (merged) is not in sync with the Service anymore. So, reverting is fine.

  • Nicolas Koehler @nkoehler

    mentioned in merge request !27297 (merged)

    ·

    mentioned in merge request !27297 (merged)

    Toggle commit list
  • Author Maintainer

    Right, !27110 (merged) got merged just before !27297 (merged). And amazingly it didn't create a merge conflict.

  • Yes, it is quite surprising!

  • Owner

    Ouch. :-(

  • Frank Winklmeier @fwinkl

    mentioned in commit 97756ff5

    ·

    mentioned in commit 97756ff5

    Toggle commit list
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