AliAODNeutral renamed to AliAODCluster

diff --git a/STEER/AODLinkDef.h b/STEER/AODLinkDef.h
index 7ec9043c295942bdc3afbebbcb7bb7d359cfca63..9e22f155eca09e1a42bc4fa919075a0b9f6c153e 100644 (file)
--- a/STEER/AODLinkDef.h
+++ b/STEER/AODLinkDef.h
@@ -11,15 +11,15 @@
 #pragma link C++ enum   AliAODVertex::AODVtx_t;
 #pragma link C++ enum   AliAODTrack::AODTrk_t;
 #pragma link C++ enum   AliAODTrack::AODTrkPID_t;
-#pragma link C++ enum   AliAODNeutral::AODNeu_t;
-#pragma link C++ enum   AliAODNeutral::AODNeuPID_t;
+#pragma link C++ enum   AliAODCluster::AODClu_t;
+#pragma link C++ enum   AliAODCluster::AODCluPID_t;
 
 #pragma link C++ class AliAODEvent+;
 #pragma link C++ class AliVirtualParticle+;
 #pragma link C++ class AliAODHeader+;
 #pragma link C++ class AliAODTrack+;
 #pragma link C++ class AliAODVertex+;
-#pragma link C++ class AliAODNeutral+;
+#pragma link C++ class AliAODCluster+;
 #pragma link C++ class AliAODJet+;
 #pragma link C++ class AliAODRedCov<3>+;
 #pragma link C++ class AliAODRedCov<4>+;

diff --git a/STEER/AliAODNeutral.cxx b/STEER/AliAODCluster.cxx
similarity index 88%
rename from STEER/AliAODNeutral.cxx
rename to STEER/AliAODCluster.cxx
index cd04b3cdbc22046b56cde4de0acc9e36a5df1820..68ca43b7cb139e5fa13f8064de208280f8a1a518 100644 (file)
--- a/STEER/AliAODNeutral.cxx
+++ b/STEER/AliAODCluster.cxx
@@ -16,16 +16,16 @@
 /* $Id$ */
 
 //-------------------------------------------------------------------------
-//     AOD track base class
+//     AOD cluster base class
 //     Author: Markus Oldenburg, CERN
 //-------------------------------------------------------------------------
 
-#include "AliAODNeutral.h"
+#include "AliAODCluster.h"
 
-ClassImp(AliAODNeutral)
+ClassImp(AliAODCluster)
 
 //______________________________________________________________________________
-AliAODNeutral::AliAODNeutral() : 
+AliAODCluster::AliAODCluster() : 
   AliVirtualParticle(),
   fEnergy(0),
   fChi2(-999.),
@@ -43,7 +43,7 @@ AliAODNeutral::AliAODNeutral() :
 }
 
 //______________________________________________________________________________
