X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSRecoParam.cxx;h=0b714f60e043cc4d86071a6b0f8b785c3abdd13d;hb=d5b19a9b8620bb1b0aaf7bcb4944cb6a044223a0;hp=79094755e3305665184a7eacdfb4d70c4097cc4b;hpb=d695268b1cea203ef7451a85498294a8317095e1;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ITS/AliITSRecoParam.cxx b/ITS/AliITSRecoParam.cxx
index 79094755e33..0b714f60e04 100644
--- a/ITS/AliITSRecoParam.cxx
+++ b/ITS/AliITSRecoParam.cxx
@@ -45,7 +45,7 @@ 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.7;
+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;
@@ -75,6 +75,7 @@ fVtxr3DRCutNarrow(0.),
 fVtxr3DPhiCutLoose(0.),
 fVtxr3DPhiCutTight(0.),
 fVtxr3DDCACut(0.),
+fVtxr3DPileupAlgo(1),
 fMaxSnp(1.),
 fNSigmaYLayerForRoadY(0),
 fNSigmaRoadY(0),
@@ -118,7 +119,9 @@ fUseTrackletsPlaneEff(kFALSE),
 fMCTrackletsPlaneEff(kFALSE),
 fBkgTrackletsPlaneEff(kFALSE),
 fTrackleterPhiWindowL1(0.10),
+fTrackleterPhiWindowL2(0.07),
 fTrackleterZetaWindowL1(0.6),
+fTrackleterZetaWindowL2(0.4),
 fUpdateOncePerEventPlaneEff(kTRUE),
 fMinContVtxPlaneEff(3),
 fIPlanePlaneEff(0),
@@ -151,13 +154,14 @@ fStoreLikeSignV0s(kFALSE),
 fUseUnfoldingInClusterFinderSPD(kFALSE),
 fUseUnfoldingInClusterFinderSDD(kTRUE),
 fUseUnfoldingInClusterFinderSSD(kFALSE),
+fUseBadChannelsInClusterFinderSSD(kFALSE),
 fUseSDDCorrectionMaps(kTRUE),
 fUseSDDClusterSizeSelection(kFALSE),
 fMinClusterChargeSDD(0.),
 fUseChargeMatchingInClusterFinderSSD(kTRUE),
-fTrackleterOnlyOneTrackletPerC2(kTRUE),
 fTrackleterPhiWindow(0.08),
-fTrackleterZetaWindow(1.00),
+fTrackleterThetaWindow(0.025),
+fTrackleterPhiShift(0.0045),
 fTrackleterRemoveClustersFromOverlaps(kFALSE),
 fTrackleterPhiOverlapCut(0.005),
 fTrackleterZetaOverlapCut(0.05),
@@ -178,7 +182,8 @@ fAlignFilterMaxMatchingAngle(0.085),
 fAlignFilterMinAngleWrtModulePlanes(0.52),
 fAlignFilterMinPt(0.),
 fAlignFilterMaxPt(1.e10),
-fAlignFilterFillQANtuples(kTRUE)
+fAlignFilterFillQANtuples(kTRUE),
+fESDV0Params(NULL)
 {
   //
   // constructor
@@ -196,9 +201,45 @@ fAlignFilterFillQANtuples(kTRUE)
   SetUseAmplitudeInfo(kTRUE);
   SetClusterErrorsParam(1);
   SetClusterMisalError(0.);
+  SetClusterMisalErrorBOn(0.);
   SetVertexer3DDefaults();
 
   for(Int_t i=0; i<AliITSgeomTGeo::kNLayers; i++) fAlignFilterUseLayer[i]=kTRUE;
+  fESDV0Params = new AliESDV0Params();
+  
+  fESDV0Params->SetMaxDist0(0.1);
+  fESDV0Params->SetMaxDist1(0.1);
+  fESDV0Params->SetMaxDist(1.);
+  fESDV0Params->SetMinPointAngle(0.85);
+  fESDV0Params->SetMinPointAngle2(0.99);
+  fESDV0Params->SetMinR(0.5);
+  fESDV0Params->SetMaxR(220.);
+  fESDV0Params->SetCausality0Cut(0.19);
+  fESDV0Params->SetLikelihood01Cut(0.45);
+  fESDV0Params->SetLikelihood1Cut(0.5);  
+  fESDV0Params->SetCombinedCut(0.55);
+  fESDV0Params->SetMinClFullTrk(5.0);
+  fESDV0Params->SetMinTgl0(1.05);
+  fESDV0Params->SetMinTPCdensity(0.6);
+  fESDV0Params->SetMinTgl1(1.1);
+  fESDV0Params->SetMinTgl2(1.0);
+  fESDV0Params->SetMinchi2before0(16.);
+  fESDV0Params->SetMinchi2before1(16.);
+  fESDV0Params->SetMinchi2after0(16.);
+  fESDV0Params->SetMinchi2after1(16.);
+  fESDV0Params->SetAddchi2SharedCl(18.);
+  fESDV0Params->SetAddchi2NegCl0(25.);
+  fESDV0Params->SetAddchi2NegCl1(30.);
+  fESDV0Params->SetSigp0Par0(0.0001);
+  fESDV0Params->SetSigp0Par1(0.001);
+  fESDV0Params->SetSigp0Par2(0.1);
+  fESDV0Params->SetSigpPar0(0.5);
+  fESDV0Params->SetSigpPar1(0.6);
+  fESDV0Params->SetSigpPar2(0.4);
+  fESDV0Params->SetStreamLevel(0);
+  fESDV0Params->SetChi2KF(100);
+  fESDV0Params->SetRobustChi2KF(100);
+  
 }
 //_____________________________________________________________________________
 AliITSRecoParam::~AliITSRecoParam() 
