Removing warnings (Sun)

[u/mrichter/AliRoot.git] / RALICE / AliJet.cxx

diff --git a/RALICE/AliJet.cxx b/RALICE/AliJet.cxx
index 9d8c8efffa9a66b28bc14463d3235b201d23d7c7..49538bd103b63ddaa97780586c813ce27663db9c 100644 (file)
--- a/RALICE/AliJet.cxx
+++ b/RALICE/AliJet.cxx
@@ -95,7 +95,7 @@
  
 ClassImp(AliJet) // Class implementation to enable ROOT I/O
  
-AliJet::AliJet() : TObject(),Ali4Vector()
+AliJet::AliJet() : TNamed(),Ali4Vector()
 {
 // Default constructor
 // All variables initialised to 0
@@ -113,7 +113,7 @@ void AliJet::Init()
  fTrackCopy=0;
 }
 ///////////////////////////////////////////////////////////////////////////
-AliJet::AliJet(Int_t n) : TObject(),Ali4Vector()
+AliJet::AliJet(Int_t n) : TNamed(),Ali4Vector()
 {
 // Create a jet to hold initially a maximum of n tracks
 // All variables initialised to 0
@@ -170,7 +170,7 @@ void AliJet::SetOwner(Bool_t own)
  fTrackCopy=mode;
 }
 ///////////////////////////////////////////////////////////////////////////
-AliJet::AliJet(AliJet& j) : TObject(j),Ali4Vector(j)
+AliJet::AliJet(AliJet& j) : TNamed(j),Ali4Vector(j)
 {
 // Copy constructor
  fNtinit=j.fNtinit;
@@ -192,7 +192,7 @@ AliJet::AliJet(AliJet& j) : TObject(j),Ali4Vector(j)
   AliTrack* tx=j.GetTrack(i);
   if (fTrackCopy)
   {
-   fTracks->Add(new AliTrack(*tx));
+   fTracks->Add(tx->Clone());
   }
   else
   {
@@ -232,6 +232,16 @@ void AliJet::AddTrack(AliTrack& t)
 // space will be extended to hold an additional amount of tracks as
 // was initially reserved.
 // See SetTrackCopy() to tailor the functionality of the stored structures.
+//
+// Note :
+// In case a private copy is made, this is performed via the Clone() memberfunction.
+// All AliTrack and derived classes have the default TObject::Clone() memberfunction.
+// However, derived classes generally contain an internal data structure which may
+// include pointers to other objects. Therefore it is recommended to provide
+// for all derived classes a specific copy constructor and override the default Clone()
+// memberfunction using this copy constructor.
+// An example for this may be seen from AliTrack.   
+
  AddTrack(t,1);
 }
 ///////////////////////////////////////////////////////////////////////////
@@ -246,6 +256,10 @@ void AliJet::AddTrack(AliTrack& t,Int_t copy)
 // of the TrackCopy flag.
 // This allows a proper treatment of automatically generated connecting
 // tracks between vertices.
+//
+// Note :
+// In case a private copy is made, this is performed via the Clone() memberfunction.
+
  if (!fTracks)
  {
   fTracks=new TObjArray(fNtmax);
@@ -261,7 +275,7 @@ void AliJet::AddTrack(AliTrack& t,Int_t copy)
  fNtrk++;
  if (fTrackCopy && copy)
  {
-  fTracks->Add(new AliTrack(t));
+  fTracks->Add(t.Clone());
  }
  else
  {
@@ -276,7 +290,14 @@ void AliJet::AddTrack(AliTrack& t,Int_t copy)
 void AliJet::Data(TString f)
 {
 // Provide jet information within the coordinate frame f
- cout << " *AliJet::Data* Id : " << fUserId << " Invmass : " << GetInvmass() << " Charge : " << fQ
+ const char* name=GetName();
+ const char* title=GetTitle();
+
+ cout << " *AliJet::Data*";
+ if (strlen(name))  cout << " Name : " << GetName();
+ if (strlen(title)) cout << " Title : " << GetTitle();
+ cout << endl;
+ cout << " Id : " << fUserId << " Invmass : " << GetInvmass() << " Charge : " << fQ
       << " Momentum : " << GetMomentum() << " Ntracks : " << fNtrk << endl;
 
  Ali4Vector::Data(f); 
@@ -565,3 +586,21 @@ Int_t AliJet::GetId()
  return fUserId;
 }
 ///////////////////////////////////////////////////////////////////////////
+TObject* AliJet::Clone(const char* name)
+{
+// Make a deep copy of the current object and provide the pointer to the copy.
+// This memberfunction enables automatic creation of new objects of the
+// correct type depending on the object type, a feature which may be very useful
+// for containers when adding objects in case the container owns the objects.
+// This feature allows e.g. AliVertex to store either AliJet objects or
+// objects derived from AliJet via the AddJet memberfunction, provided
+// these derived classes also have a proper Clone memberfunction. 
+
+ AliJet* jet=new AliJet(*this);
+ if (name)
+ {
+  if (strlen(name)) jet->SetName(name);
+ }
+ return jet;
+}
+///////////////////////////////////////////////////////////////////////////