Changing Add signature (Laurent)

diff --git a/MUON/mapping/AliMpSlat.cxx b/MUON/mapping/AliMpSlat.cxx
index 21554a21ab67914f6e3032627887c3703960824f..895558acb0f985d3b36619c98304e5c7e273b833 100644 (file)
--- a/MUON/mapping/AliMpSlat.cxx
+++ b/MUON/mapping/AliMpSlat.cxx
@@ -60,6 +60,10 @@ AliMpSlat::AliMpSlat()
     // Empty ctor.
     //
   AliDebug(1,Form("this=%p Empty ctor",this));
+#ifdef WITH_ROOT    
+    fPCBs.SetOwner(kTRUE);
+#endif    
+    fManuMap.SetOwner(kFALSE);
 }
 
 //_____________________________________________________________________________
@@ -80,6 +84,10 @@ AliMpSlat::AliMpSlat(const char* id, AliMpPlaneType bendingOrNonBending)
     // Normal ctor
     //
   AliDebug(1,Form("this=%p id=%s",this,id));                   
+#ifdef WITH_ROOT    
+    fPCBs.SetOwner(kTRUE);
+#endif    
+    fManuMap.SetOwner(kFALSE);
 }
 
 //_____________________________________________________________________________
@@ -89,11 +97,19 @@ AliMpSlat::~AliMpSlat()
   // Dtor.
   //
   AliDebug(1,Form("this=%p fId=%s",this,fId.Data()));                  
+#ifdef WITH_ROOT    
+  fPCBs.Delete();
+#else
+  for ( size_t i = 0; i < fPCBs.size(); ++i )
+  {
+    delete fPCBs[i];
+  }
+#endif    
 }
 
 //_____________________________________________________________________________
 void
-AliMpSlat::Add(AliMpPCB* pcbType, const TArrayI& manuList) 
+AliMpSlat::Add(const AliMpPCB& pcbType, const TArrayI& manuList) 
 {
   //
   // Adds a PCB to this slat. The manuList specifies the ids of the manu
@@ -108,10 +124,10 @@ AliMpSlat::Add(AliMpPCB* pcbType, const TArrayI& manuList)
        }
   else
   {
-    ixOffset = pcbType->Ixmin();
+    ixOffset = pcbType.Ixmin();
   }
   Double_t xOffset = DX()*2;
-  AliMpPCB* pcb = pcbType->Clone(manuList,ixOffset,xOffset);
+  AliMpPCB* pcb = pcbType.Clone(manuList,ixOffset,xOffset);
 #ifdef WITH_ROOT
   fPCBs.AddLast(pcb);
 #else
@@ -134,7 +150,7 @@ AliMpSlat::Add(AliMpPCB* pcbType, const TArrayI& manuList)
     }
     else
     {
-      AliError(Form("ManuID %d is duplicated for PCB %s",manuID,pcbType->GetID()));      
+      AliError(Form("ManuID %d is duplicated for PCB %s",manuID,pcbType.GetID()));      
     }
 //#else
 //  fManuMap[manuID] = mp;

diff --git a/MUON/mapping/AliMpSlat.h b/MUON/mapping/AliMpSlat.h
index a64e378fd79db66c3e0af773ae1274084c5d344f..3f6dec078476c936dfbef415dc6126dd85ac7169 100644 (file)
--- a/MUON/mapping/AliMpSlat.h
+++ b/MUON/mapping/AliMpSlat.h
@@ -68,7 +68,7 @@ class AliMpSlat : public TObject
   
   const char* GetID() const;
 
-  void Add(AliMpPCB* pcbType, const TArrayI& manuList);
+  void Add(const AliMpPCB& pcbType, const TArrayI& manuList);
 
   Double_t DX() const;
   Double_t DY() const;