@@ -206,6 +247,10 @@ AliITSRecoParam::~AliITSRecoParam()
   //
   // destructor
   //  
+  if(fESDV0Params){
+    delete fESDV0Params;
+    fESDV0Params=NULL;
+  }
 }
 //_____________________________________________________________________________
 AliITSRecoParam *AliITSRecoParam::GetHighFluxParam() 
@@ -420,12 +465,41 @@ AliITSRecoParam *AliITSRecoParam::GetCosmicTestParam()
   // vertexer for cosmics
   param->SetVertexer(2);
 
+  param->SetClusterErrorsParam(2);
+  param->SetFindV0s(kFALSE);
+  param->SetAddVirtualClustersInDeadZone(kFALSE);
+  param->SetUseAmplitudeInfo(kFALSE);
+
+  // full use of bads from OCDB
+  param->SetUseBadZonesFromOCDB(kTRUE);
+  param->SetUseSingleBadChannelsFromOCDB(kTRUE);
+
   // find independently ITS SA tracks 
   param->SetSAUseAllClusters();
   param->SetOuterStartLayerSA(AliITSgeomTGeo::GetNLayers()-2);
 
+  //****** COSMICS 2009 (same as COSMICS 2008) *********************
+
+  // to maximize efficiency
+  param->SetAllowProlongationWithEmptyRoad();
+
   // larger seach windows for SA (in case of large misalignments)
-  param->SetFactorSAWindowSizes(3.); 
+  param->SetNLoopsSA(33);
+  param->SetFactorSAWindowSizes(20);
+
+  // additional error due to misal (B off)
+  param->SetClusterMisalErrorY(1.0,1.0,1.0,1.0,1.0,1.0); // [cm]
+  param->SetClusterMisalErrorZ(1.0,1.0,1.0,1.0,1.0,1.0); // [cm]
+  // additional error due to misal (B on)
+  param->SetClusterMisalErrorYBOn(0.0,0.0,0.1,0.1,0.1,0.1); // [cm]
+  param->SetClusterMisalErrorZBOn(0.1,0.1,0.1,0.1,0.1,0.1); // [cm]
+
+
+  // SDD configuration 
+  param->fUseSDDCorrectionMaps = kFALSE;
+  param->fUseSDDClusterSizeSelection=kTRUE;
+  param->fMinClusterChargeSDD=30.;
+  
 
   // alignment data filter
   param->SetAlignFilterCosmics(kTRUE);
@@ -440,6 +514,8 @@ AliITSRecoParam *AliITSRecoParam::GetCosmicTestParam()
   param->SetAlignFilterMaxPt(1.e10);          
   param->SetAlignFilterFillQANtuples(kTRUE);    
 
+  //******************************************************************
+
   param->fMaxSnp = 0.95;
 
   param->fNSigmaYLayerForRoadY = 4.;
@@ -520,8 +596,6 @@ AliITSRecoParam *AliITSRecoParam::GetCosmicTestParam()
   param->fSigmaZDeadZoneHit2 = 0.001/12.;
   param->fXPassDeadZoneHits = 0.018;
 
-  param->fUseSDDCorrectionMaps = kFALSE;
-  
   return param;
 }
 //_____________________________________________________________________________
@@ -574,8 +648,8 @@ AliITSRecoParam *AliITSRecoParam::GetPlaneEffParam(Int_t i)
     param->SetIPlanePlaneEff(i);
     param->SetComputePlaneEff(kTRUE,kFALSE);
     param->SetUseTrackletsPlaneEff(kTRUE);
-    param->SetTrackleterPhiWindow(0.07);
-    param->SetTrackleterZetaWindow(0.4);
+    param->SetTrackleterPhiWindowL2(0.07);
+    param->SetTrackleterZetaWindowL2(0.4);
     param->SetTrackleterPhiWindowL1(0.10);
     param->SetTrackleterZetaWindowL1(0.6);
     param->SetUpdateOncePerEventPlaneEff(kTRUE);
@@ -643,3 +717,4 @@ void AliITSRecoParam::PrintParameters() const
 
   return;
 }
+