MuonPrepData add constuctors with Amg::Matrix r-values

MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData/MuonPrepRawData/CscPrepData.h

@@ -78,6 +78,19 @@ class CscPrepData final:   public MuonCluster
                const CscTimeStatus timeStatus=Muon::CscTimeStatusUndefined
                );
 
+  CscPrepData( const Identifier& RDOId,
+               const IdentifierHash &idDE,
+               const Amg::Vector2D& locpos,
+               std::vector<Identifier>&& rdoList,
+               Amg::MatrixX&& locErrMat,
+               const MuonGM::CscReadoutElement* detEl,
+               const int charge,
+               const double time,
+               const CscClusterStatus status,
+               const CscTimeStatus timeStatus=Muon::CscTimeStatusUndefined
+               );
+
+
   /** @brief Destructor */
   virtual ~CscPrepData();
 

MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData/MuonPrepRawData/CscStripPrepData.h

@@ -63,15 +63,22 @@ namespace Muon
     @param timeOfFirstSample   The time measured by the CSC @todo More info.
     @param samplingRate The sampling rate.
     */
-    CscStripPrepData( const Identifier& RDOId,
-                      const IdentifierHash &collectionHash,
-                      const Amg::Vector2D& locpos,
-                      const Amg::MatrixX& locErrMat,
-                      const MuonGM::CscReadoutElement* detEl,
-                      const std::vector<float>& sampleCharges,
-                      float timeOfFirstSample,
-                      unsigned short samplingRate
-                      );
+    CscStripPrepData(const Identifier& RDOId,
+                     const IdentifierHash& collectionHash,
+                     const Amg::Vector2D& locpos,
+                     const Amg::MatrixX& locErrMat,
+                     const MuonGM::CscReadoutElement* detEl,
+                     const std::vector<float>& sampleCharges,
+                     float timeOfFirstSample,
+                     unsigned short samplingRate);
+    CscStripPrepData(const Identifier& RDOId,
+                     const IdentifierHash& collectionHash,
+                     const Amg::Vector2D& locpos,
+                     Amg::MatrixX&& locErrMat,
+                     const MuonGM::CscReadoutElement* detEl,
+                     const std::vector<float>& sampleCharges,
+                     float timeOfFirstSample,
+                     unsigned short samplingRate);
 
     /// Destructor:
       virtual ~CscStripPrepData();

MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData/MuonPrepRawData/MuonCluster.h

@@ -56,12 +56,17 @@ namespace Muon
        @param rdoList List of channels associated with cluster
        @param locErrMat The measurement errors. Ownership passes to this object!
     */
-    MuonCluster( const Identifier& RDOId,
-                 const IdentifierHash& collectionHash,
-                 const Amg::Vector2D& locpos,
-                 const std::vector<Identifier>& rdoList,
-                 const Amg::MatrixX& locErrMat
-         );
+    MuonCluster(const Identifier& RDOId,
+                const IdentifierHash& collectionHash,
+                const Amg::Vector2D& locpos,
+                const std::vector<Identifier>& rdoList,
+                const Amg::MatrixX& locErrMat);
+
+    MuonCluster(const Identifier& RDOId,
+                const IdentifierHash& collectionHash,
+                const Amg::Vector2D& locpos,
+                std::vector<Identifier>&& rdoList,
+                Amg::MatrixX&& locErrMat);
 
     /** @brief Destructor*/
     virtual ~MuonCluster();

MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData/MuonPrepRawData/RpcPrepData.h

@@ -73,6 +73,16 @@ public:
                  const float time,
                  const int triggerInfo,
                  const int ambiguityFlag);
+    RpcPrepData( const Identifier& RDOId,
+                 const IdentifierHash &idDE,
+                 const Amg::Vector2D& locpos,
+                 std::vector<Identifier>&& rdoList,
+                 Amg::MatrixX&& locErrMat,
+                 const MuonGM::RpcReadoutElement* detEl,
+                 const float time,
+                 const int triggerInfo,
+                 const int ambiguityFlag);
+ 
     /** @brief Extra Constructor without TriggerInfo for a slimmed version of RpcPrepData to come. */
     RpcPrepData( const Identifier& RDOId,
                  const IdentifierHash &idDE,
@@ -82,6 +92,16 @@ public:
                  const MuonGM::RpcReadoutElement* detEl,
                  const float time,
                  const int ambiguityFlag);
+    RpcPrepData( const Identifier& RDOId,
+                 const IdentifierHash &idDE,
+                 const Amg::Vector2D& locpos,
+                 std::vector<Identifier>&& rdoList,
+                 Amg::MatrixX&& locErrMat,
+                 const MuonGM::RpcReadoutElement* detEl,
+                 const float time,
+                 const int ambiguityFlag);
+
+
 
 
     /** @brief Destructor: */

MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData/MuonPrepRawData/TgcPrepData.h

@@ -62,8 +62,17 @@ namespace Muon
                  const MuonGM::TgcReadoutElement* detEl,
                  const uint16_t bcBitMap=0);
 
+    TgcPrepData( const Identifier& RDOId,
+                 const IdentifierHash &idDE,
+                 const Amg::Vector2D& locpos,
+                 std::vector<Identifier>&& rdoList,
+                 Amg::MatrixX&& locErrMat,
+                 const MuonGM::TgcReadoutElement* detEl,
+                 const uint16_t bcBitMap=0);
+
+
     /// Destructor:
-      virtual ~TgcPrepData();
+    virtual ~TgcPrepData();
 
       // /////////////////////////////////////////////////////////////////
       // Virtual methods

MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData/MuonPrepRawData/sTgcPrepData.h

@@ -70,6 +70,30 @@ namespace Muon
 		  const short int time   = 0,
 		  const uint16_t bcBitMap=0);
 
+    sTgcPrepData( const Identifier& RDOId,
+		  const IdentifierHash &idDE,
+		  const Amg::Vector2D& locpos,
+		  std::vector<Identifier>&& rdoList,
+		  Amg::MatrixX&& locErrMat,
+		  const MuonGM::sTgcReadoutElement* detEl,
+		  const int charge,
+		  const short int time,
+		  const uint16_t bcBitMap,
+		  const std::vector<uint16_t>& stripNumbers,
+		  const std::vector<short int>& stripTimes,
+		  const std::vector<int>& stripCharges );
+
+
+    sTgcPrepData( const Identifier& RDOId,
+		  const IdentifierHash &idDE,
+		  const Amg::Vector2D& locpos,
+		  std::vector<Identifier>&& rdoList,
+		  Amg::MatrixX&& locErrMat,
+		  const MuonGM::sTgcReadoutElement* detEl,
+		  const int charge = 0,
+		  const short int time   = 0,
+		  const uint16_t bcBitMap=0);
+
 
 
     /** @brief Destructor: */

MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData/src/CscPrepData.cxx

@@ -37,6 +37,24 @@ namespace Muon
     m_timeStatus(timeStatus)
   { }
 
+  CscPrepData::CscPrepData( const Identifier& RDOId,
+                            const IdentifierHash& idDE,
+                            const Amg::Vector2D& locpos,
+                            std::vector<Identifier>&& rdoList,
+                            Amg::MatrixX&& locErrMat,
+                            const MuonGM::CscReadoutElement* detEl,
+                            const int charge,
+                            const double time,
+                            const CscClusterStatus status,
+                            const CscTimeStatus timeStatus) :
+    MuonCluster(RDOId, idDE, locpos, std::move(rdoList), std::move(locErrMat)), //call base class constructor
+    m_detEl(detEl),
+    m_charge(charge),
+    m_time(time),
+    m_status(status),
+    m_timeStatus(timeStatus)
+  { }
+
 
   // Destructor:
   CscPrepData::~CscPrepData()

MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData/src/CscStripPrepData.cxx

@@ -40,6 +40,26 @@ namespace Muon
   { 
   }
 
+  CscStripPrepData::CscStripPrepData( const Identifier& RDOId,
+                      const IdentifierHash& collectionHash,
+                      const Amg::Vector2D& locpos,
+                      Amg::MatrixX&& locErrMat,
+                      const MuonGM::CscReadoutElement* detEl,
+                      const std::vector<float>& sampleCharges,
+                      float timeOfFirstSample,
+                      unsigned short samplingTime 
+                      ):
+    PrepRawData(RDOId, locpos, std::move(locErrMat)), //call base class constructor
+    m_collectionHash(collectionHash),
+    m_globalPosition(),
+    m_detEl(detEl),
+    m_sampleCharges(sampleCharges),
+    m_timeOfFirstSample(timeOfFirstSample),
+    m_samplingTime(samplingTime),
+    m_samplingPhase(false)
+  { 
+  }
+
 
   // Destructor:
   CscStripPrepData::~CscStripPrepData()

MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData/src/MuonCluster.cxx

@@ -30,6 +30,18 @@ namespace Muon
   { 
   }
 
