Correct treatment of tracks with pT<pTmin

[u/mrichter/AliRoot.git] / ITS / AliITSMapA2.cxx

diff --git a/ITS/AliITSMapA2.cxx b/ITS/AliITSMapA2.cxx
index 53c1569ceab1175534405976c0bcd366d8c8198b..45551bd96cb45eee3781ec345f4edfc93a78c822 100644 (file)
--- a/ITS/AliITSMapA2.cxx
+++ b/ITS/AliITSMapA2.cxx
@@ -15,11 +15,9 @@
 
 #include <TH1.h>
 #include <TObjArray.h>
-#include <TMath.h>
 
 #include "AliITSMapA2.h"
 #include "AliITSsegmentation.h"
-#include "AliITSresponse.h"
 #include "AliITSdigit.h"
 
 ////////////////////////////////////////////////////////////////////////
@@ -35,67 +33,72 @@
 ClassImp(AliITSMapA2)
 
 //______________________________________________________________________
-AliITSMapA2::AliITSMapA2(){
+AliITSMapA2::AliITSMapA2():
+fHitMapD(0),
+fMapThresholdD(0),
+fScaleSizeX(0),
+fScaleSizeZ(0){
     // default constructor
 
     fSegmentation  = 0;
     fNpz           = 0;
     fNpx           = 0;
     fMaxIndex      = 0;
-    fHitMapD       = 0;
     fObjects       = 0;
     fNobjects      = 0;
-    fMapThresholdD =0.;
 }
 //______________________________________________________________________
-AliITSMapA2::AliITSMapA2(AliITSsegmentation *seg){
+AliITSMapA2::AliITSMapA2(AliITSsegmentation *seg):
+fHitMapD(0),
+fMapThresholdD(0),
+fScaleSizeX(1),
+fScaleSizeZ(1){
     //constructor
 
-    fScaleSizeZ    = 1;
-    fScaleSizeX    = 1;
     fSegmentation  = seg;
     fNpz           = fSegmentation->Npz();
     fNpx           = fSegmentation->Npx();
     fMaxIndex      = fNpz*fNpx+fNpx;       // 2 halves of detector
     fHitMapD       = new Double_t[fMaxIndex+1];
-    fMapThresholdD = 0.;
     fObjects       = 0;
     fNobjects      = 0;
     ClearMap();
 }
 //______________________________________________________________________
 AliITSMapA2::AliITSMapA2(AliITSsegmentation *seg,
-                        Int_t scalesizeX, Int_t scalesizeZ){
+                        Int_t scalesizeX, Int_t scalesizeZ):
+fHitMapD(0),
+fMapThresholdD(0),
+fScaleSizeX(scalesizeX),
+fScaleSizeZ(scalesizeZ){
     //constructor
 
     fSegmentation  = seg;
-    fScaleSizeX    = scalesizeX;
-    fScaleSizeZ    = scalesizeZ;
     fNpz           = fScaleSizeZ*fSegmentation->Npz();
     fNpx           = fScaleSizeX*fSegmentation->Npx();
     fMaxIndex      = fNpz*fNpx+fNpx;             // 2 halves of detector
-    fHitMapD       = new Double_t[fMaxIndex];
-    fMapThresholdD = 0.;
+    fHitMapD       = new Double_t[fMaxIndex+1];
     fObjects       = 0;
     fNobjects      = 0;
     ClearMap();
 }
 //______________________________________________________________________
 AliITSMapA2::AliITSMapA2(AliITSsegmentation *seg, TObjArray *obj, 
-                        Double_t thresh){
+                        Double_t thresh):
+fHitMapD(0),
+fMapThresholdD(thresh),
+fScaleSizeX(1),
+fScaleSizeZ(1){
     //constructor
 
     fNobjects      = 0;
-    fScaleSizeZ    = 1;
-    fScaleSizeX    = 1;
     fSegmentation  = seg;
     fNpz           = fSegmentation->Npz();
     fNpx           = fSegmentation->Npx();
     fMaxIndex      = fNpz*fNpx+fNpx;             // 2 halves of detector  
-    fHitMapD       = new Double_t[fMaxIndex];
+    fHitMapD       = new Double_t[fMaxIndex+1];
     fObjects       =  obj;
     if (fObjects) fNobjects = fObjects->GetEntriesFast();
-    fMapThresholdD = thresh;
     ClearMap();
 }
 //______________________________________________________________________
@@ -104,30 +107,8 @@ AliITSMapA2::~AliITSMapA2(){
 
     if (fHitMapD) delete[] fHitMapD;
 }
-//______________________________________________________________________
-AliITSMapA2::AliITSMapA2(const AliITSMapA2 &source){
-    //     Copy Constructor 
-
-    if(&source == this) return;
-
-    this->fMapThresholdD = source.fMapThresholdD;
-    this->fScaleSizeX    = source.fScaleSizeX;
-    this->fScaleSizeZ    = source.fScaleSizeZ;
-    this->fHitMapD       = source.fHitMapD;
-    return;
-}
-//______________________________________________________________________
-AliITSMapA2& AliITSMapA2::operator=(const AliITSMapA2 &source) {
-    //    Assignment operator
 
-    if(&source == this) return *this;
 
-    this->fMapThresholdD = source.fMapThresholdD;
-    this->fScaleSizeX    = source.fScaleSizeX;
-    this->fScaleSizeZ    = source.fScaleSizeZ;
-    this->fHitMapD       = source.fHitMapD;
-    return *this;
-}
 //______________________________________________________________________
 void AliITSMapA2::ClearMap(){
     //clear array
@@ -146,8 +127,8 @@ void  AliITSMapA2::FillMap(){
     AliITSdigit *dig;
     for (Int_t ndig=0; ndig<ndigits; ndig++) {
        dig = (AliITSdigit*)fObjects->UncheckedAt(ndig);
-       Double_t signal = (Double_t)(dig->fSignal);
-       if (signal > fMapThresholdD) SetHit(dig->fCoord1,dig->fCoord2,signal);
+       Double_t signal = (Double_t)(dig->GetSignal());
+       if (signal > fMapThresholdD) SetHit(dig->GetCoord1(),dig->GetCoord2(),signal);
     } // end for ndig
 }
 //______________________________________________________________________
@@ -158,7 +139,7 @@ void AliITSMapA2::FlagHit(Int_t iz, Int_t ix){
                 -1000.*TMath::Abs((Int_t)(fHitMapD[CheckedIndex(iz, ix)])+1.);
 }
 //______________________________________________________________________
-TObject* AliITSMapA2::GetHit(Int_t i, Int_t dummy){
+TObject* AliITSMapA2::GetHit(Int_t i, Int_t /* dummy */) const {
   //return a pointer to the 1D histogram
 
     if (fObjects) {
@@ -166,25 +147,25 @@ TObject* AliITSMapA2::GetHit(Int_t i, Int_t dummy){
     } else return NULL;
 }
 //______________________________________________________________________
-Double_t AliITSMapA2::GetSignal(Int_t index){
+Double_t AliITSMapA2::GetSignal(Int_t index) const {
     //get signal in a cell 
 
     if (index<fMaxIndex) return (index <0) ? 0. : fHitMapD[index];
     else return 0.;
 }
 //______________________________________________________________________
-FlagType AliITSMapA2::TestHit(Int_t iz, Int_t ix){
+FlagTypeITS AliITSMapA2::TestHit(Int_t iz, Int_t ix){
     // check if the entry has already been flagged
 
-    if (CheckedIndex(iz, ix) < 0) return kEmpty;
+    if (CheckedIndex(iz, ix) < 0) return kEmptyITS;
     Int_t inf=(Int_t)fHitMapD[CheckedIndex(iz, ix)];
     
     if (inf <= -1000) {
-       return kUsed;
+       return kUsedITS;
     } else if (inf == 0) {
-       return kEmpty;
+       return kEmptyITS;
     } else {
-       return kUnused;
+       return kUnusedITS;
     } // end if inf...
 }
 //______________________________________________________________________