PrepData R4 - Add BI RpcStrip container class

PrepData R4 - Add BI RpcStrip container class

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

+/*
+   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+*/
+
+// EDM include(s):
+#include "xAODMuonPrepData/versions/AccessorMacros.h"
+// Local include(s):
+#include "MuonReadoutGeometryR4/RpcReadoutElement.h"
+#include "xAODMuonPrepData/versions/RpcMeasurement_v1.h"
+#include "GaudiKernel/ServiceHandle.h"
+#include "MuonReadoutGeometryR4/MuonDetectorManager.h"
+#include "StoreGate/StoreGateSvc.h"
+
+namespace {
+    static const std::string preFixStr{"Rpc_"};
+}
+
+namespace xAOD {
+    IMPLEMENT_SETTER_GETTER(RpcMeasurement_v1, float, time, setTime)
+    IMPLEMENT_SETTER_GETTER(RpcMeasurement_v1, uint32_t, triggerInfo, setTriggerInfo)
+    IMPLEMENT_SETTER_GETTER(RpcMeasurement_v1, uint8_t, ambiguityFlag, setAmbiguityFlag)
+    IMPLEMENT_SETTER_GETTER(RpcMeasurement_v1, float, timeOverThreshold, setTimeOverThreshold)
+    IMPLEMENT_SETTER_GETTER(RpcMeasurement_v1, uint16_t, stripNumber, setStripNumber)
+    IMPLEMENT_SETTER_GETTER(RpcMeasurement_v1, uint8_t, gasGap, setGasGap)
+    IMPLEMENT_SETTER_GETTER(RpcMeasurement_v1, uint8_t, doubletPhi, setDoubletPhi)
+    IMPLEMENT_READOUTELEMENT(RpcMeasurement_v1, m_readoutEle, RpcReadoutElement)
+
+    IdentifierHash RpcMeasurement_v1::measurementHash() const {
+        return MuonGMR4::RpcReadoutElement::createHash(stripNumber(), 
+                                                       gasGap(),
+                                                       doubletPhi(),
+                                                       measuresPhi());
+    }
+    IdentifierHash RpcMeasurement_v1::layerHash() const {
+        return MuonGMR4::RpcReadoutElement::createHash(0, gasGap(), doubletPhi(), measuresPhi());
+    }
+}
\ No newline at end of file

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

+/*
+   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+*/
+
+// EDM include(s):
+#include "xAODMuonPrepData/versions/AccessorMacros.h"
+// Local include(s):
+#include "xAODMuonPrepData/versions/RpcStrip2DAuxContainer_v1.h"
+
+namespace {
+   static const std::string preFixStr{"Rpc_"};
+}
+
+namespace xAOD {
+RpcStrip2DAuxContainer_v1::RpcStrip2DAuxContainer_v1()
+    : AuxContainerBase() {
+    /// Identifier variable hopefully unique
+    AUX_VARIABLE(identifier);
+    AUX_VARIABLE(identifierHash);  
+    AUX_MEASUREMENTVAR(localPosition, 2)
+    AUX_MEASUREMENTVAR(localCovariance, 2)
+    
+    /// Names may be shared across different subdetectors
+    PRD_AUXVARIABLE(time);
+    PRD_AUXVARIABLE(triggerInfo);
+    PRD_AUXVARIABLE(ambiguityFlag);
+    PRD_AUXVARIABLE(timeOverThreshold);
+
+    PRD_AUXVARIABLE(stripNumber);
+    PRD_AUXVARIABLE(gasGap);
+    PRD_AUXVARIABLE(doubletPhi);
+}
+}  // namespace xAOD

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

+/*
+   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+*/
+// Local include(s):
+#include "xAODMuonPrepData/versions/RpcStrip2D_v1.h"
+
+namespace xAOD {
+    uint8_t RpcStrip2D_v1::measuresPhi() const { return 0; }
+}  // namespace xAOD

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

