New representation of the raw TRD PID signal in ESD (Alex, Yuri)

[u/mrichter/AliRoot.git] / STEER / AliMultiplicity.h

diff --git a/STEER/AliMultiplicity.h b/STEER/AliMultiplicity.h
index 952c650e50adefa92746635521f48ed15d25514e..9c5a3cc2eeca09e9392121768f49300a04e8664b 100644 (file)
--- a/STEER/AliMultiplicity.h
+++ b/STEER/AliMultiplicity.h
@@ -16,9 +16,10 @@ class AliMultiplicity : public TObject {
   AliMultiplicity();               // default constructor
   // standard constructor
   AliMultiplicity(Int_t ntr,Float_t *t, Float_t *ph, Float_t *df, Int_t *labels,
-                  Int_t ns, Float_t *ts, Float_t *ps);
+                  Int_t* labelsL2, Int_t ns, Float_t *ts, Float_t *ps);
   AliMultiplicity(const AliMultiplicity& m);
   AliMultiplicity& operator=(const AliMultiplicity& m);
+  virtual void Copy(TObject &obj) const;
   virtual ~AliMultiplicity();
 // methods to access tracklet information
   Int_t GetNumberOfTracklets() const {return fNtracks;}
@@ -30,8 +31,9 @@ class AliMultiplicity : public TObject {
   else {Error("GetPhi","Invalid track number %d",i); return -9999.;}}
   Double_t GetDeltaPhi(Int_t i) const {if(i>=0 && i<fNtracks) {return fDeltPhi[i];}
   else {Error("GetDeltaPhi","Invalid track number %d",i); return -9999.;}}
-  Int_t GetLabel(Int_t i) const {if(i>=0 && i<fNtracks) {return fLabels[i];}
-  else {Error("GetLabel","Invalid track number %d",i); return -9999;}}
+
+  Int_t GetLabel(Int_t i, Int_t layer) const;
+  
 // methods to access single cluster information
   Int_t GetNumberOfSingleClusters() const {return fNsingle;}
   Double_t GetThetaSingle(Int_t i) const { if(i>=0 && i<fNsingle) {return fThsingle[i];}
@@ -47,8 +49,9 @@ class AliMultiplicity : public TObject {
 
   Int_t fNtracks;            // Number of tracklets
   Int_t fNsingle;            // Number of clusters on SPD layer 1, not associated
-  Int_t *fLabels;            //[fNtracks] array with labels of tracklets
                              // with a tracklet on SPD layer 2
+  Int_t *fLabels;            //[fNtracks] array with labels of cluster in L1 used for tracklet
+  Int_t *fLabelsL2;          //[fNtracks] array with labels of cluster in L2 used for tracklet
   Double32_t *fTh;           //[fNtracks] array with theta values
   Double32_t *fPhi;          //[fNtracks] array with phi values
   Double32_t *fDeltPhi;      //[fNtracks] array with delta phi values
@@ -56,7 +59,26 @@ class AliMultiplicity : public TObject {
   Double32_t *fPhisingle;    //[fNsingle] array with phi values of L2 clusters
   Short_t fFiredChips[2]; // number of fired chips in the two SPD layers
 
-  ClassDef(AliMultiplicity,6);
+  ClassDef(AliMultiplicity,7);
 };
 
+inline Int_t AliMultiplicity::GetLabel(Int_t i, Int_t layer) const
+{
+    if(i>=0 && i<fNtracks) {
+       if (layer == 0) {
+           return fLabels[i];
+       } else if (layer == 1) {
+           if (fLabelsL2) {
+               return fLabelsL2[i];
+           } else {
+               Warning("GetLabel", "No information for layer 2 available !");
+               return -9999;
+           }
+       } else {
+           Error("GetLabel","Invalid layer number %d",layer); return -9999;
+       }
+    } else {
+       Error("GetLabel","Invalid track number %d",i); return -9999;
+    }
+}
 #endif