X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSRecoParam.h;h=81e9422e47088abe8215c0fd4a1d38ad9e0cdad7;hb=7d4dc85f6cfcf5d614408a600105a567679255e9;hp=3d29ff18d71904bb16b65b7004aa488975431054;hpb=8b78365f28ead95f065fd46ee89d969cd828d4d7;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ITS/AliITSRecoParam.h b/ITS/AliITSRecoParam.h
index 3d29ff18d71..81e9422e470 100644
--- a/ITS/AliITSRecoParam.h
+++ b/ITS/AliITSRecoParam.h
@@ -15,6 +15,7 @@
 
 #include "AliDetectorRecoParam.h"
 #include "AliITSgeomTGeo.h"
+#include "AliESDV0Params.h"
 
 class AliITSRecoParam : public AliDetectorRecoParam
 {
@@ -182,7 +183,8 @@ class AliITSRecoParam : public AliDetectorRecoParam
   Double_t GetSigmaZDeadZoneHit2() const { return fSigmaZDeadZoneHit2; }
   Double_t GetXPassDeadZoneHits() const { return fXPassDeadZoneHits; }
 
-
+  Bool_t   GetSkipSubdetsNotInTriggerCluster() const { return fSkipSubdetsNotInTriggerCluster; }
+  void     SetSkipSubdetsNotInTriggerCluster(Bool_t flag=kTRUE) { fSkipSubdetsNotInTriggerCluster=flag; }
 
   void   SetUseTGeoInTracker(Int_t use=1) { fUseTGeoInTracker=use; return; }
   Int_t  GetUseTGeoInTracker() const { return fUseTGeoInTracker; }
@@ -197,8 +199,11 @@ class AliITSRecoParam : public AliDetectorRecoParam
   void   SetClusterMisalErrorY(Float_t e0,Float_t e1,Float_t e2,Float_t e3,Float_t e4,Float_t e5) { fClusterMisalErrorY[0]=e0; fClusterMisalErrorY[1]=e1; fClusterMisalErrorY[2]=e2; fClusterMisalErrorY[3]=e3; fClusterMisalErrorY[4]=e4; fClusterMisalErrorY[5]=e5; return; }
   void   SetClusterMisalErrorZ(Float_t e0,Float_t e1,Float_t e2,Float_t e3,Float_t e4,Float_t e5) { fClusterMisalErrorZ[0]=e0; fClusterMisalErrorZ[1]=e1; fClusterMisalErrorZ[2]=e2; fClusterMisalErrorZ[3]=e3; fClusterMisalErrorZ[4]=e4; fClusterMisalErrorZ[5]=e5; return; }
   void   SetClusterMisalError(Float_t err=0.) { SetClusterMisalErrorY(err,err,err,err,err,err); SetClusterMisalErrorZ(err,err,err,err,err,err); }
-  Float_t GetClusterMisalErrorY(Int_t i) const { return fClusterMisalErrorY[i]; }
-  Float_t GetClusterMisalErrorZ(Int_t i) const { return fClusterMisalErrorZ[i]; }
+  void   SetClusterMisalErrorYBOn(Float_t e0,Float_t e1,Float_t e2,Float_t e3,Float_t e4,Float_t e5) { fClusterMisalErrorYBOn[0]=e0; fClusterMisalErrorYBOn[1]=e1; fClusterMisalErrorYBOn[2]=e2; fClusterMisalErrorYBOn[3]=e3; fClusterMisalErrorYBOn[4]=e4; fClusterMisalErrorYBOn[5]=e5; return; }
+  void   SetClusterMisalErrorZBOn(Float_t e0,Float_t e1,Float_t e2,Float_t e3,Float_t e4,Float_t e5) { fClusterMisalErrorZBOn[0]=e0; fClusterMisalErrorZBOn[1]=e1; fClusterMisalErrorZBOn[2]=e2; fClusterMisalErrorZBOn[3]=e3; fClusterMisalErrorZBOn[4]=e4; fClusterMisalErrorZBOn[5]=e5; return; }
+  void   SetClusterMisalErrorBOn(Float_t err=0.) { SetClusterMisalErrorYBOn(err,err,err,err,err,err); SetClusterMisalErrorZBOn(err,err,err,err,err,err); }
+  Float_t GetClusterMisalErrorY(Int_t i,Double_t b=0.) const { return (TMath::Abs(b)<0.0001 ? fClusterMisalErrorY[i] : fClusterMisalErrorYBOn[i]); }
+  Float_t GetClusterMisalErrorZ(Int_t i,Double_t b=0.) const { return (TMath::Abs(b)<0.0001 ? fClusterMisalErrorZ[i] : fClusterMisalErrorZBOn[i]); }
 
   void   SetUseAmplitudeInfo(Bool_t use=kTRUE) { for(Int_t i=0;i<AliITSgeomTGeo::kNLayers;i++) fUseAmplitudeInfo[i]=use; return; }
   void   SetUseAmplitudeInfo(Int_t ilay,Bool_t use) { fUseAmplitudeInfo[ilay]=use; return; }
@@ -216,8 +221,12 @@ class AliITSRecoParam : public AliDetectorRecoParam
   Bool_t  GetBkgTrackletsPlaneEff() const {return fBkgTrackletsPlaneEff;}
   void    SetTrackleterPhiWindowL1(Float_t w=0.10) {fTrackleterPhiWindowL1=w; return;}
   Float_t GetTrackleterPhiWindowL1() const {return fTrackleterPhiWindowL1;}
+  void    SetTrackleterPhiWindowL2(Float_t w=0.07) {fTrackleterPhiWindowL2=w; return;}
+  Float_t GetTrackleterPhiWindowL2() const {return fTrackleterPhiWindowL2;}
   void    SetTrackleterZetaWindowL1(Float_t w=0.6) {fTrackleterZetaWindowL1=w; return;}
   Float_t GetTrackleterZetaWindowL1() const {return fTrackleterZetaWindowL1;}
+  void    SetTrackleterZetaWindowL2(Float_t w=0.40) {fTrackleterZetaWindowL2=w; return;}
+  Float_t GetTrackleterZetaWindowL2() const {return fTrackleterZetaWindowL2;}
   void    SetUpdateOncePerEventPlaneEff(Bool_t use=kTRUE) {fUpdateOncePerEventPlaneEff=use; return;}
   Bool_t  GetUpdateOncePerEventPlaneEff() const {return fUpdateOncePerEventPlaneEff;}
   void    SetMinContVtxPlaneEff(Int_t n=3) {fMinContVtxPlaneEff=n; return;}
@@ -282,7 +291,7 @@ class AliITSRecoParam : public AliDetectorRecoParam
   void   SetSAOnePointTracks() { fSAOnePointTracks=kTRUE; return; }
   Bool_t GetSAOnePointTracks() const { return fSAOnePointTracks; }
 
-  void   SetSAUseAllClusters() { fSAUseAllClusters=kTRUE; return; }
+  void   SetSAUseAllClusters(Bool_t opt=kTRUE) { fSAUseAllClusters=opt; return; }
   Bool_t GetSAUseAllClusters() const { return fSAUseAllClusters; }
 
   void   SetFindV0s(Bool_t find=kTRUE) { fFindV0s=find; return; }
@@ -303,6 +312,9 @@ class AliITSRecoParam : public AliDetectorRecoParam
   void   SetUseUnfoldingInClusterFinderSSD(Bool_t use=kTRUE) { fUseUnfoldingInClusterFinderSSD=use; return; }
   Bool_t GetUseUnfoldingInClusterFinderSSD() const { return fUseUnfoldingInClusterFinderSSD; }
 
+  void   SetUseBadChannelsInClusterFinderSSD(Bool_t use=kFALSE) { fUseBadChannelsInClusterFinderSSD=use; return; }
+  Bool_t GetUseBadChannelsInClusterFinderSSD() const  { return fUseBadChannelsInClusterFinderSSD;  }   
+
   void   SetUseSDDCorrectionMaps(Bool_t use=kTRUE) {fUseSDDCorrectionMaps=use;}
   Bool_t GetUseSDDCorrectionMaps() const {return fUseSDDCorrectionMaps;}
   void   SetUseSDDClusterSizeSelection(Bool_t use=kTRUE) {fUseSDDClusterSizeSelection=use;}
@@ -317,12 +329,12 @@ class AliITSRecoParam : public AliDetectorRecoParam
   Bool_t GetUseCosmicRunShiftsSSD() const { return fUseCosmicRunShiftsSSD; }
 
   // SPD Tracklets (D. Elia)
-  void    SetTrackleterOnlyOneTrackletPerC2(Bool_t use= kTRUE) {fTrackleterOnlyOneTrackletPerC2=use; return; }
-  Bool_t  GetTrackleterOnlyOneTrackletPerC2() const { return fTrackleterOnlyOneTrackletPerC2; }
   void    SetTrackleterPhiWindow(Float_t w=0.08) {fTrackleterPhiWindow=w;}
-  void    SetTrackleterZetaWindow(Float_t w=1.) {fTrackleterZetaWindow=w;}
+  void    SetTrackleterThetaWindow(Float_t w=0.025) {fTrackleterThetaWindow=w;}
+  void    SetTrackleterPhiShift(Float_t w=0.0045) {fTrackleterPhiShift=w;}
   Float_t GetTrackleterPhiWindow() const {return fTrackleterPhiWindow;}
-  Float_t GetTrackleterZetaWindow() const {return fTrackleterZetaWindow;}
+  Float_t GetTrackleterThetaWindow() const {return fTrackleterThetaWindow;}
+  Float_t GetTrackleterPhiShift() const {return fTrackleterPhiShift;}
   void    SetTrackleterRemoveClustersFromOverlaps(Bool_t use=kTRUE) { fTrackleterRemoveClustersFromOverlaps=use; return; }
   Bool_t  GetTrackleterRemoveClustersFromOverlaps() const { return fTrackleterRemoveClustersFromOverlaps; }
   void    SetTrackleterPhiOverlapCut(Float_t w=0.005) {fTrackleterPhiOverlapCut=w;}
@@ -364,6 +376,7 @@ class AliITSRecoParam : public AliDetectorRecoParam
   Float_t GetAlignFilterMaxPt() const {return fAlignFilterMaxPt;}          
   Bool_t  GetAlignFilterFillQANtuples() const {return fAlignFilterFillQANtuples;}     
 
+  AliESDV0Params *GetESDV0Params() const {return fESDV0Params;}
 
 
   enum {fgkMaxClusterPerLayer=70000}; //7000*10;   // max clusters per layer
@@ -483,6 +496,7 @@ class AliITSRecoParam : public AliDetectorRecoParam
   Double_t fSigmaZDeadZoneHit2; // z error virtual cls
   Double_t fXPassDeadZoneHits;  // x distance between clusters
 
+  Bool_t fSkipSubdetsNotInTriggerCluster; // skip the subdetectors that are not in the trigger cluster
 
   Int_t fUseTGeoInTracker; // use TGeo to get material budget in tracker MI
   Double_t fStepSizeTGeo; // step size (cm)
@@ -491,6 +505,8 @@ class AliITSRecoParam : public AliDetectorRecoParam
   Int_t fClusterErrorsParam; // parametrization for cluster errors (MI), see AliITSRecoParam::GetError()
   Float_t fClusterMisalErrorY[AliITSgeomTGeo::kNLayers]; // [cm] additional error on cluster Y pos. due to misalignment (MI,SA)
   Float_t fClusterMisalErrorZ[AliITSgeomTGeo::kNLayers]; // [cm] additional error on cluster Z pos. due to misalignment (MI,SA)
+  Float_t fClusterMisalErrorYBOn[AliITSgeomTGeo::kNLayers]; // [cm] additional error on cluster Y pos. due to misalignment (MI,SA)
+  Float_t fClusterMisalErrorZBOn[AliITSgeomTGeo::kNLayers]; // [cm] additional error on cluster Z pos. due to misalignment (MI,SA)
 
   Bool_t fUseAmplitudeInfo[AliITSgeomTGeo::kNLayers]; // use cluster charge in cluster-track matching (SDD,SSD) (MI)
 
@@ -501,7 +517,9 @@ class AliITSRecoParam : public AliDetectorRecoParam
   Bool_t fMCTrackletsPlaneEff; // flag to enable the use of MC info for corrections (SPD PlaneEff using tracklets)
   Bool_t fBkgTrackletsPlaneEff; // flag to evaluate background instead of normal use (SPD PlaneEff using tracklets)
   Float_t fTrackleterPhiWindowL1; // Search window in phi for inner layer (1) (SPD PlaneEff using tracklets)
+  Float_t fTrackleterPhiWindowL2; // Search window in phi for outer layer (2) (SPD PlaneEff using tracklets)
   Float_t fTrackleterZetaWindowL1; // Search window in zeta for inner layer (1) (SPD PlaneEff using tracklets)
+  Float_t fTrackleterZetaWindowL2; // Search window in zeta for outer layer (2) (SPD PlaneEff using tracklets)
   Bool_t fUpdateOncePerEventPlaneEff; // option to update chip efficiency once/event (to avoid doubles)
   Int_t  fMinContVtxPlaneEff; // min number of contributors to ESD vtx for SPD PlaneEff using tracklets
   Int_t  fIPlanePlaneEff; // index of the plane (in the range [-1,5]) to study the efficiency (-1 ->Tracklets)
@@ -540,6 +558,8 @@ class AliITSRecoParam : public AliDetectorRecoParam
   Bool_t fUseUnfoldingInClusterFinderSDD; // SDD
   Bool_t fUseUnfoldingInClusterFinderSSD; // SSD
 
+  Bool_t fUseBadChannelsInClusterFinderSSD; // flag to switch on bad channels in CF SSD
+
   Bool_t  fUseSDDCorrectionMaps; // flag for use of SDD maps in C.F.
   Bool_t  fUseSDDClusterSizeSelection; // cut on SDD cluster size
   Float_t fMinClusterChargeSDD; // cut on SDD cluster charge
@@ -547,9 +567,9 @@ class AliITSRecoParam : public AliDetectorRecoParam
   Bool_t fUseChargeMatchingInClusterFinderSSD; // SSD
 
   // SPD Tracklets (D. Elia)
-  Bool_t  fTrackleterOnlyOneTrackletPerC2;         // Allow only one tracklet per cluster in the outer layer
   Float_t fTrackleterPhiWindow;                    // Search window in phi
-  Float_t fTrackleterZetaWindow;                   // Search window in eta
+  Float_t fTrackleterThetaWindow;                   // Search window in theta
+  Float_t fTrackleterPhiShift;                     // Phi shift reference value (at 0.5 T) 
   Bool_t  fTrackleterRemoveClustersFromOverlaps;   // Option to skip clusters in the overlaps
   Float_t fTrackleterPhiOverlapCut;                // Fiducial window in phi for overlap cut
   Float_t fTrackleterZetaOverlapCut;               // Fiducial window in eta for overlap cut
@@ -581,8 +601,13 @@ class AliITSRecoParam : public AliDetectorRecoParam
   Float_t fAlignFilterMaxPt;              // max pt
   Bool_t  fAlignFilterFillQANtuples;      // fill QA ntuples  
 
+ private:
+  AliESDV0Params * fESDV0Params;  // declare the AliESDV0Params to be able to used in AliITSV0Finder
+
+  AliITSRecoParam(const AliITSRecoParam & param);
+  AliITSRecoParam & operator=(const AliITSRecoParam &param);
 
-  ClassDef(AliITSRecoParam,22) // ITS reco parameters
+  ClassDef(AliITSRecoParam,27) // ITS reco parameters
 };
 
 #endif