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 370d2a646b5f3949499eedb4d96308600ea544f7..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)
 
@@ -12,17 +13,21 @@ AliMultiplicity::AliMultiplicity():
   fLabelsL2(0),
   fTh(0),
   fPhi(0),
+  fDeltTh(0),
   fDeltPhi(0),
   fThsingle(0),
-  fPhisingle(0)
+  fPhisingle(0),
+  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 *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::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),
@@ -30,9 +35,12 @@ AliMultiplicity::AliMultiplicity(Int_t ntr, Float_t *t,  Float_t *ph, Float_t *d
   fLabelsL2(0),
   fTh(0),
   fPhi(0),
+  fDeltTh(0),
   fDeltPhi(0),
   fThsingle(0),
-  fPhisingle(0)
+  fPhisingle(0),
+  fFastOrFiredChips(1200),
+  fClusterFiredChips(1200)
 {
 // Standard constructor
   if(ntr>0){
@@ -40,11 +48,13 @@ AliMultiplicity::AliMultiplicity(Int_t ntr, Float_t *t,  Float_t *ph, Float_t *d
     fLabelsL2 = new Int_t[ntr];
     fTh = new Double_t [ntr];
     fPhi = new Double_t [ntr];
+    fDeltTh = new Double_t [ntr];
     fDeltPhi = new Double_t [ntr];
     for(Int_t i=0;i<fNtracks;i++){
-      fTh[i]=t[i];
+      fTh[i]=th[i];
       fPhi[i]=ph[i];
-      fDeltPhi[i]=df[i];
+      fDeltTh[i]=dth[i];
+      fDeltPhi[i]=dph[i];
       fLabels[i] = labels[i];
       fLabelsL2[i] = labelsL2[i];
     }
@@ -59,6 +69,8 @@ AliMultiplicity::AliMultiplicity(Int_t ntr, Float_t *t,  Float_t *ph, Float_t *d
   }
   fFiredChips[0] = nfcL1;
   fFiredChips[1] = nfcL2;
+  fFastOrFiredChips = fFastOr;
+  for(Int_t ilayer = 0; ilayer < 6; ilayer++)fITSClusters[ilayer] = 0;
 }
 
 //______________________________________________________________________
@@ -70,9 +82,12 @@ AliMultiplicity::AliMultiplicity(const AliMultiplicity& m):
   fLabelsL2(0),
   fTh(0),
   fPhi(0),
+  fDeltTh(0),
   fDeltPhi(0),
   fThsingle(0),
-  fPhisingle(0)
+  fPhisingle(0),
+  fFastOrFiredChips(1200),
+  fClusterFiredChips(1200)
 {
   // copy constructor
   Duplicate(m);
@@ -86,6 +101,7 @@ AliMultiplicity &AliMultiplicity::operator=(const AliMultiplicity& m){
 
   if(fTh)delete [] fTh;fTh = 0;
   if(fPhi)delete [] fPhi;fPhi = 0; 
+  if(fDeltTh)delete [] fDeltTh;fDeltTh= 0; 
   if(fDeltPhi)delete [] fDeltPhi;fDeltPhi = 0; 
   if(fLabels)delete [] fLabels;fLabels = 0;
   if(fLabelsL2)delete [] fLabelsL2;fLabelsL2 = 0;
@@ -117,6 +133,7 @@ void AliMultiplicity::Duplicate(const AliMultiplicity& m){
   if(fNtracks>0){
     fTh = new Double_t[fNtracks];
     fPhi = new Double_t[fNtracks];
+    fDeltTh = new Double_t[fNtracks];
     fDeltPhi = new Double_t[fNtracks];
     fLabels = new Int_t[fNtracks];
     fLabelsL2 = new Int_t[fNtracks];
@@ -124,6 +141,7 @@ void AliMultiplicity::Duplicate(const AliMultiplicity& m){
   else {
     fTh = 0;
     fPhi = 0;
+    fDeltTh = 0;
     fDeltPhi = 0;
     fLabels = 0;
     fLabelsL2 = 0;
@@ -139,6 +157,7 @@ void AliMultiplicity::Duplicate(const AliMultiplicity& m){
   }
   if(m.fTh)memcpy(fTh,m.fTh,fNtracks*sizeof(Double_t));
   if(m.fPhi)memcpy(fPhi,m.fPhi,fNtracks*sizeof(Double_t));
+  if(m.fDeltTh)memcpy(fDeltTh,m.fDeltTh,fNtracks*sizeof(Double_t));
   if(m.fDeltPhi)memcpy(fDeltPhi,m.fDeltPhi,fNtracks*sizeof(Double_t));
   if(m.fLabels)memcpy(fLabels,m.fLabels,fNtracks*sizeof(Int_t));
   if(m.fLabelsL2)memcpy(fLabelsL2,m.fLabelsL2,fNtracks*sizeof(Int_t));
@@ -147,6 +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;
 }
 
 //______________________________________________________________________
@@ -154,6 +181,7 @@ AliMultiplicity::~AliMultiplicity(){
   // Destructor
   if(fTh)delete [] fTh;fTh = 0;
   if(fPhi)delete [] fPhi;fPhi = 0; 
+  if(fDeltTh)delete [] fDeltTh;fDeltTh = 0; 
   if(fDeltPhi)delete [] fDeltPhi;fDeltPhi = 0; 
   if(fLabels)delete [] fLabels;fLabels = 0;
   if(fLabelsL2)delete [] fLabelsL2;fLabelsL2 = 0;
@@ -161,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; 
+
+}