diff --git a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/Root/MMClusterAuxContainer_v1.cxx b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/Root/MMClusterAuxContainer_v1.cxx
index 4f9058387e75fe11848b79aac3dca6df95d026af..ee4c75e419b7198d901d7f145c7a2f66fffdb084 100644
--- a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/Root/MMClusterAuxContainer_v1.cxx
+++ b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/Root/MMClusterAuxContainer_v1.cxx
@@ -34,7 +34,6 @@ MMClusterAuxContainer_v1::MMClusterAuxContainer_v1()
PRD_AUXVARIABLE(stripCharges);
PRD_AUXVARIABLE(stripDriftDist);
PRD_AUXVARIABLE(stripDriftErrors);
- PRD_AUXVARIABLE(stripPosInStation);
}
} // namespace xAOD
#undef PRD_AUXVARIABLE
\ No newline at end of file
diff --git a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/Root/MMCluster_v1.cxx b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/Root/MMCluster_v1.cxx
index 984fea0dfad2d2117164fb12f98024d619da6750..f44b33f53170afabd6f9f4b6b051211a5b538a11 100644
--- a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/Root/MMCluster_v1.cxx
+++ b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/Root/MMCluster_v1.cxx
@@ -13,7 +13,6 @@
namespace {
static const std::string preFixStr{"Mm_"};
- static const xAOD::PosAccessor<3> accStripPos{preFixStr + "stripPosInStation"};
}
@@ -25,13 +24,6 @@ IdentifierHash MMCluster_v1::measurementHash() const {
IdentifierHash MMCluster_v1::layerHash() const {
return MuonGMR4::MmReadoutElement::createHash(0, gasGap());
}
-void MMCluster_v1::setStripPosInStation(const MeasVector<3>& pos){
- VectorMap<3> v{accStripPos(*this).data()};
- v = pos;
-}
-ConstVectorMap<3> MMCluster_v1::stripPosInStation() const {
- return ConstVectorMap<3>{accStripPos(*this).data()};
-}
IMPLEMENT_SETTER_GETTER(MMCluster_v1, uint16_t, time, setTime)
IMPLEMENT_SETTER_GETTER(MMCluster_v1, uint32_t, charge, setCharge)
IMPLEMENT_SETTER_GETTER(MMCluster_v1, float, driftDist, setDriftDist)
diff --git a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/Root/MdtDriftCircleAuxContainer_v1.cxx b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/Root/MdtDriftCircleAuxContainer_v1.cxx
index e09cc2f45e081b8665289941350bea9247cfaf0d..912ff2d30e48a0cb5b5c805f119d809e8dd9b7fa 100644
--- a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/Root/MdtDriftCircleAuxContainer_v1.cxx
+++ b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/Root/MdtDriftCircleAuxContainer_v1.cxx
@@ -22,7 +22,6 @@ MdtDriftCircleAuxContainer_v1::MdtDriftCircleAuxContainer_v1()
AUX_MEASUREMENTVAR(localCovariance, 1)
/// Names may be shared across different subdetectors
- PRD_AUXVARIABLE(tubePosInStation);
PRD_AUXVARIABLE(tdc);
PRD_AUXVARIABLE(adc);
PRD_AUXVARIABLE(driftTube);
diff --git a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/Root/MdtDriftCircle_v1.cxx b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/Root/MdtDriftCircle_v1.cxx
index 7086c04ac003d509cd7ff41cc7eb2960d0b7c667..c378f4cb75f8ef9d1ce3becf13a33fc7dea2917b 100644
--- a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/Root/MdtDriftCircle_v1.cxx
+++ b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/Root/MdtDriftCircle_v1.cxx
@@ -12,8 +12,7 @@
#include "StoreGate/StoreGateSvc.h"
namespace {
- static const std::string preFixStr{"Mdt_"};
- static const xAOD::PosAccessor<3> accTubePos{preFixStr + "tubePosInStation"};
+ static const std::string preFixStr{"Mdt_"};
}
namespace xAOD {
@@ -47,12 +46,5 @@ void MdtDriftCircle_v1::setDriftRadius(float r) {
void MdtDriftCircle_v1::setDriftRadCov(float cov) {
localCovariance<1>()(Trk::locR, Trk::locR) = cov;
}
-void MdtDriftCircle_v1::setTubePosInStation(const MeasVector<3>& pos){
- VectorMap<3> v{accTubePos(*this).data()};
- v = pos;
-}
-ConstVectorMap<3> MdtDriftCircle_v1::tubePosInStation() const {
- return ConstVectorMap<3>{accTubePos(*this).data()};
-}
} // namespace xAOD
diff --git a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/Root/RpcStripAuxContainer_v1.cxx b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/Root/RpcStripAuxContainer_v1.cxx
index 6f18dc711040c4e91790c5dd7775931e53423850..1f9683bd228bef1b7dd376cf1cd2d6b807fbf318 100644
--- a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/Root/RpcStripAuxContainer_v1.cxx
+++ b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/Root/RpcStripAuxContainer_v1.cxx
@@ -25,7 +25,6 @@ RpcStripAuxContainer_v1::RpcStripAuxContainer_v1()
PRD_AUXVARIABLE(triggerInfo);
PRD_AUXVARIABLE(ambiguityFlag);
PRD_AUXVARIABLE(timeOverThreshold);
- PRD_AUXVARIABLE(stripPosInStation);
PRD_AUXVARIABLE(stripNumber);
PRD_AUXVARIABLE(gasGap);
diff --git a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/Root/RpcStrip_v1.cxx b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/Root/RpcStrip_v1.cxx
index e93797cef11a5b78ce01b3691de5a3278f608ac2..0bc3f377486d6519940dc76ec960df979675bc4e 100644
--- a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/Root/RpcStrip_v1.cxx
+++ b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/Root/RpcStrip_v1.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
// EDM include(s):
@@ -14,7 +14,6 @@
namespace {
static const std::string preFixStr{"Rpc_"};
- static const xAOD::PosAccessor<3> accStripPos{preFixStr + "stripPosInStation"};
}
namespace xAOD {
@@ -37,13 +36,6 @@ IdentifierHash RpcStrip_v1::measurementHash() const {
IdentifierHash RpcStrip_v1::layerHash() const {
return MuonGMR4::RpcReadoutElement::createHash(0, gasGap(), doubletPhi(), measuresPhi());
}
-void RpcStrip_v1::setStripPosInStation(const MeasVector<3>& pos){
- VectorMap<3> v{accStripPos(*this).data()};
- v = pos;
-}
-ConstVectorMap<3> RpcStrip_v1::stripPosInStation() const {
- return ConstVectorMap<3>{accStripPos(*this).data()};
-}
} // namespace xAOD
#undef IMPLEMENT_SETTER_GETTER
diff --git a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/Root/TgcStripAuxContainer_v1.cxx b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/Root/TgcStripAuxContainer_v1.cxx
index a05e6e5acf5147e796685a050013596c83acc8f0..b82a97ad34c63f6e9f00417f136d6407751cd4fa 100644
--- a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/Root/TgcStripAuxContainer_v1.cxx
+++ b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/Root/TgcStripAuxContainer_v1.cxx
@@ -27,7 +27,6 @@ TgcStripAuxContainer_v1::TgcStripAuxContainer_v1()
PRD_AUXVARIABLE(channelNumber);
PRD_AUXVARIABLE(gasGap);
PRD_AUXVARIABLE(measuresPhi);
- PRD_AUXVARIABLE(stripPosInStation);
}
} // namespace xAOD
#undef PRD_AUXVARIABLE
\ No newline at end of file
diff --git a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/Root/TgcStrip_v1.cxx b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/Root/TgcStrip_v1.cxx
index 162743c6c7de455e41f96c627e7812e1047b9bee..69ae91061a10311abc35193d8bc247e6c01bc0e9 100644
--- a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/Root/TgcStrip_v1.cxx
+++ b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/Root/TgcStrip_v1.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
// EDM include(s):
@@ -13,8 +13,6 @@
namespace {
static const std::string preFixStr{"Tgc_"};
- static const xAOD::PosAccessor<3> accStripPos{preFixStr + "stripPosInStation"};
-
}
namespace xAOD {
@@ -31,12 +29,5 @@ IdentifierHash TgcStrip_v1::measurementHash() const {
IdentifierHash TgcStrip_v1::layerHash() const {
return MuonGMR4::TgcReadoutElement::constructHash(0, gasGap(), measuresPhi());
}
-void TgcStrip_v1::setStripPosInStation(const MeasVector<3>& pos){
- VectorMap<3> v{accStripPos(*this).data()};
- v = pos;
-}
-ConstVectorMap<3> TgcStrip_v1::stripPosInStation() const {
- return ConstVectorMap<3>{accStripPos(*this).data()};
-}
} // namespace xAOD
#undef IMPLEMENT_SETTER_GETTER
diff --git a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/MMClusterAuxContainer_v1.h b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/MMClusterAuxContainer_v1.h
index e36b1d1ed5000bd4ae7c2dc21fa7325093b3d7c1..06a07cffe316dc4fdb3d89b8e35655f525695a51 100644
--- a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/MMClusterAuxContainer_v1.h
+++ b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/MMClusterAuxContainer_v1.h
@@ -42,7 +42,6 @@ class MMClusterAuxContainer_v1 : public AuxContainerBase {
std::vector<std::vector<int>> stripCharges{};
std::vector<std::vector<float>> stripDriftDist{};
std::vector<std::vector<PosAccessor<2>::element_type>> stripDriftErrors{};
- std::vector<PosAccessor<3>::element_type> stripPosInStation{};
/// @}
};
} // namespace xAOD
diff --git a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/MMCluster_v1.h b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/MMCluster_v1.h
index bf845fba35b21fc642a9db2effa068d6946e8869..d0fa27203c1ee41b3e4f6d8d009ea1e9b78882f0 100644
--- a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/MMCluster_v1.h
+++ b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/MMCluster_v1.h
@@ -107,14 +107,6 @@ class MMCluster_v1 : public UncalibratedMeasurement_v1 {
Exceptions are thrown if that fails as well */
const MuonGMR4::MmReadoutElement* readoutElement() const;
- /** @brief Returns the local position of the strip within
- * the Muon Station (I.e. the center plane between 2 multilayers)
- */
- ConstVectorMap<3> stripPosInStation() const;
-
- /** @brief Sets the position of the strip within a muon station*/
- void setStripPosInStation(const MeasVector<3>& pos);
-
private:
#ifdef __CLING__
/// Down cast the memory of the readoutElement cache if the object is stored to disk
diff --git a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/MdtDriftCircleAuxContainer_v1.h b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/MdtDriftCircleAuxContainer_v1.h
index c902e6162c7ce21404f0a70e6d373509489f7bed..d525807720d284843584cfe61ee508b757445acc 100644
--- a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/MdtDriftCircleAuxContainer_v1.h
+++ b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/MdtDriftCircleAuxContainer_v1.h
@@ -26,8 +26,6 @@ class MdtDriftCircleAuxContainer_v1 : public AuxContainerBase {
std::vector<PosAccessor<1>::element_type> localPosition{};
std::vector<CovAccessor<1>::element_type> localCovariance{};
- std::vector<PosAccessor<3>::element_type> tubePosInStation{};
-
std::vector<int16_t> tdc{};
std::vector<int16_t> adc{};
std::vector<uint16_t> driftTube{};
diff --git a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/MdtDriftCircle_v1.h b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/MdtDriftCircle_v1.h
index 5fa03659cede499c534c69e4b4c4dfc6c22ccb95..ef3fe63e44cd74ec9aec9000d889c449aa7e4cf8 100644
--- a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/MdtDriftCircle_v1.h
+++ b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/MdtDriftCircle_v1.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
#ifndef XAODMUONPREPDATA_VERSION_MDTDRIFTCIRCLE_V1_H
#define XAODMUONPREPDATA_VERSION_MDTDRIFTCIRCLE_V1_H
@@ -48,10 +48,6 @@ class MdtDriftCircle_v1 : public UncalibratedMeasurement_v1 {
float driftRadiusCov() const;
/** @brief Returns the uncertainty on the drift radius*/
float driftRadiusUncert() const;
- /** @brief Returns the local position of the tube within
- * the Muon Station (I.e. the center plane between 2 multilayers)
- */
- ConstVectorMap<3> tubePosInStation() const;
/// Setter methods
@@ -69,8 +65,6 @@ class MdtDriftCircle_v1 : public UncalibratedMeasurement_v1 {
void setDriftRadius(float r);
/** @brief Sets the covariance on the drift circle */
void setDriftRadCov(float cov);
- /** @brief Sets the position of the tube within a muon station*/
- void setTubePosInStation(const MeasVector<3>& pos);
/** @brief set the pointer to the MdtReadoutElement */
void setReadoutElement(const MuonGMR4::MdtReadoutElement* readoutEle);
diff --git a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/RpcStripAuxContainer_v1.h b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/RpcStripAuxContainer_v1.h
index 66a16b2434090aa7465fe37602216fc5cddfc6c1..2dc0615ec9ee14963e21a3bc6174fa3baa8a53b4 100644
--- a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/RpcStripAuxContainer_v1.h
+++ b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/RpcStripAuxContainer_v1.h
@@ -30,7 +30,6 @@ class RpcStripAuxContainer_v1 : public AuxContainerBase {
std::vector<uint32_t> triggerInfo{}; // FIXME - how big do we need this to be?
std::vector<uint8_t> ambiguityFlag{};
std::vector<float> timeOverThreshold{};
- std::vector<PosAccessor<3>::element_type> stripPosInStation{};
std::vector<uint16_t> stripNumber{};
std::vector<uint8_t> gasGap{};
diff --git a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/RpcStrip_v1.h b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/RpcStrip_v1.h
index 7277755a8755086d70f22a7cd8c78db302fc3b52..949bb9c324b072c653ec4141871ee5afccc6327a 100644
--- a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/RpcStrip_v1.h
+++ b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/RpcStrip_v1.h
@@ -77,14 +77,6 @@ class RpcStrip_v1 : public UncalibratedMeasurement_v1 {
Exceptions are thrown if that fails as well */
const MuonGMR4::RpcReadoutElement* readoutElement() const;
- /** @brief Returns the local position of the strip within
- * the Muon Station (I.e. the center plane between 2 multilayers)
- */
- ConstVectorMap<3> stripPosInStation() const;
-
- /** @brief Sets the position of the strip within a muon station*/
- void setStripPosInStation(const MeasVector<3>& pos);
-
private:
#ifdef __CLING__
/// Down cast the memory of the readoutElement cache if the object is stored to disk
diff --git a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/TgcStripAuxContainer_v1.h b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/TgcStripAuxContainer_v1.h
index 255fcff9dd396464c9b20dab853b949d8a9daa0d..afdf5d5ffa65f3b9d40d9e077fe9e1da5d77f807 100644
--- a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/TgcStripAuxContainer_v1.h
+++ b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/TgcStripAuxContainer_v1.h
@@ -31,7 +31,6 @@ class TgcStripAuxContainer_v1 : public AuxContainerBase {
std::vector<uint16_t> channelNumber{};
std::vector<uint8_t> gasGap{};
std::vector<uint8_t> measuresPhi{};
- std::vector<PosAccessor<3>::element_type> stripPosInStation{};
/// @}
};
} // namespace xAOD
diff --git a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/TgcStrip_v1.h b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/TgcStrip_v1.h
index 4e9371b63c66fa0f8459b9c1ce77dde7b566bc86..f21a9e484124acc90dd58323d8bec7be6ccdda50 100644
--- a/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/TgcStrip_v1.h
+++ b/MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/TgcStrip_v1.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
#ifndef XAODMUONPREPDATA_VERSION_TGCSTRIP_V1_H
#define XAODMUONPREPDATA_VERSION_TGCSTRIP_V1_H
@@ -61,13 +61,7 @@ class TgcStrip_v1 : public UncalibratedMeasurement_v1 {
If the element has not been set before, it's tried to load it on the fly.
Exceptions are thrown if that fails as well */
const MuonGMR4::TgcReadoutElement* readoutElement() const;
- /** @brief Returns the local position of the strip within
- * the Muon Station (I.e. the center plane between 2 multilayers)
- */
- ConstVectorMap<3> stripPosInStation() const;
- /** @brief Sets the position of the strip within a muon station*/
- void setStripPosInStation(const MeasVector<3>& pos);
private:
#ifdef __CLING__
/// Down cast the memory of the readoutElement cache if the object is stored to disk