Update for Ds

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

diff --git a/ITS/AliITSRecoParam.cxx b/ITS/AliITSRecoParam.cxx
index bec027360232795eb2646ead4d318b22db333b78..aad438bad73e088cf8fcbcc4222843ded0af59ee 100644 (file)
--- a/ITS/AliITSRecoParam.cxx
+++ b/ITS/AliITSRecoParam.cxx
@@ -14,6 +14,7 @@
  **************************************************************************/
 
 #include "AliITSRecoParam.h"
+#include "AliESDV0Params.h"
 #include "AliLog.h"
 
 /* $Id$ */
@@ -30,36 +31,10 @@
 ClassImp(AliITSRecoParam)
 
 const Int_t AliITSRecoParam::fgkLayersNotToSkip[AliITSgeomTGeo::kNLayers]={0,0,0,0,0,0};
-const Int_t AliITSRecoParam::fgkLastLayerToTrackTo=0;
-const Int_t AliITSRecoParam::fgkMaxDetectorPerLayer=1000;
-const Double_t AliITSRecoParam::fgkriw=80.0;
-const Double_t AliITSRecoParam::fgkdiw=0.0053;
-const Double_t AliITSRecoParam::fgkX0iw=30.0;
-const Double_t AliITSRecoParam::fgkrcd=61.0;
-const Double_t AliITSRecoParam::fgkdcd=0.0053;
-const Double_t AliITSRecoParam::fgkX0cd=30.0;
-const Double_t AliITSRecoParam::fgkyr=12.8;
-const Double_t AliITSRecoParam::fgkdr=0.03;
-const Double_t AliITSRecoParam::fgkzm=0.2;
-const Double_t AliITSRecoParam::fgkdm=0.40;
-const Double_t AliITSRecoParam::fgkrs=50.0;
-const Double_t AliITSRecoParam::fgkds=0.001;
-const Double_t AliITSRecoParam::fgkrInsideITSscreen=49.0;
-const Double_t AliITSRecoParam::fgkrInsideSPD1=3.5;
-const Double_t AliITSRecoParam::fgkrPipe=3.;
-const Double_t AliITSRecoParam::fgkrInsidePipe=2.7;
-const Double_t AliITSRecoParam::fgkrOutsidePipe=3.3;
-const Double_t AliITSRecoParam::fgkdPipe=0.0028;
 const Double_t AliITSRecoParam::fgkrInsideShield[2]={7.5,25.0};
 const Double_t AliITSRecoParam::fgkrOutsideShield[2]={10.5,30.0};
 const Double_t AliITSRecoParam::fgkdshield[2]={0.0097,0.0034};
 const Double_t AliITSRecoParam::fgkX0shield[2]={38.6,42.0};
-const Double_t AliITSRecoParam::fgkX0Air=21.82;
-const Double_t AliITSRecoParam::fgkX0Be=65.19;
-const Double_t AliITSRecoParam::fgkBoundaryWidth=0.2;
-const Double_t AliITSRecoParam::fgkDeltaXNeighbDets=0.5;
-const Double_t AliITSRecoParam::fgkSPDdetzlength=6.960; // 7.072-2*0.056
-const Double_t AliITSRecoParam::fgkSPDdetxlength=1.298; // 1.410-2*0.056
 
 //_____________________________________________________________________________
 AliITSRecoParam::AliITSRecoParam() : AliDetectorRecoParam(),
@@ -91,6 +66,7 @@ fMaxChi2(0),
 fMaxRoad(0),
 fMaxChi2In(0),
 fChi2PerCluster(0),
+fSearchForExtras(kTRUE),                            
 fXV(0), 
 fYV(0),
 fZV(0),
@@ -135,6 +111,7 @@ fRequireClusterInInnerLayerPlaneEff(kFALSE),
 fOnlyConstraintPlaneEff(kFALSE),
 fNSigXFromBoundaryPlaneEff(1.),
 fNSigZFromBoundaryPlaneEff(1.),