+MuonCluster::MuonCluster( const Identifier& RDOId,
+                const IdentifierHash & /**collectionHash*/, //FIXME! Should be removed.
+                const Amg::Vector2D& locpos,
+                std::vector<Identifier>&& rdoList,
+                Amg::MatrixX&& locErrMat
+                ) :
+      PrepRawData(RDOId, locpos, std::move(rdoList), std::move(locErrMat)), //call base class constructor
+      m_globalPosition()
+  { 
+  }
+
+
   // Destructor:
   MuonCluster::~MuonCluster()
   {

MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData/src/RpcPrepData.cxx

@@ -54,6 +54,40 @@ RpcPrepData::RpcPrepData( const Identifier& RDOId,
     m_triggerInfo = 0;
 }
 
+RpcPrepData::RpcPrepData( const Identifier& RDOId,
+                          const IdentifierHash &idDE,
+                          const Amg::Vector2D& locpos,
+                          std::vector<Identifier>&& rdoList,
+                          Amg::MatrixX&& locErrMat,
+                          const MuonGM::RpcReadoutElement* detEl,
+                          const float time,
+                          const int triggerInfo,
+                          const int ambiguityFlag) :
+    MuonCluster(RDOId, idDE, locpos, std::move(rdoList), std::move(locErrMat)), //call base class constructor
+    m_detEl(detEl),
+    m_time(time),
+    m_triggerInfo(triggerInfo),
+    m_ambiguityFlag(ambiguityFlag)
+{ }
+
+RpcPrepData::RpcPrepData( const Identifier& RDOId,
+                          const IdentifierHash &idDE,
+                          const Amg::Vector2D& locpos,
+                          std::vector<Identifier>&& rdoList,
+                          Amg::MatrixX&& locErrMat,
+                          const MuonGM::RpcReadoutElement* detEl,
+                          const float time,
+                          const int ambiguityFlag) :
+    MuonCluster(RDOId, idDE, locpos, std::move(rdoList), std::move(locErrMat)), //call base class constructor
+    m_detEl(detEl),
+    m_time(time),
+    m_ambiguityFlag(ambiguityFlag)
+{
+    // set to default for readout data 
+    m_triggerInfo = 0;
+}
+
+
 // Destructor:
 RpcPrepData::~RpcPrepData()
 {

MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData/src/TgcPrepData.cxx

@@ -30,6 +30,20 @@ namespace Muon
     m_bcBitMap(bcBitMap)
 { }
 
+  TgcPrepData::TgcPrepData( const Identifier& RDOId,
+			    const IdentifierHash &idDE,
+			    const Amg::Vector2D& locpos,
+			    std::vector<Identifier>&& rdoList,
+			    Amg::MatrixX&& locErrMat,
+			    const MuonGM::TgcReadoutElement* detEl,
+          const uint16_t bcBitMap) :
+    MuonCluster(RDOId, idDE, locpos, std::move(rdoList), std::move(locErrMat)), //call base class constructor
+    m_detEl(detEl),
+    m_bcBitMap(bcBitMap)
+{ }
+
+
+
 // Destructor:
 TgcPrepData::~TgcPrepData()
 {

MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData/src/sTgcPrepData.cxx

@@ -51,6 +51,50 @@ sTgcPrepData::sTgcPrepData(const Identifier& RDOId,
   , m_stripCharges()
 {}
 
+sTgcPrepData::sTgcPrepData(const Identifier& RDOId,
+                           const IdentifierHash& idDE,
+                           const Amg::Vector2D& locpos,
+                           std::vector<Identifier>&& rdoList,
+                           Amg::MatrixX&& locErrMat,
+                           const MuonGM::sTgcReadoutElement* detEl,
+                           const int charge,
+                           const short int time,
+                           const uint16_t bcBitMap,
+                           const std::vector<uint16_t>& stripNumbers,
+                           const std::vector<short int>& stripTimes,
+                           const std::vector<int>& stripCharges)
+  : MuonCluster(RDOId, idDE, locpos, std::move(rdoList), std::move(locErrMat))
+  , // call base class constructor
+  m_detEl(detEl)
+  , m_charge(charge)
+  , m_time(time)
+  , m_bcBitMap(bcBitMap)
+  , m_stripNumbers(stripNumbers)
+  , m_stripTimes(stripTimes)
+  , m_stripCharges(stripCharges)
+{}
+
+sTgcPrepData::sTgcPrepData(const Identifier& RDOId,
+                           const IdentifierHash& idDE,
+                           const Amg::Vector2D& locpos,
+                           std::vector<Identifier>&& rdoList,
+                           Amg::MatrixX&& locErrMat,
+                           const MuonGM::sTgcReadoutElement* detEl,
+                           const int charge,
+                           const short int time,
+                           const uint16_t bcBitMap)
+  : MuonCluster(RDOId, idDE, locpos, std::move(rdoList), std::move(locErrMat))
+  , // call base class constructor
+  m_detEl(detEl)
+  , m_charge(charge)
+  , m_time(time)
+  , m_bcBitMap(bcBitMap)
+  , m_stripNumbers()
+  , m_stripTimes()
+  , m_stripCharges()
+{}
+
+
 // Destructor:
 sTgcPrepData::~sTgcPrepData() {}