X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSReconstructor.cxx;h=9e61af29d029dbc166af4c0985eb2bd5c17e0a45;hb=f9cdb612f270a574140df4a57f10497a65ea21c0;hp=aae6b120c3b5a29fd8b6a59f262355e4ea20b508;hpb=c8735dd35903b104c43309a7cf6ef801c2cc1276;p=u%2Fmrichter%2FAliRoot.git diff --git a/ITS/AliITSReconstructor.cxx b/ITS/AliITSReconstructor.cxx index aae6b120c3b..9e61af29d02 100644 --- a/ITS/AliITSReconstructor.cxx +++ b/ITS/AliITSReconstructor.cxx @@ -25,30 +25,27 @@ #include "AliITSReconstructor.h" #include "AliRun.h" #include "AliRawReader.h" -#include "AliITSDetTypeRec.h" +#include "AliESDEvent.h" +#include "AliESDpid.h" #include "AliITSgeom.h" #include "AliITSLoader.h" #include "AliITStrackerMI.h" #include "AliITStrackerV2.h" #include "AliITStrackerSA.h" -#include "AliITSVertexerIons.h" #include "AliITSVertexerFast.h" #include "AliITSVertexerFixed.h" #include "AliITSVertexer3D.h" #include "AliITSVertexerZ.h" +#include "AliITSVertexerZD.h" #include "AliITSVertexerCosmics.h" -#include "AliESDEvent.h" -#include "AliITSpidESD.h" -#include "AliITSpidESD1.h" -#include "AliITSpidESD2.h" #include "AliITSInitGeometry.h" - +#include "AliITSTrackleterSPDEff.h" +#include "AliITSMultReconstructor.h" ClassImp(AliITSReconstructor) //___________________________________________________________________________ AliITSReconstructor::AliITSReconstructor() : AliReconstructor(), -fItsPID(0), fDetTypeRec(0) { // Default constructor @@ -56,26 +53,24 @@ fDetTypeRec(0) //___________________________________________________________________________ AliITSReconstructor::~AliITSReconstructor(){ // destructor - delete fItsPID; if(fDetTypeRec) delete fDetTypeRec; } -//______________________________________________________________________ -AliITSReconstructor::AliITSReconstructor(const AliITSReconstructor &ob) :AliReconstructor(ob), -fItsPID(ob.fItsPID), -fDetTypeRec(ob.fDetTypeRec) - -{ - // Copy constructor -} +//____________________________________________________________________________ +void AliITSReconstructor::GetPidSettings(AliESDpid *ESDpid) { + // + // pass PID settings from AliITSRecoParam to AliESDpid + // + Int_t pidOpt = GetRecoParam()->GetPID(); -//______________________________________________________________________ -AliITSReconstructor& AliITSReconstructor::operator=(const AliITSReconstructor& ob ){ - // Assignment operator - this->~AliITSReconstructor(); - new(this) AliITSReconstructor(ob); - return *this; + if(pidOpt==1){ + AliDebug(1,"ITS LandauFitPID option has been selected\n"); + ESDpid->SetITSPIDmethod(AliESDpid::kITSLikelihood); + } + else{ + AliDebug(1,"ITS default PID\n"); + ESDpid->SetITSPIDmethod(AliESDpid::kITSTruncMean); + } } - //______________________________________________________________________ void AliITSReconstructor::Init() { // Initalize this constructor bet getting/creating the objects @@ -103,23 +98,52 @@ void AliITSReconstructor::Reconstruct(TTree *digitsTree, TTree *clustersTree) co { // reconstruct clusters - Int_t cluFindOpt = GetRecoParam()->GetClusterFinder(); - Bool_t useV2=kTRUE; // Default: V2 cluster finder - if(cluFindOpt==1) useV2=kFALSE; - + TString recopt = GetRecoParam()->GetOptReco(); fDetTypeRec->SetTreeAddressD(digitsTree); fDetTypeRec->MakeBranch(clustersTree,"R"); fDetTypeRec->SetTreeAddressR(clustersTree); - fDetTypeRec->DigitsToRecPoints(digitsTree,clustersTree,0,"All",useV2); + fDetTypeRec->DigitsToRecPoints(digitsTree,clustersTree,0,recopt.Data(),1); } //_________________________________________________________________ void AliITSReconstructor::Reconstruct(AliRawReader* rawReader, TTree *clustersTree) const { // reconstruct clusters from raw data - - fDetTypeRec->SetDefaultClusterFindersV2(kTRUE); - fDetTypeRec->DigitsToRecPoints(rawReader,clustersTree); + TString recopt = GetRecoParam()->GetOptReco(); + fDetTypeRec->SetDefaultClusterFindersV2(kTRUE,kTRUE); + fDetTypeRec->DigitsToRecPoints(rawReader,clustersTree,recopt.Data()); +} + +//_____________________________________________________________________________ +AliTrackleter* AliITSReconstructor::CreateMultFinder() const +{ + // create the SPD trackeleter for mult. reconstruction + AliITSMultReconstructor* multReco = new AliITSMultReconstructor(); + multReco->SetHistOn(kFALSE); + multReco->SetDetTypeRec(fDetTypeRec); + return multReco; +} + +//_____________________________________________________________________________ +AliTracker* AliITSReconstructor::CreateTrackleter() const +{ +// create the SPD trackeleter (for SPD PlaneEfficiency evaluation) + if(!GetRecoParam()->GetComputePlaneEff() || !GetRecoParam()->GetUseTrackletsPlaneEff()) return NULL; + //Int_t trackerOpt = GetRecoParam()->GetTracker(); + AliTracker* trackleter; + trackleter = new AliITSTrackleterSPDEff(); + AliITSTrackleterSPDEff *spdtrackleter=(AliITSTrackleterSPDEff*)trackleter; + // here set cuts (from RecoParam) + if(GetRecoParam()->GetBkgTrackletsPlaneEff()) spdtrackleter->SetReflectClusterAroundZAxisForLayer(1,kTRUE); + if(GetRecoParam()->GetMCTrackletsPlaneEff()) spdtrackleter->SetMC(); + spdtrackleter->SetHistOn(); + spdtrackleter->SetPhiWindowL2(GetRecoParam()->GetTrackleterPhiWindowL2()); + spdtrackleter->SetZetaWindowL2(GetRecoParam()->GetTrackleterZetaWindowL2()); + spdtrackleter->SetPhiWindowL1(GetRecoParam()->GetTrackleterPhiWindowL1()); + spdtrackleter->SetZetaWindowL1(GetRecoParam()->GetTrackleterZetaWindowL1()); + if(GetRecoParam()->GetUpdateOncePerEventPlaneEff()) spdtrackleter->SetUpdateOncePerEventPlaneEff(); + spdtrackleter->SetMinContVtx(GetRecoParam()->GetMinContVtxPlaneEff()); + return trackleter; } //_____________________________________________________________________________ @@ -143,22 +167,16 @@ AliTracker* AliITSReconstructor::CreateTracker() const sat->SetDetTypeRec(fDetTypeRec); if(GetRecoParam()->GetTrackerSAOnly()) sat->SetSAFlag(kTRUE); if(sat->GetSAFlag())AliDebug(1,"Tracking Performed in ITS only\n"); - sat->SetOuterStartLayer(GetRecoParam()->GetOuterStartLayerSA()); + if(GetRecoParam()->GetInwardFindingSA()){ + sat->SetInwardFinding(); + sat->SetInnerStartLayer(GetRecoParam()->GetInnerStartLayerSA()); + }else{ + sat->SetOutwardFinding(); + sat->SetOuterStartLayer(GetRecoParam()->GetOuterStartLayerSA()); + } + sat->SetMinNPoints(GetRecoParam()->GetMinNPointsSA()); } - Int_t pidOpt = GetRecoParam()->GetPID(); - - AliITSReconstructor* nc = const_cast(this); - if(pidOpt==1){ - Info("FillESD","ITS LandauFitPID option has been selected\n"); - nc->fItsPID = new AliITSpidESD2((AliITStrackerMI*)tracker); - } - else{ - Info("FillESD","ITS default PID\n"); - Double_t parITS[] = {79.,0.13, 5.}; //IB: this is "pp tuning" - nc->fItsPID = new AliITSpidESD1(parITS); - } - return tracker; } @@ -168,63 +186,77 @@ AliVertexer* AliITSReconstructor::CreateVertexer() const { // create a ITS vertexer + AliITSVertexer *vptr = NULL; Int_t vtxOpt = GetRecoParam()->GetVertexer(); if(vtxOpt==3){ - Info("CreateVertexer","a AliITSVertexerIons object has been selected\n"); - return new AliITSVertexerIons(); + AliFatal("Option AliITSVertexerIons is no longer supported"); + return vptr; } - if(vtxOpt==4){ - Double_t smear[3]={0.005,0.005,0.01}; - Info("CreateVertexer","a AliITSVertexerFast object has been selected\n"); - return new AliITSVertexerFast(smear); + else if(vtxOpt==4){ + Double_t smear[3]={GetRecoParam()->GetVertexerFastSmearX(), + GetRecoParam()->GetVertexerFastSmearY(), + GetRecoParam()->GetVertexerFastSmearZ()}; + AliDebug(1,"AliITSVertexerFast has been selected"); + vptr = new AliITSVertexerFast(smear); } - if(vtxOpt==1){ - Info("CreateVertexer","a AliITSVertexerZ object has been selected\n"); - return new AliITSVertexerZ(); + else if(vtxOpt==1){ + AliDebug(1,"AliITSVertexerZ has been selected"); + AliITSVertexerZ* vtxrz = new AliITSVertexerZ(); + Int_t pileupAlgo=GetRecoParam()->GetSPDVertexerPileupAlgo(); + if(pileupAlgo==3) vtxrz->SetSearchForPileup(kFALSE); + vptr = vtxrz; } - if(vtxOpt==2){ - Info("CreateVertexer","a AliITSVertexerCosmics object has been selected\n"); - return new AliITSVertexerCosmics(); + else if(vtxOpt==2){ + AliDebug(1,"AliITSVertexerCosmics has been selected"); + vptr = new AliITSVertexerCosmics(); } - if(vtxOpt==5){ - Info("CreateVertexer","vertex is fixed in the position of the TDI\n"); - return new AliITSVertexerFixed("TDI"); + else if(vtxOpt==5){ + AliDebug(1,"Vertex is fixed in the position of the TDI\n"); + vptr = new AliITSVertexerFixed("TDI"); } - if(vtxOpt==6){ - Info("CreateVertexer","vertex is fixed in the position of the TED\n"); - return new AliITSVertexerFixed("TED"); + else if(vtxOpt==6){ + AliDebug(1,"Vertex is fixed in the position of the TED\n"); + vptr = new AliITSVertexerFixed("TED"); } + else if(vtxOpt==7){ + AliDebug(1,"VertexerZD: reconstruction of the Z coordinate with SDD \n"); + AliITSVertexerZD*vtxrz = new AliITSVertexerZD(); + vtxrz->SetSearchForPileup(kFALSE); + vptr = vtxrz; + } + else { // by default an AliITSVertexer3D object is instatiated - Info("CreateVertexer","a AliITSVertexer3D object has been selected\n"); - AliITSVertexer3D* vtxr = new AliITSVertexer3D(); - Float_t dzw=GetRecoParam()->GetVertexer3DWideFiducialRegionZ(); - Float_t drw=GetRecoParam()->GetVertexer3DWideFiducialRegionR(); - vtxr->SetWideFiducialRegion(dzw,drw); - Float_t dzn=GetRecoParam()->GetVertexer3DNarrowFiducialRegionZ(); - Float_t drn=GetRecoParam()->GetVertexer3DNarrowFiducialRegionR(); - vtxr->SetNarrowFiducialRegion(dzn,drn); - Float_t dphil=GetRecoParam()->GetVertexer3DLooseDeltaPhiCut(); - Float_t dphit=GetRecoParam()->GetVertexer3DTightDeltaPhiCut(); - vtxr->SetDeltaPhiCuts(dphil,dphit); - Float_t dcacut=GetRecoParam()->GetVertexer3DDCACut(); - vtxr->SetDCACut(dcacut); - return vtxr; + AliITSVertexer3D* vtxr = + new AliITSVertexer3D(GetRecoParam()->GetVertexer3DWideFiducialRegionZ()); + Float_t dzw=GetRecoParam()->GetVertexer3DWideFiducialRegionZ(); + Float_t drw=GetRecoParam()->GetVertexer3DWideFiducialRegionR(); + vtxr->SetWideFiducialRegion(dzw,drw); + Float_t dzn=GetRecoParam()->GetVertexer3DNarrowFiducialRegionZ(); + Float_t drn=GetRecoParam()->GetVertexer3DNarrowFiducialRegionR(); + vtxr->SetNarrowFiducialRegion(dzn,drn); + Float_t dphil=GetRecoParam()->GetVertexer3DLooseDeltaPhiCut(); + Float_t dphit=GetRecoParam()->GetVertexer3DTightDeltaPhiCut(); + vtxr->SetDeltaPhiCuts(dphil,dphit); + Float_t dcacut=GetRecoParam()->GetVertexer3DDCACut(); + vtxr->SetDCACut(dcacut); + Int_t pileupAlgo=GetRecoParam()->GetSPDVertexerPileupAlgo(); + vtxr->SetPileupAlgo(pileupAlgo); + UChar_t highmultAlgo=GetRecoParam()->GetSPDVertexerHighMultAlgo(); + vtxr->SetHighMultAlgo(highmultAlgo); + AliDebug(1,Form("AliITSVertexer3D with pileup algo %d has been selected",pileupAlgo)); + vptr = vtxr; + } + vptr->SetDetTypeRec(fDetTypeRec); + return vptr; } //_____________________________________________________________________________ -void AliITSReconstructor::FillESD(TTree * /*digitsTree*/, TTree *clustersTree, - AliESDEvent* esd) const +void AliITSReconstructor::FillESD(TTree * /*digitsTree*/, TTree * /*clustersTree*/, + AliESDEvent* /* esd */) const { // make PID, find V0s and cascade - if(fItsPID!=0) { - Int_t pidOpt = GetRecoParam()->GetPID(); - if(pidOpt==1){ - fItsPID->MakePID(clustersTree,esd); - }else{ - fItsPID->MakePID(esd); - } - } - else { - Error("FillESD","!! cannot do the PID !!\n"); - } +/* Now done in AliESDpid + if(fItsPID!=0) fItsPID->MakePID(esd); + else AliError("!! cannot do the PID !!"); +*/ }