No dca in the neutral clusters. The cov matrix contains 10 elements.

diff --git a/STEER/AliAODNeutral.cxx b/STEER/AliAODNeutral.cxx
index 97cb1b7ab8116386cc59e8b64ea763f370fe8c26..cd04b3cdbc22046b56cde4de0acc9e36a5df1820 100644 (file)
--- a/STEER/AliAODNeutral.cxx
+++ b/STEER/AliAODNeutral.cxx
@@ -47,8 +47,7 @@ AliAODNeutral::AliAODNeutral(Int_t id,
                             Int_t label, 
                             Double_t energy,
                             Double_t x[3],
-                            Bool_t isDCA,
-                            Double_t covMatrix[21],
+                            Double_t covMatrix[10],
                             Double_t pid[10],
                             AliAODVertex *prodVertex,
                             AliAODTrack *primTrack,
@@ -65,7 +64,7 @@ AliAODNeutral::AliAODNeutral(Int_t id,
 {
   // constructor
  
-  SetPosition(x, isDCA);
+  SetPosition(x);
   if(covMatrix) SetCovMatrix(covMatrix);
   SetPID(pid);
 
@@ -76,8 +75,7 @@ AliAODNeutral::AliAODNeutral(Int_t id,
                             Int_t label, 
                             Float_t energy,
                             Float_t x[3],
-                            Bool_t isDCA,
-                            Float_t covMatrix[21],
+                            Float_t covMatrix[10],
                             Float_t pid[10],
                             AliAODVertex *prodVertex,
                             AliAODTrack *primTrack,
@@ -94,7 +92,7 @@ AliAODNeutral::AliAODNeutral(Int_t id,
 {
   // constructor
  
-  SetPosition(x, isDCA);
+  SetPosition(x);
   if(covMatrix) SetCovMatrix(covMatrix);
   SetPID(pid);
 
@@ -159,26 +157,15 @@ AliAODNeutral& AliAODNeutral::operator=(const AliAODNeutral& trk)
 }
 
 //______________________________________________________________________________
-template <class T> void AliAODNeutral::SetPosition(const T *x, const Bool_t dca) 
+template <class T> void AliAODNeutral::SetPosition(const T *x) 
 {
   // set the position
 
   if (x) {
-    if (!dca) {
-      ResetBit(kIsDCA);
-
       fPosition[0] = x[0];
       fPosition[1] = x[1];
       fPosition[2] = x[2];
-    } else {
-      SetBit(kIsDCA);
-      // don't know any better yet
-      fPosition[0] = -999.;
-      fPosition[1] = -999.;
-      fPosition[2] = -999.;
-    }
   } else {
-    ResetBit(kIsDCA);
 
     fPosition[0] = -999.;
     fPosition[1] = -999.;
@@ -186,16 +173,6 @@ template <class T> void AliAODNeutral::SetPosition(const T *x, const Bool_t dca)
   }
 }
 
-//______________________________________________________________________________
-void AliAODNeutral::SetDCA(Double_t d, Double_t z) 
-{
-  // set the dca
-  fPosition[0] = d;
-  fPosition[1] = z;
-  fPosition[2] = 0.;
-  SetBit(kIsDCA);
-}
-
 //______________________________________________________________________________
 void AliAODNeutral::Print(Option_t* /* option */) const
 {

diff --git a/STEER/AliAODNeutral.h b/STEER/AliAODNeutral.h
index 1f89c8e078d8c266c7045971fe0562a34a8ce578..12fcc89ece06238067b5703ca02a9f44687720d7 100644 (file)
--- a/STEER/AliAODNeutral.h
+++ b/STEER/AliAODNeutral.h
@@ -20,13 +20,9 @@ class AliAODNeutral : public AliVirtualParticle {
 
  public:
   
-  enum AODTrk_t {kUndef=-1, kPrimary, kSecondary, kOrphan};
+  enum AODNeu_t {kUndef=-1, kPHOSCluster,kEMCALPseudoCluster, kEMCALClusterv1};
 
-  enum AODTrkBits_t {
-    kIsDCA=BIT(14)   // set if fPosition is the DCA and not the position of the first point
-  };
-
-  enum AODNeuTrkPID_t {
+  enum AODNeuPID_t {
     kUnknown=0, kPhoton, kPi0, kNeutron, kKaon0, kEleCon, kOther};
 
   AliAODNeutral();
@@ -34,8 +30,7 @@ class AliAODNeutral : public AliVirtualParticle {
                Int_t label,
                Double_t energy,
                Double_t x[3],
-               Bool_t dca,
-               Double_t covMatrix[21],
+               Double_t covMatrix[10],
                Double_t pid[10],
                AliAODVertex *prodVertex,
                AliAODTrack *primTrack,
@@ -45,8 +40,7 @@ class AliAODNeutral : public AliVirtualParticle {
                 Int_t label,
                 Float_t energy,
                 Float_t x[3],
-                Bool_t dca,
-                Float_t covMatrix[21],
+                Float_t covMatrix[10],
                 Float_t pid[10],
                 AliAODVertex *prodVertex,
                 AliAODTrack *primTrack,
@@ -80,7 +74,7 @@ class AliAODNeutral : public AliVirtualParticle {
 
   template <class T> Bool_t GetPosition(T *x) const {
     x[0]=fPosition[0]; x[1]=fPosition[1]; x[2]=fPosition[2];
-    return TestBit(kIsDCA);}
+    return kTRUE;}
 
   template <class T> void SetCovMatrix(const T *covMatrix) {
     if(!fCovMatrix) fCovMatrix=new AliAODRedCov<4>();
@@ -102,8 +96,7 @@ class AliAODNeutral : public AliVirtualParticle {
   void SetID(const Int_t id) { fID = id; }
   void SetLabel(const Int_t label) {fLabel = label; }
 
-  template <class T> void SetPosition(const T *x, const Bool_t isDCA = kFALSE);
-  void SetDCA(Double_t d, Double_t z);
+  template <class T> void SetPosition(const T *x);
 
   void SetChi2(const Double_t chi2) { fChi2 = chi2; }
 
@@ -125,7 +118,7 @@ class AliAODNeutral : public AliVirtualParticle {
 
   // Energy & position
   Double32_t    fEnergy;         // energy
-  Double32_t    fPosition[3];    // position of first point on track or dca
+  Double32_t    fPosition[3];    // position of the cluster
 
   Double32_t    fPID[10];        // [0.,1.,8] pointer to PID object
   Double32_t    fChi2;           // chi2 of mometum fit