modification(by Levente) to solve the problem in the QA mentioned in the bug report...

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

diff --git a/STEER/AliMultiplicity.cxx b/STEER/AliMultiplicity.cxx
index 44d57425f61d992599dc4fb431f7ac8f6d935b8d..38b3a86bff178b00cac0f4aa94bad4eb66a6842e 100644 (file)
--- a/STEER/AliMultiplicity.cxx
+++ b/STEER/AliMultiplicity.cxx
@@ -1,5 +1,6 @@
 #include <string.h>
 #include "AliMultiplicity.h"
+#include "AliLog.h"
 
 ClassImp(AliMultiplicity)
 
@@ -16,15 +17,17 @@ AliMultiplicity::AliMultiplicity():
   fDeltPhi(0),
   fThsingle(0),
   fPhisingle(0),
-  fFastOrFiredChips(1200)
+  fFastOrFiredChips(1200),
+  fClusterFiredChips(1200)
 {
   // Default Constructor
   fFiredChips[0] = 0;
   fFiredChips[1] = 0;
+  for(Int_t ilayer = 0; ilayer < 6; ilayer++)fITSClusters[ilayer] = 0;
 }
 
 //______________________________________________________________________
-AliMultiplicity::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 fFastOr):
+AliMultiplicity::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, const TBits & fFastOr):
   TObject(),
   fNtracks(ntr),
   fNsingle(ns),
@@ -36,7 +39,8 @@ AliMultiplicity::AliMultiplicity(Int_t ntr, Float_t *th,  Float_t *ph, Float_t *
   fDeltPhi(0),
   fThsingle(0),
   fPhisingle(0),
-  fFastOrFiredChips(1200)
+  fFastOrFiredChips(1200),
+  fClusterFiredChips(1200)
 {
 // Standard constructor
   if(ntr>0){
@@ -66,6 +70,7 @@ AliMultiplicity::AliMultiplicity(Int_t ntr, Float_t *th,  Float_t *ph, Float_t *
   fFiredChips[0] = nfcL1;
   fFiredChips[1] = nfcL2;
   fFastOrFiredChips = fFastOr;
+  for(Int_t ilayer = 0; ilayer < 6; ilayer++)fITSClusters[ilayer] = 0;
 }
 
 //______________________________________________________________________
@@ -81,7 +86,8 @@ AliMultiplicity::AliMultiplicity(const AliMultiplicity& m):
   fDeltPhi(0),
   fThsingle(0),
   fPhisingle(0),
-  fFastOrFiredChips(1200)
+  fFastOrFiredChips(1200),
+  fClusterFiredChips(1200)
 {
   // copy constructor
   Duplicate(m);
@@ -160,8 +166,14 @@ void AliMultiplicity::Duplicate(const AliMultiplicity& m){
 
   fFiredChips[0] = m.fFiredChips[0];
   fFiredChips[1] = m.fFiredChips[1];
+  for(Int_t ilayer = 0; ilayer < 6; ilayer++){
+    fITSClusters[ilayer] = m.fITSClusters[ilayer];
+  }
+
+  
 
   fFastOrFiredChips = m.fFastOrFiredChips;
+  fClusterFiredChips = m.fClusterFiredChips;
 }
 
 //______________________________________________________________________
@@ -177,3 +189,42 @@ AliMultiplicity::~AliMultiplicity(){
   if(fPhisingle)delete [] fPhisingle;fPhisingle = 0;
 
 }
+
+//______________________________________________________________________
+void AliMultiplicity::SetLabel(Int_t i, Int_t layer, Int_t label)
+{
+    if(i>=0 && i<fNtracks) {
+       if (layer == 0) {
+           fLabels[i] = label;
+           return;
+       } else if (layer == 1) {
+           if (fLabelsL2) {
+               fLabelsL2[i] = label;
+               return;
+           }
+       }
+    }
+    Error("SetLabel","Invalid track number %d or layer %d",i,layer);
+}
+
+//______________________________________________________________________
+UInt_t AliMultiplicity::GetNumberOfITSClusters(Int_t layMin, Int_t layMax) const {
+
+  if(layMax < layMin) {
+    AliError("layer min > layer max");
+    return 0;
+  }
+  if(layMin < 0) {
+    AliError("layer min < 0");
+    return 0;
+  }
+  if(layMax < 0) {
+    AliError("layer max > 0");
+    return 0;
+  }
+
+  Int_t sum=0; 
+  for (Int_t i=layMin; i<=layMax; i++) sum+=fITSClusters[i]; 
+  return sum; 
+
+}