@@ -5,37 +5,12 @@
 // EDM include(s):
 #include "xAODMuonPrepData/versions/AccessorMacros.h"
 // Local include(s):
-#include "MuonReadoutGeometryR4/RpcReadoutElement.h"
-#include "TrkEventPrimitives/ParamDefs.h"
 #include "xAODMuonPrepData/versions/RpcStrip_v1.h"
-#include "GaudiKernel/ServiceHandle.h"
-#include "MuonReadoutGeometryR4/MuonDetectorManager.h"
-#include "StoreGate/StoreGateSvc.h"
+
 
 namespace {
     static const std::string preFixStr{"Rpc_"};
 }
 namespace xAOD {
-
-IMPLEMENT_SETTER_GETTER(RpcStrip_v1, float, time, setTime)
-IMPLEMENT_SETTER_GETTER(RpcStrip_v1, uint32_t, triggerInfo, setTriggerInfo)
-IMPLEMENT_SETTER_GETTER(RpcStrip_v1, uint8_t, ambiguityFlag, setAmbiguityFlag)
-IMPLEMENT_SETTER_GETTER(RpcStrip_v1, float, timeOverThreshold, setTimeOverThreshold)
-IMPLEMENT_SETTER_GETTER(RpcStrip_v1, uint16_t, stripNumber, setStripNumber)
-IMPLEMENT_SETTER_GETTER(RpcStrip_v1, uint8_t, gasGap, setGasGap)
-IMPLEMENT_SETTER_GETTER(RpcStrip_v1, uint8_t, doubletPhi, setDoubletPhi)
-IMPLEMENT_SETTER_GETTER(RpcStrip_v1, uint8_t, measuresPhi, setMeasuresPhi)
-IMPLEMENT_READOUTELEMENT(RpcStrip_v1, m_readoutEle, RpcReadoutElement)
-
-IdentifierHash RpcStrip_v1::measurementHash() const {
-    return MuonGMR4::RpcReadoutElement::createHash(stripNumber(), 
-                                                   gasGap(),
-                                                   doubletPhi(),
-                                                   measuresPhi());
-}
-IdentifierHash RpcStrip_v1::layerHash() const {
-    return MuonGMR4::RpcReadoutElement::createHash(0, gasGap(), doubletPhi(), measuresPhi());
-}
-
+    IMPLEMENT_SETTER_GETTER(RpcStrip_v1, uint8_t, measuresPhi, setMeasuresPhi)
 }  // namespace xAOD
-#undef IMPLEMENT_SETTER_GETTER

MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/Root/dict/ContainerProxies.cxx

@@ -7,7 +7,9 @@
 
 // Local include(s):
 #include "xAODMuonPrepData/versions/MdtDriftCircleContainer_v1.h"
+#include "xAODMuonPrepData/versions/RpcStrip2DContainer_v1.h"
 #include "xAODMuonPrepData/versions/RpcStripContainer_v1.h"
+
 #include "xAODMuonPrepData/versions/TgcStripContainer_v1.h"
 #include "xAODMuonPrepData/versions/MMClusterContainer_v1.h"
 #include "xAODMuonPrepData/versions/sTgcStripContainer_v1.h"
@@ -17,6 +19,7 @@
 // Set up the collection proxies:
 ADD_NS_DV_PROXY(xAOD, MdtDriftCircleContainer_v1);
 ADD_NS_DV_PROXY(xAOD, RpcStripContainer_v1);
+ADD_NS_DV_PROXY(xAOD, RpcStrip2DContainer_v1);
 ADD_NS_DV_PROXY(xAOD, TgcStripContainer_v1);
 ADD_NS_DV_PROXY(xAOD, MMClusterContainer_v1);
 ADD_NS_DV_PROXY(xAOD, sTgcStripContainer_v1);

MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/RpcMeasurement.h

