A macro for checking a few basic pileup properties in MC

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

diff --git a/ITS/AliITSRealignTracks.cxx b/ITS/AliITSRealignTracks.cxx
index c586291b436d1f2e1a3835f238554acf51084603..ae72f00de9e00b0091db3c20df19563f5883957b 100644 (file)
--- a/ITS/AliITSRealignTracks.cxx
+++ b/ITS/AliITSRealignTracks.cxx
@@ -836,7 +836,7 @@ Bool_t AliITSRealignTracks::ReadAlignObjs(const char *alignObjFileName, const ch
 }
 
 //_________________________________________
-Bool_t AliITSRealignTracks::FirstAlignmentLayers(const Bool_t *layers,Int_t minNtracks,Int_t iterations,Bool_t fitall,TArrayI *volidsSet){
+Bool_t AliITSRealignTracks::FirstAlignmentLayers(const Bool_t *layers,Int_t minNtracks,Int_t iterations,Bool_t fitall,const TArrayI *volidsSet){
 
   //Align all modules in the set of layers independently according to a sequence based on the number of tracks passing through a given module
   
@@ -896,14 +896,14 @@ Bool_t AliITSRealignTracks::FirstAlignmentLayers(const Bool_t *layers,Int_t minN
 
   sequence->Set(nMod);
 
- Int_t ilayer,imod;
+  // Int_t imod;
   for(Int_t iter=0;iter<iterations;iter++){
     if(iter>0&&fDraw)UpdateDraw(sequence,iter,iter);
     modAligned=0;
     for(Int_t k=0;k<nMod;k++){
       TArrayI *volFit3;
       voluid=sequence->At(k);
-      ilayer=AliGeomManager::VolUIDToLayer(voluid,imod);
+      //      ilayer=AliGeomManager::VolUIDToLayer(voluid,imod);
       volIn->AddAt(voluid,0);
       found=0;
       if(!fitall){
@@ -952,7 +952,7 @@ Bool_t AliITSRealignTracks::FirstAlignmentLayers(const Bool_t *layers,Int_t minN
 }
 
 //__________________________________________
-Bool_t AliITSRealignTracks::FirstAlignmentSPD(Int_t minNtracks,Int_t iterations,Bool_t fitall,TArrayI *volidsSet){
+Bool_t AliITSRealignTracks::FirstAlignmentSPD(Int_t minNtracks,Int_t iterations,Bool_t fitall,const TArrayI *volidsSet){
 
   //OBSOLETE METHOD: perform a stand-alone realignment of the SPD modules
   //                 based on a sequence constructed accordingly to the number of tracks
@@ -1006,13 +1006,12 @@ Bool_t AliITSRealignTracks::FirstAlignmentSPD(Int_t minNtracks,Int_t iterations,
   }
   sequence->Set(nMod);
   
-  Int_t ilayer,imod;
   for(Int_t iter=0;iter<iterations;iter++){ 
     modAligned=0;
     for(Int_t k=0;k<nMod;k++){
       TArrayI *volFit3;
       voluid=sequence->At(k);
-      ilayer=AliGeomManager::VolUIDToLayer(voluid,imod);
+      //      ilayer=AliGeomManager::VolUIDToLayer(voluid,imod);
       volIn->AddAt(voluid,0);
       found=0;
       if(!fitall){
@@ -1112,7 +1111,7 @@ Bool_t AliITSRealignTracks::AlignVolumesITS(const TArrayI *volids, const TArrayI
   Double_t frac;
 
   TGeoHMatrix hM;
-  Double_t phiglob,smearing,rotorig[9],normplanevect[3]={0.,0.,0.},normplanevect2[3]={0.,0.,0.};  
+  Double_t smearing,rotorig[9],normplanevect[3]={0.,0.,0.},normplanevect2[3]={0.,0.,0.};  
   Double_t *deltarot;
   TMatrixDSym covmatrx(6);
   AliAlignObj *modAlign;
@@ -1160,7 +1159,7 @@ Bool_t AliITSRealignTracks::AlignVolumesITS(const TArrayI *volids, const TArrayI
          normplanevect[2]=0.;
     }
     
-    phiglob=TMath::ATan2(normplanevect[1],normplanevect[0]);
+    //    phiglob=TMath::ATan2(normplanevect[1],normplanevect[0]);
     
     modAlign=GetAlignObj(volids->At(0));
     modAlign->GetMatrix(hM);
@@ -1551,7 +1550,7 @@ Bool_t AliITSRealignTracks::AlignSPDSectorWithSectors(Int_t sector,Int_t iterati
 
 
 //___________________________________________________
-Bool_t AliITSRealignTracks::AlignSPDSectorsWithSectors(Int_t *sectorsIN,Int_t *sectorsFit,Int_t iterations){
+Bool_t AliITSRealignTracks::AlignSPDSectorsWithSectors(const Int_t *sectorsIN,const Int_t *sectorsFit,Int_t iterations){
   //Align SPD sectors defined in "sectorsIN" with respect to 
   //SPD sectors defined in "sectorsFit" iterations time
 
@@ -1567,7 +1566,7 @@ Bool_t AliITSRealignTracks::AlignSPDSectorsWithSectors(Int_t *sectorsIN,Int_t *s
 }
 
 //___________________________________________________
-Bool_t AliITSRealignTracks::AlignSPDStaves(Int_t *staves,Int_t *sectorsIN,Int_t *sectorsFit,Int_t iterations){
+Bool_t AliITSRealignTracks::AlignSPDStaves(const Int_t *staves,const Int_t *sectorsIN,const Int_t *sectorsFit,Int_t iterations){
   //Align SPD staves defined by staves and sectorsIN with respect to sectorsFit volumes iterations times
 
   TArrayI *volIDs=GetSPDStavesVolids(sectorsIN,staves);
@@ -1598,7 +1597,7 @@ Bool_t AliITSRealignTracks::AlignLayerToSPDHalfBarrel(Int_t layer,Int_t updown,I
   TString layerstr[6]={"SPD1","SPD2","SDD1","SDD2","SSD1","SSD2"};  
   TArrayI *volIDsFit;
   Int_t layers[6]={0,0,0,0,0,0};
-  layers[layer]=1;
+  layers[layer-1]=1;
   Int_t size=AliGeomManager::LayerSize(layer);
   TArrayI *volIDs=GetLayersVolUID(layers);
 
@@ -1634,9 +1633,9 @@ Bool_t AliITSRealignTracks::AlignLayerToSector(Int_t layer,Int_t sector,Int_t it
   TString layerstr[6]={"SPD1","SPD2","SDD1","SDD2","SSD1","SSD2"};  
   TArrayI *volIDsFit;
   Int_t layers[6]={0,0,0,0,0,0};
-  layers[layer]=1;
+  layers[layer-1]=1;
   TArrayI *volIDs=GetLayersVolUID(layers);
-  Int_t size=AliGeomManager::LayerSize(layer);
+  Int_t size=AliGeomManager::LayerSize(layer); 
   
  
   volIDsFit=GetSPDSectorsVolids(sectors);   
@@ -1744,12 +1743,12 @@ Bool_t AliITSRealignTracks::AlignSPD1SectorRef(Int_t sector,Int_t iterations){
 
 //_____________________________________________
 
-AliAlignObjParams* AliITSRealignTracks::MediateAlignObj(TArrayI *volIDs,Int_t lastVolid){
+AliAlignObjParams* AliITSRealignTracks::MediateAlignObj(const TArrayI *volIDs,Int_t lastVolid){
   //TEMPORARY METHOD: perform an average of the values of the parameters of the AlignObjs 
   // defined by the array volIDs up to lastVolid position in this array
   //The aim of such a method is to look for collective movement of a given set of modules
 
-  UShort_t volid;
+  //  UShort_t volid;
 
   TGeoHMatrix hm;
   Double_t *rot,*transl;
@@ -1758,7 +1757,7 @@ AliAlignObjParams* AliITSRealignTracks::MediateAlignObj(TArrayI *volIDs,Int_t la
 
 
   for(Int_t ivol=0;ivol<lastVolid;ivol++){
-    volid=volIDs->At(ivol);
+    //    volid=volIDs->At(ivol);
   
     GetAlignObj(volIDs->At(ivol))->GetMatrix(hm);