+fImproveWithVertex(kFALSE),
 fExtendedEtaAcceptance(kFALSE),
 fUseBadZonesFromOCDB(kTRUE),
 fUseSingleBadChannelsFromOCDB(kFALSE),
@@ -153,6 +130,11 @@ fMaxLambdaSA(0.008),
 fMinClusterChargeSA(0.),
 fSAOnePointTracks(kFALSE),
 fSAUseAllClusters(kFALSE),
+fMaxSPDcontrForSAToUseAllClusters(1000000),
+fSAUsedEdxInfo(kFALSE),
+fSelectBestMIP03(kFALSE),
+fFlagFakes(kFALSE),
+fUseImproveKalman(kFALSE),
 fFindV0s(kTRUE),
 fStoreLikeSignV0s(kFALSE),
 fUseUnfoldingInClusterFinderSPD(kFALSE),
@@ -169,6 +151,9 @@ fTrackleterPhiShift(0.0045),
 fTrackleterRemoveClustersFromOverlaps(kFALSE),
 fTrackleterPhiOverlapCut(0.005),
 fTrackleterZetaOverlapCut(0.05),
+fTrackleterPhiRotationAngle(0.0),
+fTrackleterNStdDev(1.5),
+fScaleDTBySin2T(kFALSE),
 fUseCosmicRunShiftsSSD(kFALSE),
 fSPDRemoveNoisyFlag(kTRUE),
 fSPDRemoveDeadFlag(kTRUE),
@@ -187,6 +172,34 @@ fAlignFilterMinAngleWrtModulePlanes(0.52),
 fAlignFilterMinPt(0.),
 fAlignFilterMaxPt(1.e10),
 fAlignFilterFillQANtuples(kTRUE),