+/*
+   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+*/
+#ifndef XAODMUONPREPDATA_RPCMEASUREMENT_H
+#define XAODMUONPREPDATA_RPCMEASUREMENT_H
+
+#include "xAODMuonPrepData/versions/RpcMeasurement_v1.h"
+
+/// Namespace holding all the xAOD EDM classes
+namespace xAOD {
+/// Defined the version of the RpcStrip
+typedef RpcMeasurement_v1 RpcMeasurement;
+}  // namespace xAOD
+
+// Set up a CLID for the class:
+#include "xAODCore/CLASS_DEF.h"
+CLASS_DEF( xAOD::RpcMeasurement , 47915827 , 1 )
+
+#endif  // XAODMUONPREPDATA_RPCSTRIP_H

MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/RpcMeasurementContainer.h

+/*
+   Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef XAODMUONPREPDATA_RPCMEASUREMENTCONTAINER_H
+#define XAODMUONPREPDATA_RPCMEASUREMENTCONTAINER_H
+
+#include "xAODMuonPrepData/RpcStrip.h"
+#include "xAODMuonPrepData/RpcStrip2D.h"
+#include "xAODMuonPrepData/versions/RpcMeasurementContainer_v1.h"
+
+/// Namespace holding all the xAOD EDM classes
+namespace xAOD {
+/// Define the version of the pixel cluster container
+typedef RpcMeasurementContainer_v1 RpcMeasurementContainer;
+}  // namespace xAOD
+
+// Set up a CLID for the class:
+#include "xAODCore/CLASS_DEF.h"
+CLASS_DEF( xAOD::RpcMeasurementContainer , 1183064885 , 1 )
+#endif
\ No newline at end of file

MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/RpcStrip2D.h

+/*
+   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+*/
+#ifndef XAODMUONPREPDATA_RPCSTRIP2D_H
+#define XAODMUONPREPDATA_RPCSTRIP2D_H
+
+#include "xAODMuonPrepData/versions/RpcStrip2D_v1.h"
+
+/// Namespace holding all the xAOD EDM classes
+namespace xAOD {
+/// Defined the version of the RpcStrip
+typedef RpcStrip2D_v1 RpcStrip2D;
+}  // namespace xAOD
+
+// Set up a CLID for the class:
+#include "xAODCore/CLASS_DEF.h"
+CLASS_DEF( xAOD::RpcStrip2D , 223619931 , 1 )
+
+#endif  // XAODMUONPREPDATA_RPCSTRIP_H

MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/RpcStrip2DAuxContainer.h

+/*
+   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+*/
+#ifndef XAODMUONPREPDATA_RPCSTRIP2DAUXCONTAINER_H
+#define XAODMUONPREPDATA_RPCSTRIP2DAUXCONTAINER_H
+
+#include "xAODMuonPrepData/versions/RpcStrip2DAuxContainer_v1.h"
+
+/// Namespace holding all the xAOD EDM classes
+namespace xAOD {
+/// Defined the version of the RpcStrip
+typedef RpcStrip2DAuxContainer_v1 RpcStrip2DAuxContainer;
+}  // namespace xAOD
+
+// Set up a CLID for the class:
+#include "xAODCore/CLASS_DEF.h"
+CLASS_DEF( xAOD::RpcStrip2DAuxContainer , 1173306900 , 1 )
+#endif  // XAODMUONRDO_NRPCRDO_H

MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/RpcStrip2DContainer.h

