Update for Ds

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

diff --git a/ITS/AliITSclustererV2.cxx b/ITS/AliITSclustererV2.cxx
index a4e86a060d515c4abafa96c2a198e1cc182cb9ba..eed786e88ed5a3c3fab1ff44c109ee8b60f14903 100644 (file)
--- a/ITS/AliITSclustererV2.cxx
+++ b/ITS/AliITSclustererV2.cxx
@@ -54,7 +54,16 @@ fHlSSD(0),
 fTanP(0),
 fTanN(0){
    //default constructor
- }
+  for(Int_t i=0;i<260;i++)fYSPD[i]=0.;
+  for(Int_t i=0;i<170;i++)fZSPD[i]=0.;
+  for(Int_t i=0;i<2200;i++){
+    fYshift[i]=0.;
+    fZshift[i]=0.;
+    fNdet[i]=0;
+    fNlayer[i]=0;
+  }
+
+}
 AliITSclustererV2::AliITSclustererV2(const Char_t *geom):
 fNModules(AliITSgeomTGeo::GetNModules()),
 fEvent(0),
@@ -185,7 +194,7 @@ void AliITSclustererV2::Digits2Clusters(AliRawReader* rawReader) {
   //------------------------------------------------------------
   // This function creates ITS clusters from raw data
   //------------------------------------------------------------
-  AliRunLoader* runLoader = AliRunLoader::GetRunLoader();
+  AliRunLoader* runLoader = AliRunLoader::Instance();
   if (!runLoader) {
     Error("Digits2Clusters", "no run loader found");
     return;
@@ -258,7 +267,7 @@ static void CheckLabels(Int_t lab[3]) {
   //------------------------------------------------------------
   // Tries to find mother's labels
   //------------------------------------------------------------
-  AliRunLoader *rl = AliRunLoader::GetRunLoader();
+  AliRunLoader *rl = AliRunLoader::Instance();
   TTree *trK=(TTree*)rl->TreeK();
 
   if(trK){
@@ -279,9 +288,15 @@ static void CheckLabels(Int_t lab[3]) {
        label=m;
        part=(TParticle*)gAlice->GetMCApp()->Particle(label);
       }
-      if      (lab[1]<0) lab[1]=label;
-      else if (lab[2]<0) lab[2]=label;
-      else ;//cerr<<"CheckLabels : No empty labels !\n";
+      if(lab[1]<0){
+       lab[1]=label;
+      }
+      else if (lab[2]<0) {
+       lab[2]=label;
+      }
+      else {
+       //      cerr<<"CheckLabels : No empty labels !\n";
+      }
     }
   }
 }
@@ -318,7 +333,7 @@ static void CheckLabels2(Int_t lab[10]) {
   //------------------------------------------------------------
   // Tries to find mother's labels
   //------------------------------------------------------------
-  AliRunLoader *rl = AliRunLoader::GetRunLoader();
+  AliRunLoader *rl = AliRunLoader::Instance();
   TTree *trK=(TTree*)rl->TreeK();
 
   if(trK){
@@ -389,7 +404,7 @@ static void CheckLabels2(Int_t lab[10]) {
 static void AddLabel(Int_t lab[10], Int_t label) {
 // add label of the particle in the kine tree which originates this cluster
 // (used for reconstruction of MC data only, for comparison purposes)
-  AliRunLoader *rl = AliRunLoader::GetRunLoader();
+  AliRunLoader *rl = AliRunLoader::Instance();
   TTree *trK=(TTree*)rl->TreeK();
 
   if(trK){
@@ -523,7 +538,7 @@ FindClustersSPD(const TClonesArray *digits, TClonesArray *clusters) {
      for (Int_t iz=zmin; iz<=zmax;iz+=idz)
        for (Int_t iy=ymin; iy<=ymax;iy+=idy){
         //
-        Int_t ndigits =0;
+        Int_t nodigits =0;
         Float_t y=0.,z=0.,q=0.;         
         for (Int_t l=0; l<ni; l++) {
           d=(AliITSdigitSPD*)digits->UncheckedAt(idx[l]);
@@ -531,12 +546,12 @@ FindClustersSPD(const TClonesArray *digits, TClonesArray *clusters) {
             if (TMath::Abs( d->GetCoord2()-iy)>0.75*idy) continue;
             if (TMath::Abs( d->GetCoord1()-iz)>0.75*idz) continue;
           }
-          ndigits++;
+          nodigits++;
           Float_t qq=d->GetSignal();
           y+=qq*fYSPD[d->GetCoord2()]; z+=qq*fZSPD[d->GetCoord1()]; q+=qq;   
          
         }     
-        if (ndigits==0) continue;
+        if (nodigits==0) continue;
         y/=q; z/=q;
         y-=fHwSPD; z-=fHlSPD;
         
@@ -556,7 +571,6 @@ FindClustersSPD(const TClonesArray *digits, TClonesArray *clusters) {
         lp[4]= (zmax-zmin+1)*100 + (ymax-ymin+1);
         
         milab[3]=fNdet[fI];
-        d=(AliITSdigitSPD*)digits->UncheckedAt(idx[0]);
         Int_t info[3] = {ymax-ymin+1,zmax-zmin+1,fNlayer[fI]};
         new (cl[n]) AliITSclusterV2(milab,lp,info); n++;        
        }
@@ -675,10 +689,12 @@ void AliITSclustererV2::FindClustersSPD(AliITSRawStream* input,
     }
 
     // fill the current digit into the bins array
-    Int_t index = (input->GetCoord2()+1) * kNzBins + (input->GetCoord1()+1);
-    bins[index].SetIndex(index);
-    bins[index].SetMask(1);
-    bins[index].SetQ(1);
+    if(bins){
+      Int_t index = (input->GetCoord2()+1) * kNzBins + (input->GetCoord1()+1);
+      bins[index].SetIndex(index);
+      bins[index].SetMask(1);
+      bins[index].SetQ(1);
+    }
   }
 
   delete [] binsSPDInit;
@@ -1665,8 +1681,8 @@ void AliITSclustererV2::FindClustersSSD(AliITSRawStream* input,
        fI = iModule;
        FindClustersSSD(&clusters1D[0][0], nClusters[0], 
                        &clusters1D[1][0], nClusters[1], clusters[iModule]);
-       Int_t nClusters = clusters[iModule]->GetEntriesFast();
-       nClustersSSD += nClusters;
+       Int_t noClusters = clusters[iModule]->GetEntriesFast();
+       nClustersSSD += noClusters;
       }
 
       if (!next) break;