+//
+fMultCutPxDrSPDin(0.1),
+fMultCutPxDrSPDout(0.15),
+fMultCutPxDz(0.2),
+fMultCutDCArz(0.5),
+fMultCutMinElectronProbTPC(0.5),
+fMultCutMinElectronProbESD(0.1),
+fMultCutMinP(0.05),
+fMultCutMinRGamma(2.),
+fMultCutMinRK0(1.),
+fMultCutMinPointAngle(0.98),
+fMultCutMaxDCADauther(0.5),
+fMultCutMassGamma(0.03),
+fMultCutMassGammaNSigma(5.),
+fMultCutMassK0(0.03),
+fMultCutMassK0NSigma(5.),
+fMultCutChi2cGamma(2.),
+fMultCutChi2cK0(2.),
+fMultCutGammaSFromDecay(-10.),
+fMultCutK0SFromDecay(-10.),
+fMultCutMaxDCA(1.),
+//
+fCorrectLorentzAngleSPD(kTRUE),
+fTanLorentzAngleHolesSPD(0.017455), // tan(1 degree)
+fCorrectLorentzAngleSSD(kTRUE),
+fTanLorentzAngleHolesSSD(0.016),  // tan(0.94 degrees)
+fTanLorentzAngleElectronsSSD(0.068), // tan(3.98 degrees)
+//
 fESDV0Params(NULL)
 {
   //
@@ -284,11 +297,13 @@ AliITSRecoParam *AliITSRecoParam::GetHighFluxParam()
   // make default reconstruction  parameters for hig  flux env.
   //
   AliITSRecoParam *param = new AliITSRecoParam();
-  param->SetVertexerZ();
-
+  param->SetVertexer3DDefaults();
+  param->SetSPDVertexerPileupAlgoOff();
   // use of bads from OCDB
   param->SetUseBadZonesFromOCDB(kTRUE);
   param->SetUseSingleBadChannelsFromOCDB(kFALSE);
+  // use pointing to vertex during prolongation
+  param->SetImproveWithVertex(kTRUE);
   // extended eta acceptance
   param->SetExtendedEtaAcceptance(kFALSE);
   // allow to skip layer if no cluster and no bad
@@ -351,8 +366,10 @@ AliITSRecoParam *AliITSRecoParam::GetHighFluxParam()
   param->fMaxChi2sR[4] = 30.;   
   param->fMaxChi2sR[5] = 40.;   
 
+
   param->fChi2PerCluster = 9.;
   // not used
+  param->fSearchForExtras = kFALSE;
 
   param->fXV = 0.;
   param->fYV = 0.;
@@ -375,9 +392,37 @@ AliITSRecoParam *AliITSRecoParam::GetHighFluxParam()
   param->fSigmaXDeadZoneHit2 = 0.004/12.;
   param->fSigmaZDeadZoneHit2 = 0.001/12.;
   param->fXPassDeadZoneHits = 0.018;
-
-
-  
+  //
+  // mult reco
+  param->fMultCutPxDrSPDin = 0.1;
+  param->fMultCutPxDrSPDout = 0.15;
+  param->fMultCutPxDz = 0.2;
+  param->fMultCutDCArz = 0.5;
+  param->fMultCutMinElectronProbTPC = 0.5;
+  param->fMultCutMinElectronProbESD = 0.1;
+  param->fMultCutMinP = 0.05;
+  param->fMultCutMinRGamma = 2.;
+  param->fMultCutMinRK0 = 1.;
+  param->fMultCutMinPointAngle = 0.98;
+  param->fMultCutMaxDCADauther = 0.5;
+  param->fMultCutMassGamma = 0.03;
+  param->fMultCutMassGammaNSigma = 5.;
+  param->fMultCutMassK0 = 0.03;
+  param->fMultCutMassK0NSigma = 5.;
+  param->fMultCutChi2cGamma = 2.;
+  param->fMultCutChi2cK0 = 2.;
+  param->fMultCutGammaSFromDecay = -10.;
+  param->fMultCutK0SFromDecay = -10.;
+  param->fMultCutMaxDCA = 1.;  
+  //
+  // trackleter
+  param->fTrackleterPhiWindow = 0.06;
+  param->fScaleDTBySin2T = kTRUE;
+  //
+  param->fSelectBestMIP03 = kFALSE;//kTRUE;
+  param->fFlagFakes       = kTRUE;
+  param->fUseImproveKalman= kFALSE;
+  //
   return param;
 }
 //_____________________________________________________________________________
@@ -496,7 +541,28 @@ AliITSRecoParam *AliITSRecoParam::GetLowFluxParam()
   param->GetESDV0Params()->SetLikelihood1Cut(0.35);
   param->GetESDV0Params()->SetCombinedCut(0.4);
 
-
+  // mult reco
+  param->fMultCutPxDrSPDin = 0.1;
+  param->fMultCutPxDrSPDout = 0.15;
+  param->fMultCutPxDz = 0.2;
+  param->fMultCutDCArz = 0.5;
+  param->fMultCutMinElectronProbTPC = 0.5;
+  param->fMultCutMinElectronProbESD = 0.1;
+  param->fMultCutMinP = 0.05;
+  param->fMultCutMinRGamma = 2.;
+  param->fMultCutMinRK0 = 1.;
+  param->fMultCutMinPointAngle = 0.98;
+  param->fMultCutMaxDCADauther = 0.5;
+  param->fMultCutMassGamma = 0.03;
+  param->fMultCutMassGammaNSigma = 5.;
+  param->fMultCutMassK0 = 0.03;
+  param->fMultCutMassK0NSigma = 5.;
+  param->fMultCutChi2cGamma = 2.;
+  param->fMultCutChi2cK0 = 2.;
+  param->fMultCutGammaSFromDecay = -10.;
+  param->fMultCutK0SFromDecay = -10.;
+  param->fMultCutMaxDCA = 1.;  
+  //
 
   return param;
 }
@@ -808,3 +874,5 @@ void AliITSRecoParam::PrintParameters() const
 
   return;
 }
+
+