X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSRecoParam.cxx;h=296e5e50abc261626eb6b705c1b6bcfbfaba05d2;hb=1dee2c584b7b5d27f3f1a01e7b0e039a0d35154b;hp=686c8a8da66f51e7c9789ba7f36c19ce718efbf7;hpb=04315dadb92056167b8b3e648394ac5aecaa03da;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ITS/AliITSRecoParam.cxx b/ITS/AliITSRecoParam.cxx
index 686c8a8da66..296e5e50abc 100644
--- a/ITS/AliITSRecoParam.cxx
+++ b/ITS/AliITSRecoParam.cxx
@@ -14,6 +14,7 @@
  **************************************************************************/
 
 #include "AliITSRecoParam.h"
+#include "AliESDV0Params.h"
 #include "AliLog.h"
 
 /* $Id$ */
@@ -30,8 +31,6 @@
 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;
@@ -58,8 +57,8 @@ 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
+const Double_t AliITSRecoParam::fgkSPDdetzlength=6.960;
+const Double_t AliITSRecoParam::fgkSPDdetxlength=1.298;
 
 //_____________________________________________________________________________
 AliITSRecoParam::AliITSRecoParam() : AliDetectorRecoParam(),
@@ -76,6 +75,7 @@ fVtxr3DPhiCutLoose(0.),
 fVtxr3DPhiCutTight(0.),
 fVtxr3DDCACut(0.),
 fVtxr3DPileupAlgo(1),
+fVtxr3DHighMultAlgo(1),
 fMaxSnp(1.),
 fNSigmaYLayerForRoadY(0),
 fNSigmaRoadY(0),
@@ -134,8 +134,19 @@ fMaxMissingClustersOutPlaneEff(5),
 fRequireClusterInOuterLayerPlaneEff(kFALSE),
 fRequireClusterInInnerLayerPlaneEff(kFALSE),
 fOnlyConstraintPlaneEff(kFALSE),
-fNSigXFromBoundaryPlaneEff(1.),
-fNSigZFromBoundaryPlaneEff(1.),
+fNSigXFromBoundaryPlaneEff(0.),
+fNSigZFromBoundaryPlaneEff(0.),
+fDistXFromBoundaryPlaneEff(0.),
+fDistZFromBoundaryPlaneEff(0.),
+fSwitchOnMaxDistNSigFrmBndPlaneEff(kFALSE),
+fSwitchOffStdSearchClusPlaneEff(kFALSE),
+fNSigXSearchClusterPlaneEff(0.),
+fNSigZSearchClusterPlaneEff(0.),
+fDistXSearchClusterPlaneEff(0.),
+fDistZSearchClusterPlaneEff(0.),
+fSwitchOnMaxDistNSigSrhClusPlaneEff(kFALSE),
+fDCACutPlaneEff(999.),
+fVertexChi2CutPlaneEff(999999999.),
 fImproveWithVertex(kFALSE),
 fExtendedEtaAcceptance(kFALSE),
 fUseBadZonesFromOCDB(kTRUE),
@@ -147,7 +158,7 @@ fOuterStartLayerSA(2),
 fInnerStartLayerSA(3),
 fMinNPointsSA(3),
 fFactorSAWindowSizes(1.),
-fNLoopsSA(33),
+fNLoopsSA(32),
 fMinPhiSA(0.002),
 fMaxPhiSA(0.0145),
 fMinLambdaSA(0.003),
@@ -179,6 +190,9 @@ fTrackleterZetaOverlapCut(0.05),
 fTrackleterPhiRotationAngle(0.0),
 fTrackleterNStdDev(1.5),
 fScaleDTBySin2T(kFALSE),
+fTrackleterStoreSPD2SingleCl(kFALSE),
+fTrackleterBuildCl2TrkRefs(kTRUE),
+//
 fUseCosmicRunShiftsSSD(kFALSE),
 fSPDRemoveNoisyFlag(kTRUE),
 fSPDRemoveDeadFlag(kTRUE),
@@ -225,6 +239,7 @@ fCorrectLorentzAngleSSD(kTRUE),
 fTanLorentzAngleHolesSSD(0.016),  // tan(0.94 degrees)
 fTanLorentzAngleElectronsSSD(0.068), // tan(3.98 degrees)
 //
+fOptReco("All"),
 fESDV0Params(NULL)
 {
   //
@@ -442,6 +457,7 @@ AliITSRecoParam *AliITSRecoParam::GetHighFluxParam()
   //
   // trackleter
   param->fTrackleterPhiWindow = 0.06;
+  param->fTrackleterBuildCl2TrkRefs = kFALSE;
   param->fScaleDTBySin2T = kTRUE;
   //
   param->fSelectBestMIP03 = kFALSE;//kTRUE;
@@ -551,7 +567,6 @@ AliITSRecoParam *AliITSRecoParam::GetLowFluxParam()
   param->SetNLoopsSA(20);
   param->fMaxPhiSA = 0.07;
   param->fMaxLambdaSA = 0.04;
-
  
   param->GetESDV0Params()->SetMinRTgl0(0.5);
   param->GetESDV0Params()->SetMaxDist(1.5);
@@ -566,6 +581,9 @@ AliITSRecoParam *AliITSRecoParam::GetLowFluxParam()
   param->GetESDV0Params()->SetLikelihood1Cut(0.35);
   param->GetESDV0Params()->SetCombinedCut(0.4);
 
+  // trackleter
+  param->fTrackleterBuildCl2TrkRefs = kTRUE;
+
   // mult reco
   param->fMultCutPxDrSPDin = 0.1;
   param->fMultCutPxDrSPDout = 0.15;
@@ -625,7 +643,7 @@ AliITSRecoParam *AliITSRecoParam::GetCosmicTestParam()
   param->SetMinNPointsSA(2);
 
   // larger seach windows for SA (in case of large misalignments)
-  param->SetNLoopsSA(33);
+  param->SetNLoopsSA(32);
   param->SetFactorSAWindowSizes(20);
 
   // additional error due to misal (B off)
@@ -737,6 +755,9 @@ AliITSRecoParam *AliITSRecoParam::GetCosmicTestParam()
   param->fSigmaZDeadZoneHit2 = 0.001/12.;
   param->fXPassDeadZoneHits = 0.018;
 
+  // trackleter
+  param->fTrackleterBuildCl2TrkRefs = kFALSE;
+
   return param;
 }
 //_____________________________________________________________________________
@@ -901,3 +922,16 @@ void AliITSRecoParam::PrintParameters() const
 }
 
 
+//_____________________________________________________________________________
+Bool_t AliITSRecoParam::SetOptReco(TString r){
+  // Set option for local reconstruction. 
+  // The string must contain at least one of the following
+  // substrings: "All", "SPD", "SDD", "SSD"
+  Bool_t isFine = kFALSE;
+  if(r.Contains("All") || r.Contains("SPD") || r.Contains("SDD") 
+     || r.Contains("SSD")){
+      isFine = kTRUE;
+      fOptReco=r;
+  }
+  return isFine;
+}