Fix for bug #66122: Backward compatibility in AliMultiplicity

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

diff --git a/STEER/AliMultiplicity.h b/STEER/AliMultiplicity.h
index 732469400f6415d5d7e3dc0070a815afd5b09ed3..b1a501d39019b8c7ee21419723473721aa786064 100644 (file)
--- a/STEER/AliMultiplicity.h
+++ b/STEER/AliMultiplicity.h
@@ -17,41 +17,65 @@ class AliMultiplicity : public TObject {
   AliMultiplicity();               // default constructor
   // standard constructor
   AliMultiplicity(Int_t ntr,Float_t *th, Float_t *ph, Float_t *dth, Float_t *dph, Int_t *labels,
-         Int_t* labelsL2, Int_t ns, Float_t *ts, Float_t *ps, Short_t nfcL1, Short_t nfcL2, TBits fFastOrFiredChips);
+         Int_t* labelsL2, Int_t ns, Float_t *ts, Float_t *ps, Short_t nfcL1, Short_t nfcL2, const TBits & fFastOrFiredChips);
   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;}
-  Double_t GetTheta(Int_t i) const { if(i>=0 && i<fNtracks) {return fTh[i];}
-  else {Error("GetTheta","Invalid track number %d",i); return -9999.;}}
-  Double_t GetEta(Int_t i) const { if(i>=0 && i<fNtracks) {return -TMath::Log(TMath::Tan(fTh[i]/2.));}
-  else {Error("GetEta","Invalid track number %d",i); return -9999.;}}
-  Double_t GetPhi(Int_t i) const { if(i>=0 && i<fNtracks) {return fPhi[i];}
-  else {Error("GetPhi","Invalid track number %d",i); return -9999.;}}
-  Double_t GetDeltaTheta(Int_t i) const {if(fDeltTh && i>=0 && i<fNtracks) {return fDeltTh[i];}
-  else {Error("GetDeltaTheta","DeltaTheta not available in data or Invalid track number %d(max %d)",i, fNtracks); 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.;}}
+  Double_t GetTheta(Int_t i) const { 
+    if(i>=0 && i<fNtracks) return fTh[i];
+    Error("GetTheta","Invalid track number %d",i); return -9999.;
+  }
+  Double_t GetEta(Int_t i) const { 
+    if(i>=0 && i<fNtracks) return -TMath::Log(TMath::Tan(fTh[i]/2.));
+    Error("GetEta","Invalid track number %d",i); return -9999.;
+  }
+  Double_t GetPhi(Int_t i) const { 
+    if(i>=0 && i<fNtracks) return fPhi[i];
+    Error("GetPhi","Invalid track number %d",i); return -9999.;
+  }
+  Double_t GetDeltaTheta(Int_t i) const {
+    if(fDeltTh && i>=0 && i<fNtracks) return fDeltTh[i];
+    Error("GetDeltaTheta","DeltaTheta not available in data or Invalid track number %d(max %d)",i, fNtracks); return -9999.;
+  }
+  Double_t GetDeltaPhi(Int_t i) const {
+    if(i>=0 && i<fNtracks) return fDeltPhi[i];
+    Error("GetDeltaPhi","Invalid track number %d",i); return -9999.;
+  }
 
   Int_t GetLabel(Int_t i, Int_t layer) const;
   void  SetLabel(Int_t i, Int_t layer, Int_t label);
   
 // 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];}
-  else {Error("GetThetaSingle","Invalid cluster number %d",i); return -9999.;}}
-  Double_t GetPhiSingle(Int_t i) const { if(i>=0 && i<fNsingle) {return fPhisingle[i];}
-  else {Error("GetPhisingle","Invalid cluster number %d",i); return -9999.;}}
+  Double_t GetThetaSingle(Int_t i) const { 
+    if(i>=0 && i<fNsingle) return fThsingle[i];
+    Error("GetThetaSingle","Invalid cluster number %d",i); return -9999.;
+  }
+
+  Double_t GetPhiSingle(Int_t i) const { 
+    if(i>=0 && i<fNsingle) return fPhisingle[i];
+    Error("GetPhisingle","Invalid cluster number %d",i); return -9999.;
+  }
 
   Short_t GetNumberOfFiredChips(Int_t layer) const { return fFiredChips[layer]; }
   void SetFiredChips(Int_t layer, Short_t firedChips) { fFiredChips[layer] = firedChips; }
 
+  UInt_t GetNumberOfITSClusters(Int_t layer) const { return layer<6 ? fITSClusters[layer] : 0; }
+  UInt_t GetNumberOfITSClusters(Int_t layMin, Int_t layMax) const ;
+  void SetITSClusters(Int_t layer, UInt_t clusters) { fITSClusters[layer] = clusters; }
+
   void   SetFastOrFiredChips(UInt_t chipKey){fFastOrFiredChips.SetBitNumber(chipKey);}
-  TBits  GetFastOrFiredChips() const {return fFastOrFiredChips;}
+  const TBits & GetFastOrFiredChips() const {return fFastOrFiredChips;}
   Bool_t TestFastOrFiredChips(UInt_t chipKey) const {return fFastOrFiredChips.TestBitNumber(chipKey);}
 
+  void   SetFiredChipMap(TBits & firedChips){fClusterFiredChips = firedChips;}
+  void   SetFiredChipMap(UInt_t chipKey){fClusterFiredChips.SetBitNumber(chipKey);}
+  const TBits & GetFiredChipMap() const {return fClusterFiredChips;}
+  Bool_t TestFiredChipMap(UInt_t chipKey) const {return fClusterFiredChips.TestBitNumber(chipKey);}
+
   protected:
   void Duplicate(const AliMultiplicity &m);  // used by copy ctr.
 
@@ -67,10 +91,11 @@ class AliMultiplicity : public TObject {
   Double32_t *fThsingle;     //[fNsingle] array with theta values of L1 clusters
   Double32_t *fPhisingle;    //[fNsingle] array with phi values of L2 clusters
   Short_t fFiredChips[2];    // Number of fired chips in the two SPD layers
-
+  UInt_t fITSClusters[6];   // Number of ITS cluster per layer
   TBits fFastOrFiredChips;   // Map of FastOr fired chips
+  TBits fClusterFiredChips;         // Map of fired chips (= at least one cluster)
 
-  ClassDef(AliMultiplicity,9);
+  ClassDef(AliMultiplicity,12);
 };
 
 inline Int_t AliMultiplicity::GetLabel(Int_t i, Int_t layer) const
@@ -91,5 +116,6 @@ inline Int_t AliMultiplicity::GetLabel(Int_t i, Int_t layer) const
     } else {
        Error("GetLabel","Invalid track number %d",i); return -9999;
     }
+    return -9999;
 }
 #endif