Merge branch 'RemovePosInStat' into 'main'

xAODMuonPrepData - Remove the tube Pos  & strip Pos in station data members

See merge request atlas/athena!70657

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

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)

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);

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

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);

MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/Root/RpcStrip_v1.cxx

 /*
-   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

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

MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/Root/TgcStrip_v1.cxx

 /*
-   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

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

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 

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{};

MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/MdtDriftCircle_v1.h

 /*
-   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);

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{};

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 

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

MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/versions/TgcStrip_v1.h

 /*
-   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