From c40cd8e10838207719edb62966d41a47caf1028a Mon Sep 17 00:00:00 2001 From: Davide Di Croce <davide.di.croce@cern.ch> Date: Fri, 25 Oct 2024 15:50:09 +0200 Subject: [PATCH 1/5] Adding variables to Carnesale --- .../MuonBucketDump/src/BucketDumperAlg.cxx | 19 +++++++++++++++++-- .../MuonBucketDump/src/BucketDumperAlg.h | 5 +++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/MuonSpectrometer/MuonPhaseII/MuonCnv/MuonBucketDump/src/BucketDumperAlg.cxx b/MuonSpectrometer/MuonPhaseII/MuonCnv/MuonBucketDump/src/BucketDumperAlg.cxx index ef8f232981a7..719dd824c8b2 100644 --- a/MuonSpectrometer/MuonPhaseII/MuonCnv/MuonBucketDump/src/BucketDumperAlg.cxx +++ b/MuonSpectrometer/MuonPhaseII/MuonCnv/MuonBucketDump/src/BucketDumperAlg.cxx @@ -86,7 +86,6 @@ namespace MuonR4{ m_segmentDir.push_back(segment->direction()); m_segment_chiSquared.push_back(segment->chi2()); m_segment_numberDoF.push_back(segment->nDoF()); - } } @@ -101,15 +100,27 @@ namespace MuonR4{ continue; } + id = m_idHelperSvc->elementID(sp->identify()); + if (!m_idHelperSvc->isMuon(id)) { + ATH_MSG_FATAL("The Identifier "<<m_idHelperSvc->toString(id)<<" is not a muon one."); + throw std::runtime_error("Invalid Identifier set"); + } + m_stIdx.bucket(id); + m_stEta.push_back(m_idHelperSvc->stationEta(id)); + m_stPhi.push_back(m_idHelperSvc->stationPhi(id)); + + const std::vector<int16_t>& segIdxs = spacePointToSegment[sp]; m_spoint_mat[m_spoint_mat.size()] = segIdxs; m_spoint_nSegments.push_back(segIdxs.size()); m_spoint_id.push_back(sp->identify()); + m_bucket_spacePoints = bucket->size(); m_spoint_localPosition.push_back(sp->positionInChamber()); m_spoint_adc.push_back(dc->adc()); + m_spoint_adc.push_back(dc->tdc()); m_spoint_covX.push_back(sp->covariance()(Amg::x, Amg::x)); m_spoint_covY.push_back(sp->covariance()(Amg::y, Amg::y)); m_spoint_covXY.push_back(sp->covariance()(Amg::x, Amg::y)); @@ -125,6 +136,11 @@ namespace MuonR4{ m_spoint_isStrip.push_back(false); + + + + + } ++layer; @@ -134,7 +150,6 @@ namespace MuonR4{ for (const auto sp : hitsInLay){ - const std::vector<int16_t>& segIdxs = spacePointToSegment[sp]; m_spoint_mat[m_spoint_mat.size()] = segIdxs; diff --git a/MuonSpectrometer/MuonPhaseII/MuonCnv/MuonBucketDump/src/BucketDumperAlg.h b/MuonSpectrometer/MuonPhaseII/MuonCnv/MuonBucketDump/src/BucketDumperAlg.h index b3c6b7d0128e..06c890f28255 100644 --- a/MuonSpectrometer/MuonPhaseII/MuonCnv/MuonBucketDump/src/BucketDumperAlg.h +++ b/MuonSpectrometer/MuonPhaseII/MuonCnv/MuonBucketDump/src/BucketDumperAlg.h @@ -42,7 +42,7 @@ class BucketDumperAlg: public AthHistogramAlgorithm { private: - void fillChamberInfo(const MuonGMR4::MuonChamber* chamber); + void fillChamberInfo(const MuonGMR4::Chamber* chamber); SG::ReadHandleKey<SpacePointContainer> m_readKey{this, "ReadKey", "MuonSpacePoints", "Key to the space point container"}; ServiceHandle<Muon::IMuonIdHelperSvc> m_idHelperSvc{this, "MuonIdHelperSvc", "Muon::MuonIdHelperSvc/MuonIdHelperSvc"}; @@ -54,7 +54,7 @@ class BucketDumperAlg: public AthHistogramAlgorithm { Gaudi::Property<double> m_fracToKeep{this,"dataFracToKeep", 0.055}; Gaudi::Property<std::string> m_streamName{this, "StreamName", ""}; ServiceHandle<IAthRNGSvc> m_rndmSvc{this, "RndmSvc", "AthRNGSvc", ""}; - CLHEP::HepRandomEngine* getRandomEngine(const EventContext&ctx) const; + CLHEP::HepRandomEngine* getRandomEngine(const EventContext&ctx) const; MuonVal::MuonTesterTree m_tree{"MuonBucketDump","MuonBucketDump"}; @@ -70,6 +70,7 @@ class BucketDumperAlg: public AthHistogramAlgorithm { MuonVal::VectorBranch<bool>& m_spoint_isStrip{m_tree.newVector<bool>("isStrip", false)}; MuonVal::VectorBranch<uint16_t>& m_spoint_adc{m_tree.newVector<uint16_t>("adc")}; + MuonVal::VectorBranch<uint16_t>& m_spoint_tdc{m_tree.newVector<uint16_t>("tdc")}; MuonVal::VectorBranch<float>& m_spoint_covX{m_tree.newVector<float>("covX")}; MuonVal::VectorBranch<float>& m_spoint_covXY{m_tree.newVector<float>("covXY")}; -- GitLab From a7aac18e756775a235040c319f15eeae2e937345 Mon Sep 17 00:00:00 2001 From: Davide Di Croce <davide.di.croce@cern.ch> Date: Sun, 27 Oct 2024 07:23:03 +0100 Subject: [PATCH 2/5] Adding infos --- .../MuonBucketDump/src/BucketDumperAlg.cxx | 31 +++++++++---------- .../MuonBucketDump/src/BucketDumperAlg.h | 12 +++++-- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/MuonSpectrometer/MuonPhaseII/MuonCnv/MuonBucketDump/src/BucketDumperAlg.cxx b/MuonSpectrometer/MuonPhaseII/MuonCnv/MuonBucketDump/src/BucketDumperAlg.cxx index 719dd824c8b2..192c95dc3587 100644 --- a/MuonSpectrometer/MuonPhaseII/MuonCnv/MuonBucketDump/src/BucketDumperAlg.cxx +++ b/MuonSpectrometer/MuonPhaseII/MuonCnv/MuonBucketDump/src/BucketDumperAlg.cxx @@ -25,7 +25,7 @@ namespace MuonR4{ StatusCode BucketDumperAlg::initialize() { ATH_CHECK(m_readKey.initialize()); ATH_CHECK(m_idHelperSvc.retrieve()); - ATH_CHECK(m_inSimHitKeys.initialize()); + ATH_CHECK(m_geoCtxKey.initialize()); ATH_CHECK(m_inSegmentKey.initialize(!m_inSegmentKey.empty())); ATH_CHECK(m_tree.init(this)); ATH_CHECK(m_idHelperSvc.retrieve()); @@ -50,6 +50,9 @@ namespace MuonR4{ segmentMap[segment->parent()->parentBucket()].push_back(segment); } + SG::ReadHandle gctx(m_geoCtxKey, ctx); + ATH_CHECK(gctx.isPresent()); + SG::ReadHandle<SpacePointContainer> readHandle{m_readKey, ctx}; ATH_CHECK(readHandle.isPresent()); @@ -100,23 +103,19 @@ namespace MuonR4{ continue; } - id = m_idHelperSvc->elementID(sp->identify()); - if (!m_idHelperSvc->isMuon(id)) { - ATH_MSG_FATAL("The Identifier "<<m_idHelperSvc->toString(id)<<" is not a muon one."); - throw std::runtime_error("Invalid Identifier set"); - } - m_stIdx.bucket(id); - m_stEta.push_back(m_idHelperSvc->stationEta(id)); - m_stPhi.push_back(m_idHelperSvc->stationPhi(id)); + m_spoint_id.push_back(sp->identify()); + Identifier id = sp->identify(); + //m_spoint_stIndex.bucket(id); + //m_spoint_stEta.push_back(m_idHelperSvc->stationEta(id)); + //m_spoint_stPhi.push_back(m_idHelperSvc->stationPhi(id)); + m_spoint_stML.push_back(m_idHelperSvc->multilayer(id)); const std::vector<int16_t>& segIdxs = spacePointToSegment[sp]; m_spoint_mat[m_spoint_mat.size()] = segIdxs; m_spoint_nSegments.push_back(segIdxs.size()); - - m_spoint_id.push_back(sp->identify()); - + m_bucket_spacePoints = bucket->size(); m_spoint_localPosition.push_back(sp->positionInChamber()); m_spoint_adc.push_back(dc->adc()); @@ -135,11 +134,9 @@ namespace MuonR4{ m_spoint_isMdt.push_back(true); m_spoint_isStrip.push_back(false); - - - - - + // Global position + Amg::Vector3D globalPos = sp->msSector()->localToGlobalTrans(*gctx) * sp->positionInChamber() + m_spoint_globalPosition.push_back( globalPos ); } ++layer; diff --git a/MuonSpectrometer/MuonPhaseII/MuonCnv/MuonBucketDump/src/BucketDumperAlg.h b/MuonSpectrometer/MuonPhaseII/MuonCnv/MuonBucketDump/src/BucketDumperAlg.h index 06c890f28255..b0e9c06e57ea 100644 --- a/MuonSpectrometer/MuonPhaseII/MuonCnv/MuonBucketDump/src/BucketDumperAlg.h +++ b/MuonSpectrometer/MuonPhaseII/MuonCnv/MuonBucketDump/src/BucketDumperAlg.h @@ -47,9 +47,10 @@ class BucketDumperAlg: public AthHistogramAlgorithm { SG::ReadHandleKey<SpacePointContainer> m_readKey{this, "ReadKey", "MuonSpacePoints", "Key to the space point container"}; ServiceHandle<Muon::IMuonIdHelperSvc> m_idHelperSvc{this, "MuonIdHelperSvc", "Muon::MuonIdHelperSvc/MuonIdHelperSvc"}; - SG::ReadHandleKeyArray<xAOD::MuonSimHitContainer> m_inSimHitKeys {this, "SimHitKeys",{}, "xAOD SimHit collections"}; SG::ReadHandleKey<MuonR4::SegmentContainer> m_inSegmentKey{this, "SegmentKey", "R4MuonSegments"}; + SG::ReadHandleKey<ActsGeometryContext> m_geoCtxKey{this, "AlignmentKey", "ActsAlignment", "cond handle key"}; + Gaudi::Property<bool> m_isMC{this, "isMC", true}; Gaudi::Property<double> m_fracToKeep{this,"dataFracToKeep", 0.055}; Gaudi::Property<std::string> m_streamName{this, "StreamName", ""}; @@ -63,12 +64,19 @@ class BucketDumperAlg: public AthHistogramAlgorithm { MuonVal::ScalarBranch<uint16_t>& m_bucket_spacePoints{m_tree.newScalar<uint16_t>("bucket_spacePoints", 0)}; MuonVal::ScalarBranch<uint16_t>& m_bucket_segments{m_tree.newScalar<uint16_t>("bucket_segments", 0)}; - MuonVal::MuonIdentifierBranch m_spoint_id{m_tree, "id"}; MuonVal::ThreeVectorBranch m_spoint_localPosition{m_tree, "localPosition"}; + MuonVal::ThreeVectorBranch m_spoint_globalPosition{m_tree, "globalPosition"}; MuonVal::VectorBranch<uint16_t>& m_spoint_layer{m_tree.newVector<uint16_t>("Layer")}; MuonVal::VectorBranch<bool>& m_spoint_isMdt{m_tree.newVector<bool>("isMdt", false)}; MuonVal::VectorBranch<bool>& m_spoint_isStrip{m_tree.newVector<bool>("isStrip", false)}; + MuonVal::MuonIdentifierBranch m_spoint_id{m_tree, "id"}; + //MuonVal::ScalarBranch<unsigned short>& m_spoint_stIndex{m_tree.newScalar<unsigned short>("stationIndex")}; + //MuonVal::ScalarBranch<short>& m_spoint_stEta{m_tree.newScalar<short>("stationEta")}; + //MuonVal::ScalarBranch<short>& m_spoint_stPhi{m_tree.newScalar<short>("stationPhi")}; + MuonVal::ScalarBranch<short>& m_spoint_stML{m_tree.newScalar<short>("stationMultiLayer")}; + + MuonVal::VectorBranch<uint16_t>& m_spoint_adc{m_tree.newVector<uint16_t>("adc")}; MuonVal::VectorBranch<uint16_t>& m_spoint_tdc{m_tree.newVector<uint16_t>("tdc")}; -- GitLab From afcc1382434ff9aad693ace6114ca762783370cc Mon Sep 17 00:00:00 2001 From: Davide Di Croce <davide.di.croce@cern.ch> Date: Mon, 28 Oct 2024 10:28:57 +0100 Subject: [PATCH 3/5] Adding MultiLayer --- .../MuonBucketDump/src/BucketDumperAlg.cxx | 16 +++++++++++----- .../MuonCnv/MuonBucketDump/src/BucketDumperAlg.h | 4 ---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/MuonSpectrometer/MuonPhaseII/MuonCnv/MuonBucketDump/src/BucketDumperAlg.cxx b/MuonSpectrometer/MuonPhaseII/MuonCnv/MuonBucketDump/src/BucketDumperAlg.cxx index 192c95dc3587..a92b43c2880c 100644 --- a/MuonSpectrometer/MuonPhaseII/MuonCnv/MuonBucketDump/src/BucketDumperAlg.cxx +++ b/MuonSpectrometer/MuonPhaseII/MuonCnv/MuonBucketDump/src/BucketDumperAlg.cxx @@ -106,10 +106,8 @@ namespace MuonR4{ m_spoint_id.push_back(sp->identify()); Identifier id = sp->identify(); - //m_spoint_stIndex.bucket(id); - //m_spoint_stEta.push_back(m_idHelperSvc->stationEta(id)); - //m_spoint_stPhi.push_back(m_idHelperSvc->stationPhi(id)); - m_spoint_stML.push_back(m_idHelperSvc->multilayer(id)); + // for multilayer we need specific detector helper (mdtIdHelper, cscIdHelper, rpcIdHelper, tgcIdHelper, mmIdHelper) + m_spoint_stML = (m_idHelperSvc->mdtIdHelper().multilayer(id)); const std::vector<int16_t>& segIdxs = spacePointToSegment[sp]; @@ -135,7 +133,7 @@ namespace MuonR4{ m_spoint_isStrip.push_back(false); // Global position - Amg::Vector3D globalPos = sp->msSector()->localToGlobalTrans(*gctx) * sp->positionInChamber() + Amg::Vector3D globalPos = sp->msSector()->localToGlobalTrans(*gctx) * sp->positionInChamber(); m_spoint_globalPosition.push_back( globalPos ); } @@ -147,6 +145,10 @@ namespace MuonR4{ for (const auto sp : hitsInLay){ + Identifier id = sp->identify(); + // for multilayer we need specific detector helper (mdtIdHelper, cscIdHelper, rpcIdHelper, tgcIdHelper, mmIdHelper) + //m_spoint_stML = (m_idHelperSvc->mdtIdHelper().multilayer(id)); + const std::vector<int16_t>& segIdxs = spacePointToSegment[sp]; m_spoint_mat[m_spoint_mat.size()] = segIdxs; @@ -172,6 +174,10 @@ namespace MuonR4{ m_spoint_isStrip.push_back(true); m_spoint_isMdt.push_back(false); + // Global position + Amg::Vector3D globalPos = sp->msSector()->localToGlobalTrans(*gctx) * sp->positionInChamber(); + m_spoint_globalPosition.push_back( globalPos ); + } ++layer; } diff --git a/MuonSpectrometer/MuonPhaseII/MuonCnv/MuonBucketDump/src/BucketDumperAlg.h b/MuonSpectrometer/MuonPhaseII/MuonCnv/MuonBucketDump/src/BucketDumperAlg.h index b0e9c06e57ea..731d689a22f3 100644 --- a/MuonSpectrometer/MuonPhaseII/MuonCnv/MuonBucketDump/src/BucketDumperAlg.h +++ b/MuonSpectrometer/MuonPhaseII/MuonCnv/MuonBucketDump/src/BucketDumperAlg.h @@ -71,12 +71,8 @@ class BucketDumperAlg: public AthHistogramAlgorithm { MuonVal::VectorBranch<bool>& m_spoint_isStrip{m_tree.newVector<bool>("isStrip", false)}; MuonVal::MuonIdentifierBranch m_spoint_id{m_tree, "id"}; - //MuonVal::ScalarBranch<unsigned short>& m_spoint_stIndex{m_tree.newScalar<unsigned short>("stationIndex")}; - //MuonVal::ScalarBranch<short>& m_spoint_stEta{m_tree.newScalar<short>("stationEta")}; - //MuonVal::ScalarBranch<short>& m_spoint_stPhi{m_tree.newScalar<short>("stationPhi")}; MuonVal::ScalarBranch<short>& m_spoint_stML{m_tree.newScalar<short>("stationMultiLayer")}; - MuonVal::VectorBranch<uint16_t>& m_spoint_adc{m_tree.newVector<uint16_t>("adc")}; MuonVal::VectorBranch<uint16_t>& m_spoint_tdc{m_tree.newVector<uint16_t>("tdc")}; -- GitLab From d11f8e1335a5f67225801ba813f213134685163c Mon Sep 17 00:00:00 2001 From: Davide Di Croce <davide.di.croce@cern.ch> Date: Mon, 28 Oct 2024 14:56:04 +0100 Subject: [PATCH 4/5] Adding MDT layer and tubes --- .../MuonBucketDump/src/BucketDumperAlg.cxx | 29 ++++++++++++++----- .../MuonBucketDump/src/BucketDumperAlg.h | 13 +++++++-- 2 files changed, 32 insertions(+), 10 deletions(-) diff --git a/MuonSpectrometer/MuonPhaseII/MuonCnv/MuonBucketDump/src/BucketDumperAlg.cxx b/MuonSpectrometer/MuonPhaseII/MuonCnv/MuonBucketDump/src/BucketDumperAlg.cxx index a92b43c2880c..d12c2b2eecf9 100644 --- a/MuonSpectrometer/MuonPhaseII/MuonCnv/MuonBucketDump/src/BucketDumperAlg.cxx +++ b/MuonSpectrometer/MuonPhaseII/MuonCnv/MuonBucketDump/src/BucketDumperAlg.cxx @@ -106,8 +106,11 @@ namespace MuonR4{ m_spoint_id.push_back(sp->identify()); Identifier id = sp->identify(); - // for multilayer we need specific detector helper (mdtIdHelper, cscIdHelper, rpcIdHelper, tgcIdHelper, mmIdHelper) - m_spoint_stML = (m_idHelperSvc->mdtIdHelper().multilayer(id)); + unsigned int mdt_ML = m_idHelperSvc->mdtIdHelper().multilayer(id); + unsigned int mdt_TL = m_idHelperSvc->mdtIdHelper().tubeLayer(id); + unsigned int mdt_nL = m_idHelperSvc->mdtIdHelper().tubeLayerMax(id); + m_spoint_mdtLayer = mdt_ML * (mdt_nL-1) + mdt_TL; + m_spoint_mdtTube = m_idHelperSvc->mdtIdHelper().tube(id); const std::vector<int16_t>& segIdxs = spacePointToSegment[sp]; @@ -130,7 +133,6 @@ namespace MuonR4{ m_spoint_dimension.push_back(sp->dimension()); m_spoint_layer.push_back(layer); m_spoint_isMdt.push_back(true); - m_spoint_isStrip.push_back(false); // Global position Amg::Vector3D globalPos = sp->msSector()->localToGlobalTrans(*gctx) * sp->positionInChamber(); @@ -145,9 +147,23 @@ namespace MuonR4{ for (const auto sp : hitsInLay){ - Identifier id = sp->identify(); - // for multilayer we need specific detector helper (mdtIdHelper, cscIdHelper, rpcIdHelper, tgcIdHelper, mmIdHelper) - //m_spoint_stML = (m_idHelperSvc->mdtIdHelper().multilayer(id)); + //Identifier id = sp->identify(); + //if (m_idHelperSvc->cscIdHelper().is_csc(id)){ + // m_spoint_stML = (m_idHelperSvc->cscIdHelper().chamberLayer(id)); + // m_spoint_isCsc.push_back(true); + //} + //if (m_idHelperSvc->rpcIdHelper().is_rpc(id)){ + // m_spoint_stML = (m_idHelperSvc->rpcIdHelper().doubletR(id)); + // m_spoint_isRpc.push_back(true); + //} + //if (m_idHelperSvc->tgcIdHelper().is_tgc(id)){ + // //m_spoint_stML = (m_idHelperSvc->tgcIdHelper().gasGap(id)); + // m_spoint_isTgc.push_back(true); + //} + //if (m_idHelperSvc->mmIdHelper().is_mm(id)){ + // m_spoint_stML = (m_idHelperSvc->mmIdHelper(). + // m_spoint_isMm.push_back(true); + //} const std::vector<int16_t>& segIdxs = spacePointToSegment[sp]; @@ -172,7 +188,6 @@ namespace MuonR4{ m_spoint_dimension.push_back(sp->dimension()); m_spoint_layer.push_back(layer); m_spoint_isStrip.push_back(true); - m_spoint_isMdt.push_back(false); // Global position Amg::Vector3D globalPos = sp->msSector()->localToGlobalTrans(*gctx) * sp->positionInChamber(); diff --git a/MuonSpectrometer/MuonPhaseII/MuonCnv/MuonBucketDump/src/BucketDumperAlg.h b/MuonSpectrometer/MuonPhaseII/MuonCnv/MuonBucketDump/src/BucketDumperAlg.h index 731d689a22f3..eb1a82810b88 100644 --- a/MuonSpectrometer/MuonPhaseII/MuonCnv/MuonBucketDump/src/BucketDumperAlg.h +++ b/MuonSpectrometer/MuonPhaseII/MuonCnv/MuonBucketDump/src/BucketDumperAlg.h @@ -66,12 +66,19 @@ class BucketDumperAlg: public AthHistogramAlgorithm { MuonVal::ThreeVectorBranch m_spoint_localPosition{m_tree, "localPosition"}; MuonVal::ThreeVectorBranch m_spoint_globalPosition{m_tree, "globalPosition"}; + + MuonVal::MuonIdentifierBranch m_spoint_id{m_tree, "id"}; MuonVal::VectorBranch<uint16_t>& m_spoint_layer{m_tree.newVector<uint16_t>("Layer")}; - MuonVal::VectorBranch<bool>& m_spoint_isMdt{m_tree.newVector<bool>("isMdt", false)}; MuonVal::VectorBranch<bool>& m_spoint_isStrip{m_tree.newVector<bool>("isStrip", false)}; + MuonVal::VectorBranch<bool>& m_spoint_isMdt{m_tree.newVector<bool>("isMdt", false)}; + MuonVal::ScalarBranch<short>& m_spoint_mdtLayer{m_tree.newScalar<short>("mdtLayer", 0)}; + MuonVal::ScalarBranch<short>& m_spoint_mdtTube{m_tree.newScalar<short>("mdtTube", 0)}; - MuonVal::MuonIdentifierBranch m_spoint_id{m_tree, "id"}; - MuonVal::ScalarBranch<short>& m_spoint_stML{m_tree.newScalar<short>("stationMultiLayer")}; + //MuonVal::VectorBranch<bool>& m_spoint_isCsc{m_tree.newVector<bool>("isCsc", false)}; + //MuonVal::VectorBranch<bool>& m_spoint_isRpc{m_tree.newVector<bool>("isRpc", false)}; + //MuonVal::VectorBranch<bool>& m_spoint_isTgc{m_tree.newVector<bool>("isTgc", false)}; + //MuonVal::VectorBranch<bool>& m_spoint_isMm{m_tree.newVector<bool>("isMm", false)}; + MuonVal::VectorBranch<uint16_t>& m_spoint_adc{m_tree.newVector<uint16_t>("adc")}; MuonVal::VectorBranch<uint16_t>& m_spoint_tdc{m_tree.newVector<uint16_t>("tdc")}; -- GitLab From 0ffa4e6b5f6879333435391ac6e6a220eecc3504 Mon Sep 17 00:00:00 2001 From: Davide Di Croce <davide.di.croce@cern.ch> Date: Mon, 28 Oct 2024 15:25:47 +0100 Subject: [PATCH 5/5] Removing comments --- .../MuonBucketDump/src/BucketDumperAlg.cxx | 20 ------------------- .../MuonBucketDump/src/BucketDumperAlg.h | 6 ------ 2 files changed, 26 deletions(-) diff --git a/MuonSpectrometer/MuonPhaseII/MuonCnv/MuonBucketDump/src/BucketDumperAlg.cxx b/MuonSpectrometer/MuonPhaseII/MuonCnv/MuonBucketDump/src/BucketDumperAlg.cxx index d12c2b2eecf9..c5e855d88903 100644 --- a/MuonSpectrometer/MuonPhaseII/MuonCnv/MuonBucketDump/src/BucketDumperAlg.cxx +++ b/MuonSpectrometer/MuonPhaseII/MuonCnv/MuonBucketDump/src/BucketDumperAlg.cxx @@ -134,7 +134,6 @@ namespace MuonR4{ m_spoint_layer.push_back(layer); m_spoint_isMdt.push_back(true); - // Global position Amg::Vector3D globalPos = sp->msSector()->localToGlobalTrans(*gctx) * sp->positionInChamber(); m_spoint_globalPosition.push_back( globalPos ); @@ -147,24 +146,6 @@ namespace MuonR4{ for (const auto sp : hitsInLay){ - //Identifier id = sp->identify(); - //if (m_idHelperSvc->cscIdHelper().is_csc(id)){ - // m_spoint_stML = (m_idHelperSvc->cscIdHelper().chamberLayer(id)); - // m_spoint_isCsc.push_back(true); - //} - //if (m_idHelperSvc->rpcIdHelper().is_rpc(id)){ - // m_spoint_stML = (m_idHelperSvc->rpcIdHelper().doubletR(id)); - // m_spoint_isRpc.push_back(true); - //} - //if (m_idHelperSvc->tgcIdHelper().is_tgc(id)){ - // //m_spoint_stML = (m_idHelperSvc->tgcIdHelper().gasGap(id)); - // m_spoint_isTgc.push_back(true); - //} - //if (m_idHelperSvc->mmIdHelper().is_mm(id)){ - // m_spoint_stML = (m_idHelperSvc->mmIdHelper(). - // m_spoint_isMm.push_back(true); - //} - const std::vector<int16_t>& segIdxs = spacePointToSegment[sp]; m_spoint_mat[m_spoint_mat.size()] = segIdxs; @@ -189,7 +170,6 @@ namespace MuonR4{ m_spoint_layer.push_back(layer); m_spoint_isStrip.push_back(true); - // Global position Amg::Vector3D globalPos = sp->msSector()->localToGlobalTrans(*gctx) * sp->positionInChamber(); m_spoint_globalPosition.push_back( globalPos ); diff --git a/MuonSpectrometer/MuonPhaseII/MuonCnv/MuonBucketDump/src/BucketDumperAlg.h b/MuonSpectrometer/MuonPhaseII/MuonCnv/MuonBucketDump/src/BucketDumperAlg.h index eb1a82810b88..4b1b44d01fc0 100644 --- a/MuonSpectrometer/MuonPhaseII/MuonCnv/MuonBucketDump/src/BucketDumperAlg.h +++ b/MuonSpectrometer/MuonPhaseII/MuonCnv/MuonBucketDump/src/BucketDumperAlg.h @@ -74,12 +74,6 @@ class BucketDumperAlg: public AthHistogramAlgorithm { MuonVal::ScalarBranch<short>& m_spoint_mdtLayer{m_tree.newScalar<short>("mdtLayer", 0)}; MuonVal::ScalarBranch<short>& m_spoint_mdtTube{m_tree.newScalar<short>("mdtTube", 0)}; - //MuonVal::VectorBranch<bool>& m_spoint_isCsc{m_tree.newVector<bool>("isCsc", false)}; - //MuonVal::VectorBranch<bool>& m_spoint_isRpc{m_tree.newVector<bool>("isRpc", false)}; - //MuonVal::VectorBranch<bool>& m_spoint_isTgc{m_tree.newVector<bool>("isTgc", false)}; - //MuonVal::VectorBranch<bool>& m_spoint_isMm{m_tree.newVector<bool>("isMm", false)}; - - MuonVal::VectorBranch<uint16_t>& m_spoint_adc{m_tree.newVector<uint16_t>("adc")}; MuonVal::VectorBranch<uint16_t>& m_spoint_tdc{m_tree.newVector<uint16_t>("tdc")}; -- GitLab