coding conventions and compilation warnings

[u/mrichter/AliRoot.git] / STEER / AliAlignmentTracks.h

diff --git a/STEER/AliAlignmentTracks.h b/STEER/AliAlignmentTracks.h
index c03dbd10dfbeed2e4a0d3de43916c81a23626c0c..ccfb2ea6dc93d1c86bd33d2ee5f42ae4cb3250b6 100644 (file)
--- a/STEER/AliAlignmentTracks.h
+++ b/STEER/AliAlignmentTracks.h
@@ -33,7 +33,19 @@ class AliAlignmentTracks : public TObject {
   void SetPointsFilename(const char *pointsfilename = "AliTrackPoints.root") { fPointsFilename = pointsfilename; }
 
   void ProcessESD(TSelector *selector);
-  void ProcessESD();
+  void ProcessESD(Bool_t onlyITS=kFALSE,Int_t minITSpts=0,
+                 Bool_t cuts=kTRUE,
+                 Float_t minAngleWrtITSModulePlanes=0.,
+                 Float_t minMom=0.3,Float_t maxMom=1.e9,
+                 Float_t minAbsSinPhi=0.,Float_t maxAbsSinPhi=1.,
+                 Float_t minSinTheta=0.,Float_t maxSinTheta=1.);
+  void ProcessESDCosmics(Bool_t onlyITS=kFALSE,Int_t minITSpts=0,
+                        Float_t maxMatchingAngle=0.17, // 10 deg
+                        Bool_t cuts=kTRUE,
+                        Float_t minAngleWrtITSModulePlanes=0.,
+                        Float_t minMom=0.3,Float_t maxMom=1.e9,
+                        Float_t minAbsSinPhi=0.,Float_t maxAbsSinPhi=1.,
+                        Float_t minSinTheta=0.,Float_t maxSinTheta=1.);
 
   void BuildIndex();
 
@@ -42,25 +54,25 @@ class AliAlignmentTracks : public TObject {
   void SetTrackFitter(AliTrackFitter *fitter) { fTrackFitter = fitter; }
   void SetMinimizer(AliTrackResiduals *minimizer) { fMinimizer = minimizer; }
 
-  void AlignDetector(AliAlignObj::ELayerID firstLayer,
-                    AliAlignObj::ELayerID lastLayer,
-                    AliAlignObj::ELayerID layerRangeMin = AliAlignObj::kFirstLayer,
-                    AliAlignObj::ELayerID layerRangeMax = AliAlignObj::kLastLayer,Int_t iterations = 1);
-  void AlignLayer(AliAlignObj::ELayerID layer,
-                 AliAlignObj::ELayerID layerRangeMin = AliAlignObj::kFirstLayer,
-                 AliAlignObj::ELayerID layerRangeMax = AliAlignObj::kLastLayer,
+  void AlignDetector(AliGeomManager::ELayerID firstLayer,
+                    AliGeomManager::ELayerID lastLayer,
+                    AliGeomManager::ELayerID layerRangeMin = AliGeomManager::kFirstLayer,
+                    AliGeomManager::ELayerID layerRangeMax = AliGeomManager::kLastLayer,Int_t iterations = 1);
+  void AlignLayer(AliGeomManager::ELayerID layer,
+                 AliGeomManager::ELayerID layerRangeMin = AliGeomManager::kFirstLayer,
+                 AliGeomManager::ELayerID layerRangeMax = AliGeomManager::kLastLayer,
                  Int_t iterations = 1);
   void AlignVolume(UShort_t volId, UShort_t volIdFit,
                   Int_t iterations);
   void AlignVolumes(const TArrayI *volids, const TArrayI *volidsfit = 0x0,
-                  AliAlignObj::ELayerID layerRangeMin = AliAlignObj::kFirstLayer,
-                  AliAlignObj::ELayerID layerRangeMax = AliAlignObj::kLastLayer,
+                  AliGeomManager::ELayerID layerRangeMin = AliGeomManager::kFirstLayer,
+                  AliGeomManager::ELayerID layerRangeMax = AliGeomManager::kLastLayer,
                   Int_t iterations = 1);
 
   AliAlignObj* GetAlignObj(UShort_t volid) const {
     Int_t iModule;
-    AliAlignObj::ELayerID iLayer = AliAlignObj::VolUIDToLayer(volid,iModule);
-    return fAlignObjs[iLayer-AliAlignObj::kFirstLayer][iModule];
+    AliGeomManager::ELayerID iLayer = AliGeomManager::VolUIDToLayer(volid,iModule);
+    return fAlignObjs[iLayer-AliGeomManager::kFirstLayer][iModule];
   }
   void    SetUpdate(Bool_t update){fDoUpdate = update;}
   Bool_t  GetUpdate() const { return fDoUpdate;}