+/*
+   Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef XAODMUONPREPDATA_RPCSTRIP2DCONTAINER_H
+#define XAODMUONPREPDATA_RPCSTRIP2DCONTAINER_H
+
+#include "xAODMuonPrepData/RpcStrip2D.h"
+#include "xAODMuonPrepData/versions/RpcStrip2DContainer_v1.h"
+
+/// Namespace holding all the xAOD EDM classes
+namespace xAOD {
+/// Define the version of the pixel cluster container
+typedef RpcStrip2DContainer_v1 RpcStrip2DContainer;
+}  // namespace xAOD
+
+// Set up a CLID for the class:
+#include "xAODCore/CLASS_DEF.h"
+CLASS_DEF( xAOD::RpcStrip2DContainer , 1233075333 , 1 )
+
+#endif
\ No newline at end of file

MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/selection.xml

@@ -22,6 +22,18 @@
            id="BF3DD4C7-A81D-44B1-91FB-1FE5C06908D2" />
     <typedef name = "xAOD::RpcStripAuxContainer" />
 
+  <class name="xAOD::RpcStrip2D_v1" />
+    <class name="xAOD::RpcStrip2DContainer_v1"
+           id="4DC6DF3F-36C5-4486-A6DE-06DAF13AB5EA" />
+    <typedef name="xAOD::RpcStrip2D" />
+    <typedef name="xAOD::RpcStrip2DContainer" />
+    
+    <class name="xAOD::RpcStrip2DAuxContainer_v1"
+           id="1EA22CAA-758E-4322-AE51-200CE3225107" />
+    <typedef name = "xAOD::RpcStrip2DAuxContainer" />
+
+   
+
     <!-- Tgc Strip -->
     <class name="xAOD::TgcStrip_v1" />
     <class name="xAOD::TgcStripContainer_v1"

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

+/*
+   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+*/
+#ifndef XAODMUONPREPDATA_VERSION_RPCSTRIP2DCONTAINER_V1_H
+#define XAODMUONPREPDATA_VERSION_RPCSTRIP2DCONTAINER_V1_H
+
+// Core include(s):
+#include "AthContainers/DataVector.h"
+#include "xAODMuonPrepData/versions/RpcMeasurement_v1.h"
+
+namespace xAOD {
+   /// The container is a simple typedef for now
+   typedef DataVector<xAOD::RpcMeasurement_v1> RpcMeasurementContainer_v1;
+}  // namespace xAOD
+
+#endif
\ No newline at end of file

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

