'Fixing ATLASRECTS-3711 (make convertors friends)' (MuonRDO-01-06-07)

	* Fixing ATLASRECTS-3711 (make convertors friends)
	* Tagging MuonRDO-01-06-07


Former-commit-id: a62ba5d2

MuonSpectrometer/MuonRDO/MuonRDO/MdtCsm.h

@@ -31,6 +31,8 @@ class MdtCsm : public DataVector<MdtAmtHit>
   typedef Identifier ID; 
   typedef MdtAmtHit DIGIT; 
   
+  friend class MdtCsmCnv_p1;
+  
   /** Default constructor*/
   MdtCsm();
 

MuonSpectrometer/MuonRDO/MuonRDO/RpcCoinMatrix.h

@@ -28,27 +28,35 @@ class RpcCoinMatrix : public DataVector<RpcFiredChannel> {
   ubit16 m_febcId;
 
  public:
-
+	 friend class RpcCoinMatrixCnv_p1;
   // default constructor
   RpcCoinMatrix() 
     : DataVector<RpcFiredChannel>(), m_id(), m_onlineId(0), m_crc(0),
-    m_fel1Id(0), m_febcId(0) { };
+    m_fel1Id(0), m_febcId(0) { 
+		//std::cout<<"RpcCoinMatrix ctor 0 ["<<this<<"]"<<std::endl; 
+	};
 
   // Partial constructor.
   RpcCoinMatrix(const Identifier& id, ubit16 onlineId, 
                  ubit16 fel1Id, ubit16 febcId)
     : DataVector<RpcFiredChannel>(), m_id(id), m_onlineId(onlineId), m_crc(0),
-    m_fel1Id(fel1Id), m_febcId(febcId) { };
+    m_fel1Id(fel1Id), m_febcId(febcId) { 
+		// std::cout<<"RpcCoinMatrix ctor 1 ["<<this<<"]"<<std::endl;
+	};
 
   // Full constructor.
   RpcCoinMatrix(const Identifier& id, ubit16 onlineId, 
                  ubit16 crc, ubit16 fel1Id, 
                  ubit16 febcId)
     : DataVector<RpcFiredChannel>(), m_id(id), m_onlineId(onlineId),
-    m_crc(crc), m_fel1Id(fel1Id), m_febcId(febcId) { };
+    m_crc(crc), m_fel1Id(fel1Id), m_febcId(febcId) { 
+		// std::cout<<"RpcCoinMatrix ctor 2 ["<<this<<"]"<<std::endl;
+	};
 
   // virtual destructor for persistency
-  virtual ~RpcCoinMatrix() {}
+  virtual ~RpcCoinMatrix() { 
+	  // std::cout<<"RpcCoinMatrix dtor ["<<this<<"]"<<std::endl;
+  }
   
   // return the pad Identifier of this CM
   Identifier identify() const { return m_id;}

MuonSpectrometer/MuonRDO/MuonRDO/RpcPad.h

@@ -32,7 +32,10 @@ public:  // functions
   RpcPad ()
     : DataVector<RpcCoinMatrix>(), m_id(0), m_idHash(0), 
     m_onlineId(0), m_lvl1Id(0), m_bcId(0), m_status(0), m_errorCode(0), m_sector(0)
-  {}
+  {
+  // std::cout<<"RpcPad default ctor ["<<this<<"]"<<std::endl;
+
+}
 
   /** Creates an empty container ready for writing.
    * constructor to be used to identified the collection (pad)
@@ -41,7 +44,10 @@ public:  // functions
   RpcPad(const Identifier& id, const IdentifierHash& idHash) 
     : DataVector<RpcCoinMatrix>(), m_id(id), m_idHash(idHash), 
     m_onlineId(0), m_lvl1Id(0), m_bcId(0), m_status(0), m_errorCode(0), m_sector(0)
-        { };
+        {
+  // std::cout<<"RpcPad ctor 2 ["<<this<<"]"<<std::endl;
+
+ };
 
   /** full constructor*/
   RpcPad(const Identifier& id, const IdentifierHash& idHash, ubit16 onlineId, ubit16 status,
@@ -49,7 +55,10 @@ public:  // functions
     : DataVector<RpcCoinMatrix>(), m_id(id), m_idHash(idHash),m_onlineId(onlineId),
     m_lvl1Id(0), m_bcId(0),
     m_status(status), m_errorCode(errorCode), m_sector(sector)
-    { };
+    {
+  // std::cout<<"RpcPadContainer ctor 3 ["<<this<<"]"<<std::endl;
+
+ };
   
   /** full constructor with Lvl1 and Bcid*/
   RpcPad(const Identifier& id, const IdentifierHash& idHash, ubit16 onlineId, 
@@ -58,7 +67,10 @@ public:  // functions
     : DataVector<RpcCoinMatrix>(), m_id(id), m_idHash(idHash),m_onlineId(onlineId),
     m_lvl1Id(lvl1Id), m_bcId(bcId),
     m_status(status), m_errorCode(errorCode), m_sector(sector)
-    { };
+    {
+  // std::cout<<"RpcPadContainer ctor 4 ["<<this<<"]"<<std::endl;
+
+ };
   
   /** partial contructor: needed when filling pad from bytestream
     * errorCode not know until one is reading the pad footer!*/
@@ -67,10 +79,21 @@ public:  // functions
     : DataVector<RpcCoinMatrix>(), m_id(id), m_idHash(idHash),m_onlineId(onlineId),
     m_lvl1Id(0), m_bcId(0),
     m_status(status), m_errorCode(0), m_sector(sector)
-    { };
+    { 
+  // std::cout<<"RpcPadContainer ctor 5 ["<<this<<"]"<<std::endl;
+
+};
   
   // virtual destructor for persistency
-  virtual ~RpcPad() {}
+  virtual ~RpcPad() {
+  // std::cout<<"RpcPadContainer dtor ["<<this<<"]"<<std::endl;
+  // for( auto it : this->stdcont() ) {
+  //   for (auto it2 : it->stdcont() ) {
+  //     delete it2;
+  //   }
+  //   delete it;
+  // }
+}
   
   Identifier identify() const { return m_id; }
   
@@ -97,6 +120,7 @@ public:  // functions
 
 private:
   friend class RpcPadContainerCnv_p1;
+  friend class RpcPadCnv_p1;
 
   Identifier m_id;   
   IdentifierHash m_idHash; 

MuonSpectrometer/MuonRDO/src/RpcPadContainer.cxx

@@ -42,14 +42,17 @@ RpcPadContainer::RpcPadContainer()
 RpcPadContainer::RpcPadContainer( unsigned int hashmax)
 : IdentifiableContainer<RpcPad>(hashmax) 
 {
-
+  // std::cout<<"RpcPadContainer ctor ["<<this<<"]"<<std::endl;
 }
 
 //**********************************************************************
 
 // Destructor.
 
-RpcPadContainer::~RpcPadContainer() {}
+RpcPadContainer::~RpcPadContainer() {
+  // std::cout<<"RpcPadContainer dtor ["<<this<<"]"<<std::endl;
+
+}
 
 //**********************************************************************
 /// Convert identifier to idhash