Temp.protection against undefined beam type in Bfield init

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

diff --git a/STEER/AliMultiplicity.h b/STEER/AliMultiplicity.h
index 410501b2c67a1e61e45c5bd7570bed1dfb7d6b78..50482df90d676fc0f955373f2f2aed546b3423fc 100644 (file)
--- a/STEER/AliMultiplicity.h
+++ b/STEER/AliMultiplicity.h
@@ -2,6 +2,7 @@
 #define ALIMULTIPLICITY_H
 
 #include<TObject.h>
+#include <TBits.h>
 #include<TMath.h>
 
 ////////////////////////////////////////////////////////
@@ -15,8 +16,8 @@ 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* labelsL2, Int_t ns, Float_t *ts, Float_t *ps, Short_t nfcL1, Short_t nfcL2);
+  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);
   AliMultiplicity(const AliMultiplicity& m);
   AliMultiplicity& operator=(const AliMultiplicity& m);
   virtual void Copy(TObject &obj) const;
@@ -26,9 +27,11 @@ class AliMultiplicity : public TObject {
   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("GetTheta","Invalid track number %d",i); return -9999.;}}
+  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(i>=0 && i<fNtracks) {return fDeltTh[i];}
+  else {Error("GetDeltaTheta","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.;}}
 
@@ -44,6 +47,10 @@ class AliMultiplicity : public TObject {
   Short_t GetNumberOfFiredChips(Int_t layer) const { return fFiredChips[layer]; }
   void SetFiredChips(Int_t layer, Short_t firedChips) { fFiredChips[layer] = firedChips; }
 
+  void   SetFastOrFiredChips(UInt_t chipKey){fFastOrFiredChips.SetBitNumber(chipKey);}
+  TBits  GetFastOrFiredChips() const {return fFastOrFiredChips;}
+  Bool_t TestFastOrFiredChips(UInt_t chipKey) const {return fFastOrFiredChips.TestBitNumber(chipKey);}
+
   protected:
   void Duplicate(const AliMultiplicity &m);  // used by copy ctr.
 
@@ -54,12 +61,15 @@ class AliMultiplicity : public TObject {
   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 *fDeltTh;       //[fNtracks] array with delta theta values
   Double32_t *fDeltPhi;      //[fNtracks] array with delta phi values
   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
 
-  ClassDef(AliMultiplicity,7);
+  TBits fFastOrFiredChips;   // Map of FastOr fired chips
+
+  ClassDef(AliMultiplicity,9);
 };
 
 inline Int_t AliMultiplicity::GetLabel(Int_t i, Int_t layer) const