+/*
+   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+*/
+#ifndef XAODMUONPREPDATA_VERSION_RPCMEASUREMENT_V1_H
+#define XAODMUONPREPDATA_VERSION_RPCMEASUREMENT_V1_H
+
+#include "GeoPrimitives/GeoPrimitives.h"
+#include "Identifier/Identifier.h"
+#include "Identifier/IdentifierHash.h"
+#include "xAODMeasurementBase/versions/UncalibratedMeasurement_v1.h"
+#include "MuonReadoutGeometryR4/RpcReadoutElement.h"
+namespace xAOD {
+
+/** @brief RpcMeasurement_v1: Class storing the geneic 
+ * 
+*/
+
+class RpcMeasurement_v1 : public UncalibratedMeasurement_v1 {
+
+   public:
+    /// Default constructor
+    RpcMeasurement_v1() = default;
+    /// Virtual destructor
+    virtual ~RpcMeasurement_v1() = default;
+
+    /// Returns the type of the Rpc strip as a simple enumeration
+    xAOD::UncalibMeasType type() const override final {
+        return xAOD::UncalibMeasType::RpcStripType;
+    }
+    /** @brief returns the associated strip number*/
+    uint16_t stripNumber() const;
+    /** @brief returns the associated gas gap */
+    uint8_t gasGap() const;
+    /** @brief returns whether the hit measures the phi coordinate */
+    virtual uint8_t measuresPhi() const = 0;
+    /** @brief doubletPhi identifier field of the measurement */
+    uint8_t doubletPhi() const;
+
+    /** @brief Returns the time. */
+    float time() const;
+
+    /** @brief Returns the trigger coincidence - usually false, unless ijk>5 or highpt&&ijk==0*/
+    uint32_t triggerInfo() const;
+
+    /** @brief Returns the number of ambiguities associated with this RpcPrepData.
+        - 0 if the ambiguites have not been removed by choice;
+        - 1 if the ambiguities are fully solved
+        - i+1 if "i" other MuonPrepRawData are produced along with the current one from a single RDO hit*/
+    uint8_t ambiguityFlag() const;
+
+    /** @brief Returns the time over threshold */
+    float timeOverThreshold() const;
+
+    /** @brief Returns the hash of the measurement channel */
+    IdentifierHash measurementHash() const;
+    /** @brief Returns the hash of the associated layer (Needed for surface retrieval)*/
+    IdentifierHash layerHash() const;
+    /** @brief Sets the the triger time of the hit */
+    void setTime(float time);
+    /** @brief Set the trigger info of the hit  */
+    void setTriggerInfo(uint32_t triggerinfo);
+    /** @brief Sets the ADC counts */
+    void setAmbiguityFlag(uint8_t ambi);
+    /** @brief Sets the TDC counts */
+    void setTimeOverThreshold(float timeoverthreshold);
+    /** @brief Sets the doubletPhi identifier field */
+    void setDoubletPhi(uint8_t doubPhi);
+    /** @brief Sets the  associated gasGap identifier field */
+    void setGasGap(uint8_t gap);
+    /** @brief Sets the associated strip number identifier field */
+    void setStripNumber(uint16_t strip);
+    /** @brief set the pointer to the ReadoutElement */
+    void setReadoutElement(const MuonGMR4::RpcReadoutElement* readoutEle);
+    /** @brief Retrieve the associated MdtReadoutElement. 
+        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::RpcReadoutElement* readoutElement() const;
+
+    private:
+#ifdef __CLING__
+    /// Down cast the memory of the readoutElement cache if the object is stored to disk 
+    ///  to arrive at the same memory layout between Athena & CLING
+    char m_readoutEle[sizeof(CxxUtils::CachedValue<const MuonGMR4::RpcReadoutElement*>)]{};
+#else
+    CxxUtils::CachedValue<const MuonGMR4::RpcReadoutElement*> m_readoutEle{};
+#endif
+
+};
+
+}  // namespace xAOD
+
+#include "AthContainers/DataVector.h"
+DATAVECTOR_BASE(xAOD::RpcMeasurement_v1, xAOD::UncalibratedMeasurement_v1);
+#endif

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

+/*
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef XAODMUONPREPDATA_VERSIONS_BIRPCSTRIPAUXCONTAINER_V1_H
+#define XAODMUONPREPDATA_VERSIONS_BIRPCSTRIPAUXCONTAINER_V1_H
+
+#include "Identifier/Identifier.h"
+#include "Identifier/IdentifierHash.h"
+#include "xAODCore/AuxContainerBase.h"
+#include "xAODMeasurementBase/MeasurementDefs.h"
+
+namespace xAOD {
+/// Auxiliary store for Mdt drift circles
+///
+class RpcStrip2DAuxContainer_v1 : public AuxContainerBase {
+   public:
+    /// Default constructor
+    RpcStrip2DAuxContainer_v1();
+
+   private:
+    /// @name Defining Rpc strip parameter
+    /// @{
+    std::vector<DetectorIdentType> identifier{};
+    std::vector<DetectorIDHashType> identifierHash{};
+    std::vector<PosAccessor<2>::element_type> localPosition{};
+    std::vector<CovAccessor<2>::element_type> localCovariance{};
+
+    std::vector<float> time{};
+    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<uint16_t> stripNumber{};
+    std::vector<uint8_t> gasGap{};
+    std::vector<uint8_t> doubletPhi{};
+    /// @}
+};
+}  // namespace xAOD
+
+// Set up the StoreGate inheritance for the class:
+#include "xAODCore/BaseInfo.h"
+SG_BASE(xAOD::RpcStrip2DAuxContainer_v1, xAOD::AuxContainerBase);
+#endif

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

+/*
+   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+*/
+#ifndef XAODMUONPREPDATA_VERSION_RPCSTRIP2DCONTAINER_V1_H
+#define XAODMUONPREPDATA_VERSION_RPCSTRIP2DCONTAINER_V1_H
+
+// Core include(s):
+#include "AthContainers/DataVector.h"
+#include "xAODMuonPrepData/versions/RpcStrip2D_v1.h"
+
+namespace xAOD {
+   /// The container is a simple typedef for now
+   typedef DataVector<xAOD::RpcStrip2D_v1> RpcStrip2DContainer_v1;
+}  // namespace xAOD
+
+#endif
\ No newline at end of file

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

+/*
+   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+*/
+#ifndef XAODMUONPREPDATA_VERSION_RPCSTRIP2D_V1_H
+#define XAODMUONPREPDATA_VERSION_RPCSTRIP2D_V1_H
+
+#include "xAODMuonPrepData/versions/RpcMeasurement_v1.h"
+
+namespace xAOD {
+
+class RpcStrip2D_v1 : public RpcMeasurement_v1 {
+
+   public:
+        /// Default constructor
+        RpcStrip2D_v1() = default;
+        /// Virtual RpcStrip2D_v1
+        virtual ~RpcStrip2D_v1() = default;
+
+        unsigned int numDimensions() const override final { return 2; }
+        
+        /** @brief returns whether the hit measures the phi coordinate */
+        uint8_t measuresPhi() const override final;
+     
+
+};
+
+}  // namespace xAOD
+
+#include "AthContainers/DataVector.h"
+DATAVECTOR_BASE_FIN(xAOD::RpcStrip2D_v1, xAOD::RpcMeasurement_v1);
+#endif

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

@@ -4,92 +4,29 @@
 #ifndef XAODMUONPREPDATA_VERSION_RPCSTRIP_V1_H
 #define XAODMUONPREPDATA_VERSION_RPCSTRIP_V1_H
 
-#include "GeoPrimitives/GeoPrimitives.h"
-#include "Identifier/Identifier.h"
-#include "Identifier/IdentifierHash.h"
-#include "xAODMeasurementBase/versions/UncalibratedMeasurement_v1.h"
-#include "MuonReadoutGeometryR4/RpcReadoutElement.h"
+#include "xAODMuonPrepData/versions/RpcMeasurement_v1.h"
+
 namespace xAOD {
 
-class RpcStrip_v1 : public UncalibratedMeasurement_v1 {
+class RpcStrip_v1 : public RpcMeasurement_v1 {
 
    public:
-    /// Default constructor
-    RpcStrip_v1() = default;
-    /// Virtual destructor
-    virtual ~RpcStrip_v1() = default;
-
-    /// Returns the type of the Rpc strip as a simple enumeration
-    xAOD::UncalibMeasType type() const override final {
-        return xAOD::UncalibMeasType::RpcStripType;
-    }
-    unsigned int numDimensions() const override final { return 1; }
-    
-    /** @brief returns the associated strip number*/
-    uint16_t stripNumber() const;
-
-    void setStripNumber(uint16_t strip);
-    /** @brief returns the associated gas gap */
-    uint8_t gasGap() const;
-
-    void setGasGap(uint8_t gap);
-    /** @brief returns whether the hit measures the phi coordinate */
-    uint8_t measuresPhi() const;
-
-    void setMeasuresPhi(uint8_t measPhi);
-     /** @brief doubletPhi */
-    uint8_t doubletPhi() const;
-
-    void setDoubletPhi(uint8_t doubPhi);
-    
-    /** @brief Returns the time. */
-    float time() const;
-
-    /** @brief Returns the trigger coincidence - usually false, unless ijk>5 or highpt&&ijk==0*/
-    uint32_t triggerInfo() const;
-
-    /** @brief Returns the number of ambiguities associated with this RpcPrepData.
-        - 0 if the ambiguites have not been removed by choice;
-        - 1 if the ambiguities are fully solved
-        - i+1 if "i" other MuonPrepRawData are produced along with the current one from a single RDO hit*/
-    uint8_t ambiguityFlag() const;
-
-    /** @brief Returns the time over threshold */
-    float timeOverThreshold() const;
-
-    /** @brief Returns the hash of the measurement channel */
-    IdentifierHash measurementHash() const;
-    /** @brief Returns the hash of the associated layer (Needed for surface retrieval)*/
-    IdentifierHash layerHash() const;
-    /** @brief Sets the the triger time of the hit */
-    void setTime(float time);
-    /** @brief Set the trigger info of the hit  */
-    void setTriggerInfo(uint32_t triggerinfo);
-    /** @brief Sets the ADC counts */
-    void setAmbiguityFlag(uint8_t ambi);
-    /** @brief Sets the TDC counts */
-    void setTimeOverThreshold(float timeoverthreshold);
-
-    /** @brief set the pointer to the ReadoutElement */
-    void setReadoutElement(const MuonGMR4::RpcReadoutElement* readoutEle);
-    /** @brief Retrieve the associated MdtReadoutElement. 
-        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::RpcReadoutElement* readoutElement() const;
-
-    private:
-#ifdef __CLING__
-    /// Down cast the memory of the readoutElement cache if the object is stored to disk 
-    ///  to arrive at the same memory layout between Athena & CLING
-    char m_readoutEle[sizeof(CxxUtils::CachedValue<const MuonGMR4::RpcReadoutElement*>)]{};
-#else
-    CxxUtils::CachedValue<const MuonGMR4::RpcReadoutElement*> m_readoutEle{};
-#endif
+        /// Default constructor
+        RpcStrip_v1() = default;
+        /// Virtual destructor
+        virtual ~RpcStrip_v1() = default;
+
+        unsigned int numDimensions() const override final { return 1; }
+        
+        /** @brief returns whether the hit measures the phi coordinate */
+        uint8_t measuresPhi() const override final;
+        /** @brief sets the measuresPhi value */
+        void setMeasuresPhi(uint8_t measPhi);
 
 };
 
 }  // namespace xAOD
 
 #include "AthContainers/DataVector.h"
-DATAVECTOR_BASE(xAOD::RpcStrip_v1, xAOD::UncalibratedMeasurement_v1);
+DATAVECTOR_BASE_FIN(xAOD::RpcStrip_v1, xAOD::RpcMeasurement_v1);
 #endif

MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonPrepData/xAODMuonPrepData/xAODMuonPrepDataDict.h

@@ -20,6 +20,13 @@
 #include "xAODMuonPrepData/versions/RpcStripAuxContainer_v1.h"
 #include "xAODMuonPrepData/versions/RpcStripContainer_v1.h"
 
+#include "xAODMuonPrepData/RpcStrip2D.h"
+#include "xAODMuonPrepData/RpcStrip2DAuxContainer.h"
+#include "xAODMuonPrepData/RpcStrip2DContainer.h"
+#include "xAODMuonPrepData/versions/RpcStrip2D_v1.h"
+#include "xAODMuonPrepData/versions/RpcStrip2DAuxContainer_v1.h"
+#include "xAODMuonPrepData/versions/RpcStrip2DContainer_v1.h"
+
 #include "xAODMuonPrepData/TgcStripAuxContainer.h"
 #include "xAODMuonPrepData/TgcStripContainer.h"
 #include "xAODMuonPrepData/TgcStrip.h"
@@ -63,6 +70,7 @@ struct GCCXML_DUMMY_INSTANTIATION_XAODMUONPRD {
     // Type(s) needed for the dictionary generation to succeed.
     XAOD_INSTANTIATE_NS_CONTAINER_TYPES(xAOD, MdtDriftCircleContainer_v1);
     XAOD_INSTANTIATE_NS_CONTAINER_TYPES(xAOD, RpcStripContainer_v1);
+    XAOD_INSTANTIATE_NS_CONTAINER_TYPES(xAOD, RpcStrip2DContainer_v1);
     XAOD_INSTANTIATE_NS_CONTAINER_TYPES(xAOD, TgcStripContainer_v1);
     XAOD_INSTANTIATE_NS_CONTAINER_TYPES(xAOD, MMClusterContainer_v1);
     XAOD_INSTANTIATE_NS_CONTAINER_TYPES(xAOD, sTgcStripContainer_v1);