Undoing some unwanted method renames

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

diff --git a/ITS/AliITSClusterFinderSDDfast.cxx b/ITS/AliITSClusterFinderSDDfast.cxx
index b40202ffa47ccccaffc1b460d67431babb70f1ae..67e822d2705d478de10c1c21458d617d86ae2721 100644 (file)
--- a/ITS/AliITSClusterFinderSDDfast.cxx
+++ b/ITS/AliITSClusterFinderSDDfast.cxx
@@ -181,7 +181,7 @@ void AliITSClusterFinderSDDfast::FindClustersSDD(std::vector<int>& bins0, std::v
 
     const Int_t rresto=fNZbins-1;
     Int_t cid=0;
-    for(vector<int>::size_type i=0;i<binssize;i+=4){
+    for(std::vector<int>::size_type i=0;i<binssize;i+=4){
       if(!bins[i+2])
        bins[i+2]=++cid;
       Int_t me=bins[i];
@@ -190,7 +190,7 @@ void AliITSClusterFinderSDDfast::FindClustersSDD(std::vector<int>& bins0, std::v
         Int_t idxs[1]={me+fNZbins};
         for(Int_t k=0;k<1;++k)
          if(map[idxs[k]/32]&(1<<(idxs[k]%32)))
-           for(vector<int>::size_type j=i+4;j<binssize;j+=4)
+           for(std::vector<int>::size_type j=i+4;j<binssize;j+=4)
              if(bins[j]==idxs[k]){
                bins[j+2]=bins[i+2];
                break;
@@ -200,14 +200,14 @@ void AliITSClusterFinderSDDfast::FindClustersSDD(std::vector<int>& bins0, std::v
         Int_t idxs[2]={me+1,me+fNZbins};
         for(int k=0;k<2;++k)
          if(map[idxs[k]/32]&(1<<(idxs[k]%32)))
-           for(vector<int>::size_type j=i+4;j<binssize;j+=4)
+           for(std::vector<int>::size_type j=i+4;j<binssize;j+=4)
              if(bins[j]==idxs[k]){
                bins[j+2]=bins[i+2];
                break;
              }
       }
     }
-    for(vector<int>::size_type i=0;i<binssize;i+=4){
+    for(std::vector<int>::size_type i=0;i<binssize;i+=4){
       Int_t me=bins[i];
       Int_t resto=me%fNZbins;
       if(resto==fNZbins-1){
@@ -215,11 +215,11 @@ void AliITSClusterFinderSDDfast::FindClustersSDD(std::vector<int>& bins0, std::v
         Int_t myid=bins[i+2];
         for(Int_t l=0;l<1;++l){
           if(map[idxs[l]/32]&(1<<(idxs[l]%32)))
-           for(vector<int>::size_type j=i+4;j<binssize;j+=4){
+           for(std::vector<int>::size_type j=i+4;j<binssize;j+=4){
              if(bins[j]==idxs[l]){
                Int_t hisid=bins[j+2];
                if(myid!=hisid){
-                 for(vector<int>::size_type k=2;k<binssize;k+=4)
+                 for(std::vector<int>::size_type k=2;k<binssize;k+=4)
                    if(bins[k]==hisid)
                      bins[k]=myid;
                }
@@ -233,11 +233,11 @@ void AliITSClusterFinderSDDfast::FindClustersSDD(std::vector<int>& bins0, std::v
         Int_t myid=bins[i+2];
         for(Int_t l=0;l<2;++l){
           if(map[idxs[l]/32]&(1<<(idxs[l]%32)))
-           for(vector<int>::size_type j=i+4;j<binssize;j+=4){
+           for(std::vector<int>::size_type j=i+4;j<binssize;j+=4){
              if(bins[j]==idxs[l]){
                Int_t hisid=bins[j+2];
                if(myid!=hisid){
-                 for(vector<int>::size_type k=2;k<binssize;k+=4)
+                 for(std::vector<int>::size_type k=2;k<binssize;k+=4)
                    if(bins[k]==hisid)
                      bins[k]=myid;
                }
@@ -258,7 +258,7 @@ void AliITSClusterFinderSDDfast::FindClustersSDD(std::vector<int>& bins0, std::v
       for(Int_t j=0;j<10;++j)
        kplab[i][j]=-2;
 
-    for(vector<int>::size_type i=0;i<binssize;i+=4){
+    for(std::vector<int>::size_type i=0;i<binssize;i+=4){
       Int_t q=bins[i+1];
       Int_t me=bins[i+2]-1;
       Int_t z=bins[i]%fNZbins;
@@ -338,6 +338,7 @@ void AliITSClusterFinderSDDfast::FindClustersSDD(std::vector<int>& bins0, std::v
       Float_t driftTime=driftTimeUncorr-rsdd->GetTimeZero(fModule);
 
       if(driftTime<fMaxDrTimeForTightCut && recp[i][10]<fCutOnPeakTight) continue;
+      if(recp[i][10]<fCutOnPeakLoose) continue;
 
       Float_t driftSpeed=cal->GetDriftSpeedAtAnode(zAnode) + rsdd->GetDeltaVDrift(fModule,zAnode>255);
       Float_t driftPathMicron=driftTime*driftSpeed;
@@ -470,8 +471,8 @@ void AliITSClusterFinderSDDfast::FindClustersSDD(AliITSRawStream* input){
         if(vectModId[iMod]>=0){
           fModule = vectModId[iMod];
           TClonesArray* clusters=rpc->UncheckedGetClusters(fModule);
-          vector<int> bins0;
-          vector<int> bins1;
+         std::vector<int> bins0;
+         std::vector<int> bins1;
           bins0=fDDLBins[iMod*2];
           bins1=fDDLBins[iMod*2+1];
          Int_t map0[kMapDim];
@@ -492,7 +493,7 @@ void AliITSClusterFinderSDDfast::FindClustersSDD(AliITSRawStream* input){
         }
         for (Int_t s=0; s<2; s++){
           Int_t indexHyb=iMod*2+s;
-         for(vector<int>::size_type i=0;i<fDDLBins[indexHyb].size();++i)
+         for(std::vector<int>::size_type i=0;i<fDDLBins[indexHyb].size();++i)
            fDDLBins[indexHyb].erase(fDDLBins[indexHyb].begin(),fDDLBins[indexHyb].end());
          for(Int_t j=0;j<kMapDim;++j)
            mapsDDL[indexHyb][j]=0;
@@ -521,15 +522,18 @@ void AliITSClusterFinderSDDfast::FindClustersSDD(AliITSRawStream* input){
           Int_t q=(Int_t)(charge+0.5);
           Int_t iz = input->GetCoord1();
           Int_t itb = input->GetCoord2();
-          Float_t noise=cal->GetNoiseAfterElectronics(iz)*2.2;  // applies zero suppression using the measured noise of each anode. Threshold values from ALICE-INT-1999-28 V10
+         Int_t ian=iz;
+         if(iSide==1)
+           ian+=256;
+          Float_t noise=cal->GetNoiseAfterElectronics(ian)*2.2;  // applies zero suppression using the measured noise of each anode. Threshold values from ALICE-INT-1999-28 V10
           Int_t index=(itb+1)*fNZbins+(iz+1);
           if((itb<fNTimeBins) && (iz<fNAnodes)){
             if(q<noise) continue;
-            fDDLBins[iHybrid].push_back(index);
-            fDDLBins[iHybrid].push_back(q);
-            fDDLBins[iHybrid].push_back(0);
-            fDDLBins[iHybrid].push_back(countRW);
-            mapsDDL[iHybrid][index/32]|=(1<<(index%32));
+           fDDLBins[iHybrid].push_back(index);
+           fDDLBins[iHybrid].push_back(q);
+           fDDLBins[iHybrid].push_back(0);
+           fDDLBins[iHybrid].push_back(countRW);
+           mapsDDL[iHybrid][index/32]|=(1<<(index%32));
           }
          else{
             AliWarning(Form("Invalid SDD cell: Anode=%d   TimeBin=%d",iz,itb));