X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STEER%2FESD%2FAliESDfriend.cxx;h=32bf39b1ab64c406b88381d8eb2a0459594ad96d;hb=8ef7340c9839bc186ca5879407ff8249b09b86f2;hp=1b0b4d407a8c2857a169a3150686ea921f455373;hpb=e546b023ff9f98d42ec24154cbe51f77a5b0feca;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STEER/ESD/AliESDfriend.cxx b/STEER/ESD/AliESDfriend.cxx
index 1b0b4d407a8..32bf39b1ab6 100644
--- a/STEER/ESD/AliESDfriend.cxx
+++ b/STEER/ESD/AliESDfriend.cxx
@@ -28,23 +28,34 @@ ClassImp(AliESDfriend)
 
 AliESDfriend::AliESDfriend(): TObject(), fTracks("AliESDfriendTrack",1),
   fESDVZEROfriend(NULL),
-  fESDTZEROfriend(NULL)
-
+  fESDTZEROfriend(NULL),
+  fNclustersTPC(),
+  fNclustersTPCused()
 {
  //
  // Default constructor
  //
+  for (Int_t i=0;i<72;i++)
+  {
+    fNclustersTPC[i]=0;
+    fNclustersTPCused[i]=0;
+  }
 }
 
 AliESDfriend::AliESDfriend(const AliESDfriend &f) :
   TObject(f),
   fTracks(f.fTracks),
   fESDVZEROfriend(f.fESDVZEROfriend ? new AliESDVZEROfriend(*f.fESDVZEROfriend) : NULL),
-  fESDTZEROfriend(f.fESDTZEROfriend ? new AliESDTZEROfriend(*f.fESDTZEROfriend) : NULL)
+  fESDTZEROfriend(f.fESDTZEROfriend ? new AliESDTZEROfriend(*f.fESDTZEROfriend) : NULL),
+  fNclustersTPC(),
+  fNclustersTPCused()
 {
  //
  // Copy constructor
  //
+ memcpy(fNclustersTPC,f.fNclustersTPC,sizeof(fNclustersTPC));
+ memcpy(fNclustersTPCused,f.fNclustersTPCused,sizeof(fNclustersTPCused));
+
 }
 
 AliESDfriend& AliESDfriend::operator=(const AliESDfriend& esd)
@@ -61,31 +72,39 @@ AliESDfriend& AliESDfriend::operator=(const AliESDfriend& esd)
     delete fESDTZEROfriend;
     fESDTZEROfriend = new AliESDTZEROfriend(*esd.fESDTZEROfriend);
  
+    memcpy(fNclustersTPC,esd.fNclustersTPC,sizeof(fNclustersTPC));
+    memcpy(fNclustersTPCused,esd.fNclustersTPCused,sizeof(fNclustersTPCused));
  
  
     return *this;
 }
 
-void AliESDfriend::Clear(Option_t*) {
+
+
+AliESDfriend::~AliESDfriend() {
   //
   // Destructor
   //
-  fTracks.Clear("C");
+  fTracks.Delete();
   delete fESDVZEROfriend;
   delete fESDTZEROfriend;
-  fESDVZEROfriend = 0;
-  fESDTZEROfriend = 0;
-  TObject::Clear();
 }
 
 
-AliESDfriend::~AliESDfriend() {
+void AliESDfriend::Reset()
+{
   //
-  // Destructor
+  // Reset friend information
   //
-  Clear();
-}
-
+  fTracks.Delete();
+  for (Int_t i=0;i<72;i++)
+  {
+    fNclustersTPC[i]=0;
+    fNclustersTPCused[i]=0;
+  }
+  delete fESDVZEROfriend; fESDVZEROfriend=0;
+  delete fESDTZEROfriend; fESDTZEROfriend=0;
+}  
 
 
 void AliESDfriend::SetVZEROfriend(AliESDVZEROfriend * obj)