-AliAODNeutral::AliAODNeutral(Int_t id,
+AliAODCluster::AliAODCluster(Int_t id,
                             Int_t label, 
                             Double_t energy,
                             Double_t x[3],
@@ -71,7 +71,7 @@ AliAODNeutral::AliAODNeutral(Int_t id,
 }
 
 //______________________________________________________________________________
-AliAODNeutral::AliAODNeutral(Int_t id,
+AliAODCluster::AliAODCluster(Int_t id,
                             Int_t label, 
                             Float_t energy,
                             Float_t x[3],
@@ -100,7 +100,7 @@ AliAODNeutral::AliAODNeutral(Int_t id,
 
 
 //______________________________________________________________________________
-AliAODNeutral::~AliAODNeutral() 
+AliAODCluster::~AliAODCluster() 
 {
   // destructor
   delete fCovMatrix;
@@ -108,7 +108,7 @@ AliAODNeutral::~AliAODNeutral()
 
 
 //______________________________________________________________________________
-AliAODNeutral::AliAODNeutral(const AliAODNeutral& trk) :
+AliAODCluster::AliAODCluster(const AliAODCluster& trk) :
   AliVirtualParticle(trk),
   fEnergy(trk.fEnergy),
   fChi2(trk.fChi2),
@@ -128,7 +128,7 @@ AliAODNeutral::AliAODNeutral(const AliAODNeutral& trk) :
 }
 
 //______________________________________________________________________________
-AliAODNeutral& AliAODNeutral::operator=(const AliAODNeutral& trk)
+AliAODCluster& AliAODCluster::operator=(const AliAODCluster& trk)
 {
   // Assignment operator
   if(this!=&trk) {
@@ -157,7 +157,7 @@ AliAODNeutral& AliAODNeutral::operator=(const AliAODNeutral& trk)
 }
 
 //______________________________________________________________________________
-template <class T> void AliAODNeutral::SetPosition(const T *x) 
+template <class T> void AliAODCluster::SetPosition(const T *x) 
 {
   // set the position
 
@@ -174,11 +174,11 @@ template <class T> void AliAODNeutral::SetPosition(const T *x)
 }
 
 //______________________________________________________________________________
-void AliAODNeutral::Print(Option_t* /* option */) const
+void AliAODCluster::Print(Option_t* /* option */) const
 {
-  // prints information about AliAODNeutral
+  // prints information about AliAODCluster
 
-  printf("Object name: %s   Neutral type: %s\n", GetName(), GetTitle()); 
+  printf("Object name: %s   Cluster type: %s\n", GetName(), GetTitle()); 
   printf("    energy = %f\n", E());
   printf("      chi2 = %f\n", Chi2());
   printf(" PID object: %p\n", PID());

diff --git a/STEER/AliAODNeutral.h b/STEER/AliAODCluster.h
similarity index 86%
rename from STEER/AliAODNeutral.h
rename to STEER/AliAODCluster.h
index b1b0f329338ddc678d9140f228ac302f836b95ef..56adb49f909be3bd5472cc4c213a929912408761 100644 (file)
--- a/STEER/AliAODNeutral.h
+++ b/STEER/AliAODCluster.h
@@ -1,12 +1,12 @@
-#ifndef AliAODNeutral_H
-#define AliAODNeutral_H
+#ifndef AliAODCluster_H
+#define AliAODCluster_H
 /* Copyright(c) 1998-2007, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
 /* $Id$ */
 
 //-------------------------------------------------------------------------
-//     AOD track base class
+//     AOD cluster base class
 //     Author: Markus Oldenburg, CERN
 //-------------------------------------------------------------------------
 
@@ -16,17 +16,19 @@
 #include "AliAODVertex.h"
 #include "AliAODTrack.h"
 
-class AliAODNeutral : public AliVirtualParticle {
+class AliAODCluster : public AliVirtualParticle {
 
  public:
   
-  enum AODNeu_t {kUndef=-1, kPHOSCluster,kEMCALPseudoCluster, kEMCALClusterv1};
+  enum AODClu_t {kUndef=-1, kPHOSNeutral,kPHOSCharged,
+                kEMCALPseudoCluster, kEMCALClusterv1,
+                 kPMDNeutral, kPMDCharged};
 
-  enum AODNeuPID_t {
-    kUnknown=0, kPhoton, kPi0, kNeutron, kKaon0, kEleCon, kOther};
+  enum AODCluPID_t {
+    kUnknown=0, kPhoton, kPi0, kNeutron, kKaon0, kEleCon, kCharged, kOther};
 
-  AliAODNeutral();
-  AliAODNeutral(Int_t id,
+  AliAODCluster();
+  AliAODCluster(Int_t id,
                Int_t label,
                Double_t energy,
                Double_t x[3],
@@ -36,7 +38,7 @@ class AliAODNeutral : public AliVirtualParticle {
                AliAODTrack *primTrack,
                Char_t ttype=kUndef);
 
-   AliAODNeutral(Int_t id,
+   AliAODCluster(Int_t id,
                 Int_t label,
                 Float_t energy,
                 Float_t x[3],
@@ -46,9 +48,9 @@ class AliAODNeutral : public AliVirtualParticle {
                 AliAODTrack *primTrack,
                 Char_t ttype=kUndef);
 
-  virtual ~AliAODNeutral();
-  AliAODNeutral(const AliAODNeutral& trk); 
-  AliAODNeutral& operator=(const AliAODNeutral& trk);
+  virtual ~AliAODCluster();
+  AliAODCluster(const AliAODCluster& trk); 
+  AliAODCluster& operator=(const AliAODCluster& trk);
 
   Double_t Chi2() const { return fChi2; }
 
@@ -133,7 +135,7 @@ class AliAODNeutral : public AliVirtualParticle {
   Char_t       fType;
 
 
-  ClassDef(AliAODNeutral,1);
+  ClassDef(AliAODCluster,1);
 };
 
 #endif

diff --git a/STEER/AliAODEvent.cxx b/STEER/AliAODEvent.cxx
index fd63782f0e83bab12cd153480c5283c769888211..f808851a3557ac59ab7c5855f87c5080193cd8e2 100644 (file)
--- a/STEER/AliAODEvent.cxx
+++ b/STEER/AliAODEvent.cxx
@@ -32,7 +32,7 @@ AliAODEvent::AliAODEvent() :
   fHeader((AliAODHeader*)fAODObjects->At(0)),
   fTracks((TClonesArray*)fAODObjects->At(1)),
   fVertices((TClonesArray*)fAODObjects->At(2)),
-  fNeutrals((TClonesArray*)fAODObjects->At(3)),
+  fClusters((TClonesArray*)fAODObjects->At(3)),
   fJets((TClonesArray*)fAODObjects->At(4))
 {
   // default constructor
@@ -73,7 +73,7 @@ void AliAODEvent::CreateStdContent()
   AddObject(new AliAODHeader());
   AddObject(new TClonesArray("AliAODTrack", 0));
   AddObject(new TClonesArray("AliAODVertex", 0));
-  AddObject(new TClonesArray("AliAODNeutral", 0));
+  AddObject(new TClonesArray("AliAODCluster", 0));
   AddObject(new TClonesArray("AliAODJet", 0));
 
   // read back pointers
@@ -82,7 +82,7 @@ void AliAODEvent::CreateStdContent()
   // set names
   fTracks->SetName("tracks");
   fVertices->SetName("vertices");
-  fNeutrals->SetName("neutrals");
+  fClusters->SetName("neutrals");
   fJets->SetName("jets");
 
 }
@@ -95,7 +95,7 @@ void AliAODEvent::GetStdContent() const
   fHeader   = (AliAODHeader*)fAODObjects->At(0);
   fTracks   = (TClonesArray*)fAODObjects->At(1);
   fVertices = (TClonesArray*)fAODObjects->At(2);
-  fNeutrals = (TClonesArray*)fAODObjects->At(3);
+  fClusters = (TClonesArray*)fAODObjects->At(3);
   fJets     = (TClonesArray*)fAODObjects->At(4);
 }
 

diff --git a/STEER/AliAODEvent.h b/STEER/AliAODEvent.h
index 424818bd083fb7d8fb7783756ee0a2b2320dad8c..a680cce71d94126f265b3fdf15f715819be1635f 100644 (file)
--- a/STEER/AliAODEvent.h
+++ b/STEER/AliAODEvent.h
@@ -18,7 +18,7 @@
 #include "AliAODHeader.h"
 #include "AliAODTrack.h"
 #include "AliAODVertex.h"
-#include "AliAODNeutral.h"
+#include "AliAODCluster.h"
 #include "AliAODJet.h"
 
 class AliAODEvent : public TObject {
@@ -53,12 +53,12 @@ class AliAODEvent : public TObject {
   void          AddVertex(const AliAODVertex* vtx)
     {new((*fVertices)[fVertices->GetEntries()]) AliAODVertex(*vtx);}
 
-  // -- Neutral
-  TClonesArray *GetNeutrals()            const { return fNeutrals; }
-  Int_t         GetNNeutrals()           const { return fNeutrals->GetEntriesFast(); }
-  AliAODNeutral *GetNeutral(Int_t nNeutral) const { return (AliAODNeutral*)fNeutrals->At(nNeutral); }
-  void          AddNeutral(const AliAODNeutral* vtx)
-    {new((*fNeutrals)[fNeutrals->GetEntries()]) AliAODNeutral(*vtx);}
+  // -- Cluster
+  TClonesArray *GetClusters()            const { return fClusters; }
+  Int_t         GetNClusters()           const { return fClusters->GetEntriesFast(); }
+  AliAODCluster *GetCluster(Int_t nCluster) const { return (AliAODCluster*)fClusters->At(nCluster); }
+  void          AddCluster(const AliAODCluster* vtx)
+    {new((*fClusters)[fClusters->GetEntries()]) AliAODCluster(*vtx);}
 
   // -- Jet
   TClonesArray *GetJets()            const { return fJets; }
@@ -83,7 +83,7 @@ class AliAODEvent : public TObject {
   mutable AliAODHeader  *fHeader;   //! event information
   mutable TClonesArray  *fTracks;   //! charged tracks
   mutable TClonesArray  *fVertices; //! vertices
-  mutable TClonesArray  *fNeutrals; //! neutral particles
+  mutable TClonesArray  *fClusters; //! neutral particles
   mutable TClonesArray  *fJets;     //! jets
 
   ClassDef(AliAODEvent,1);

diff --git a/STEER/CreateAODfromESD.C b/STEER/CreateAODfromESD.C
index c73fb07396ce1aaef3ba94a44c5c32091735a77c..0572a048cfdede1d19169146526c1b7df67fd109 100644 (file)
--- a/STEER/CreateAODfromESD.C
+++ b/STEER/CreateAODfromESD.C
@@ -8,7 +8,7 @@
 #include "AliAODEvent.h"
 #include "AliAODVertex.h"
 #include "AliAODTrack.h"
-#include "AliAODNeutral.h"
+#include "AliAODCluster.h"
 
 #include "AliESD.h"
 #include "AliESDtrack.h"
@@ -636,7 +636,7 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
 
 
     // Access to the AOD container of vertices
-    TClonesArray &clusters = *(aod->GetNeutrals());
+    TClonesArray &clusters = *(aod->GetClusters());
     Int_t jClusters=0;
 
     // Clusters
@@ -655,19 +655,19 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
       Float_t * pid = NULL; 
       AliAODVertex *prodVertex = primary;
       AliAODTrack *primTrack = NULL;
-      Char_t ttype=AliAODNeutral::kUndef;
+      Char_t ttype=AliAODCluster::kUndef;
 
-      if (cluster->IsPHOS()) ttype=AliAODNeutral::kPHOSCluster;
+      if (cluster->IsPHOS()) ttype=AliAODCluster::kPHOSNeutral;
       else if (cluster->IsEMCAL()) {
 
        if (cluster->GetClusterType() == AliESDCaloCluster::kPseudoCluster)
-         ttype = AliAODNeutral::kEMCALPseudoCluster;
+         ttype = AliAODCluster::kEMCALPseudoCluster;
        else
-         ttype = AliAODNeutral::kEMCALClusterv1;
+         ttype = AliAODCluster::kEMCALClusterv1;
 
       }
       
-      new(clusters[jClusters++]) AliAODNeutral(id,
+      new(clusters[jClusters++]) AliAODCluster(id,
                                               label,
                                               energy,
                                               x,

diff --git a/STEER/libAOD.pkg b/STEER/libAOD.pkg
index a54be8b386708c3db101d1ffe15574048cabdb5c..2fe3fd7ef0d82cfb7ba529adab5983a9d6d34500 100644 (file)
--- a/STEER/libAOD.pkg
+++ b/STEER/libAOD.pkg
@@ -1,5 +1,5 @@
 SRCS = AliAODEvent.cxx AliVirtualParticle.cxx AliAODHeader.cxx \
-       AliAODTrack.cxx AliAODVertex.cxx AliAODNeutral.cxx \
+       AliAODTrack.cxx AliAODVertex.cxx AliAODCluster.cxx \
        AliAODJet.cxx AliAODRedCov.cxx
 
 HDRS:= $(SRCS:.cxx=.h)