- Introduce fixed step size for material retrieval from TGeo, default is 1mm,

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

diff --git a/ITS/AliITSRecoParam.cxx b/ITS/AliITSRecoParam.cxx
index e50cd378147b7535b5784671e28c2e9af48c0bdb..d9db7884c8a92494434eb6ce65f445347d808e98 100644 (file)
--- a/ITS/AliITSRecoParam.cxx
+++ b/ITS/AliITSRecoParam.cxx
@@ -67,6 +67,13 @@ fITSonly(kFALSE),
 fVertexer(0),
 fClusterFinder(0),
 fPID(0),
+fVtxr3DZCutWide(0.),
+fVtxr3DRCutWide(0.),
+fVtxr3DZCutNarrow(0.),
+fVtxr3DRCutNarrow(0.),
+fVtxr3DPhiCutLoose(0.),
+fVtxr3DPhiCutTight(0.),
+fVtxr3DDCACut(0.),
 fMaxSnp(1.),
 fNSigmaYLayerForRoadY(0),
 fNSigmaRoadY(0),
@@ -101,6 +108,7 @@ fSigmaXDeadZoneHit2(0),
 fSigmaZDeadZoneHit2(0),
 fXPassDeadZoneHits(0),
 fUseTGeoInTracker(3),
+fStepSizeTGeo(0.1),
 fAllowSharedClusters(kTRUE),
 fClusterErrorsParam(1),
 fComputePlaneEff(kFALSE),
@@ -113,10 +121,11 @@ fRequireClusterInOuterLayerPlaneEff(kFALSE),
 fRequireClusterInInnerLayerPlaneEff(kFALSE),
 fOnlyConstraintPlaneEff(kFALSE),
 fExtendedEtaAcceptance(kFALSE),
-fUseBadZonesFromOCDB(kFALSE),
+fUseBadZonesFromOCDB(kTRUE),
 fUseSingleBadChannelsFromOCDB(kFALSE),
 fMinFractionOfBadInRoad(0),
 fAllowProlongationWithEmptyRoad(kFALSE),
+fOuterStartLayerSA(0),
 fFactorSAWindowSizes(1.),
 fNLoopsSA(33),
 fMinPhiSA(0.002),
@@ -129,7 +138,14 @@ fFindV0s(kTRUE),
 fUseUnfoldingInClusterFinderSPD(kFALSE),
 fUseUnfoldingInClusterFinderSDD(kTRUE),
 fUseUnfoldingInClusterFinderSSD(kTRUE),
-fUseChargeMatchingInClusterFinderSSD(kTRUE)
+fUseChargeMatchingInClusterFinderSSD(kTRUE),
+fTrackleterOnlyOneTrackletPerC2(kTRUE),
+fTrackleterPhiWindow(0.08),
+fTrackleterZetaWindow(1.00),
+fTrackleterRemoveClustersFromOverlaps(kFALSE),
+fTrackleterPhiOverlapCut(0.005),
+fTrackleterZetaOverlapCut(0.05),
+fUseCosmicRunShiftsSSD(kFALSE)
 {
   //
   // constructor
@@ -140,12 +156,14 @@ fUseChargeMatchingInClusterFinderSSD(kTRUE)
   SetLayersParameters();
   for(Int_t i=0; i<AliITSgeomTGeo::kNLayers; i++) fLayersToSkip[i]=0;
   SetUseTGeoInTracker(3);
+  SetStepSizeTGeo(0.1);
   SetAllowSharedClusters(kTRUE);
   SetFindV0s(kTRUE);
   SetAddVirtualClustersInDeadZone(kFALSE);
   SetUseAmplitudeInfo(kTRUE);
   SetClusterErrorsParam(1);
   SetClusterMisalError(0.);
+  SetVertexer3DDefaults();
 }
 //_____________________________________________________________________________
 AliITSRecoParam::~AliITSRecoParam() 
@@ -161,6 +179,16 @@ AliITSRecoParam *AliITSRecoParam::GetHighFluxParam()
   // make default reconstruction  parameters for hig  flux env.
   //
   AliITSRecoParam *param = new AliITSRecoParam();
+  param->SetVertexerZ();
+
+  // use of bads from OCDB
+  param->SetUseBadZonesFromOCDB(kTRUE);
+  param->SetUseSingleBadChannelsFromOCDB(kFALSE);
+  // extended eta acceptance
+  param->SetExtendedEtaAcceptance(kFALSE);
+  // allow to skip layer if no cluster and no bad
+  param->SetAllowProlongationWithEmptyRoad(kFALSE);
+
 
   param->fMaxSnp = 0.95;
 
@@ -251,6 +279,16 @@ AliITSRecoParam *AliITSRecoParam::GetLowFluxParam()
   // make default reconstruction  parameters for low  flux env.
   //
   AliITSRecoParam *param = new AliITSRecoParam();
+  param->SetVertexer3DDefaults();
+
+  // full use of bads from OCDB
+  param->SetUseBadZonesFromOCDB(kTRUE);
+  param->SetUseSingleBadChannelsFromOCDB(kTRUE);
+  // extended eta acceptance
+  param->SetExtendedEtaAcceptance(kTRUE);
+  // allow to skip layer if no cluster and no bad
+  param->SetAllowProlongationWithEmptyRoad(kTRUE);
+
 
   param->fMaxSnp = 0.95;
 
@@ -332,7 +370,7 @@ AliITSRecoParam *AliITSRecoParam::GetLowFluxParam()
   param->fSigmaZDeadZoneHit2 = 0.001/12.;
   param->fXPassDeadZoneHits = 0.018;
   param->SetNLoopsSA(10);
-  
+
   return param;
 }
 //_____________________________________________________________________________
@@ -346,6 +384,9 @@ AliITSRecoParam *AliITSRecoParam::GetCosmicTestParam()
   // vertexer for cosmics
   param->SetVertexer(2);
 
+  // find independently ITS SA tracks 
+  param->SetSAUseAllClusters();
+  param->SetOuterStartLayerSA(AliITSgeomTGeo::GetNLayers()-2);
 
   // larger seach windows for SA (in case of large misalignments)
   param->SetFactorSAWindowSizes(3.);