X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=HMPID%2FAliHMPIDReconstructor.cxx;h=d01ca390bd2fc1207948fa8cc5c1e555ed74f307;hb=66ee9f2fea51bc69509147f93422741d1f509ef3;hp=a7ac61c83a6e0cd0d932f0c9d0f6d43123576a91;hpb=14dc2e6c0fe2959d259b867d2e981466ee1e0297;p=u%2Fmrichter%2FAliRoot.git diff --git a/HMPID/AliHMPIDReconstructor.cxx b/HMPID/AliHMPIDReconstructor.cxx index a7ac61c83a6..d01ca390bd2 100644 --- a/HMPID/AliHMPIDReconstructor.cxx +++ b/HMPID/AliHMPIDReconstructor.cxx @@ -20,50 +20,47 @@ #include "AliHMPIDReconstructor.h" //class header #include "AliHMPID.h" //Reconstruct() #include "AliHMPIDCluster.h" //Dig2Clu() +#include "AliHMPIDPid.h" //FillEsd() #include "AliHMPIDParam.h" //FillEsd() #include //ctor #include //ctor -#include //FillEsd() +#include //FillEsd() #include //Reconstruct() for raw digits +#include // +#include "AliHMPIDRawStream.h" //ConvertDigits() +#include "AliHMPIDRecoParamV1.h" //ctor +#include ClassImp(AliHMPIDReconstructor) +Int_t AliHMPIDReconstructor::fgStreamLevel = 0; // stream (debug) level + //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -AliHMPIDReconstructor::AliHMPIDReconstructor():AliReconstructor(),fUserCut(0),fDaqSig(0),fDig(0),fClu(0) +AliHMPIDReconstructor::AliHMPIDReconstructor():AliReconstructor(),fDaqSig(0),fDig(0),fClu(0) { // //ctor // AliHMPIDParam::Instance(); //geometry loaded for reconstruction - fUserCut = new Int_t[7]; + fClu=new TObjArray(AliHMPIDParam::kMaxCh+1); fClu->SetOwner(kTRUE); fDig=new TObjArray(AliHMPIDParam::kMaxCh+1); fDig->SetOwner(kTRUE); for(int i=AliHMPIDParam::kMinCh;i<=AliHMPIDParam::kMaxCh;i++){ - fDig->AddAt(new TClonesArray("AliHMPIDDigit"),i); - TClonesArray *pClus = new TClonesArray("AliHMPIDCluster"); + fDig->AddAt(new TClonesArray("AliHMPIDDigit",24000),i); + TClonesArray *pClus = new TClonesArray("AliHMPIDCluster",24000); pClus->SetUniqueID(i); fClu->AddAt(pClus,i); } - - AliCDBEntry *pUserCutEnt =AliCDBManager::Instance()->Get("HMPID/Calib/UserCut"); //contains TObjArray of 14 TObject with n. of sigmas to cut charge - if(pUserCutEnt) { - TObjArray *pUserCut = (TObjArray*)pUserCutEnt->GetObject(); - for(Int_t iCh=AliHMPIDParam::kMinCh;iCh<=AliHMPIDParam::kMaxCh;iCh++){ //chambers loop - fUserCut[iCh] = pUserCut->At(iCh)->GetUniqueID(); - Printf("HMPID: UserCut successfully loaded for chamber %i -> %i ",iCh,fUserCut[iCh]); - } - } - - + AliCDBEntry *pDaqSigEnt =AliCDBManager::Instance()->Get("HMPID/Calib/DaqSig"); //contains TObjArray of TObjArray 14 TMatrixF sigmas values for pads if(!pDaqSigEnt) AliFatal("No pedestals from DAQ!"); fDaqSig = (TObjArray*)pDaqSigEnt->GetObject(); for(Int_t iCh=AliHMPIDParam::kMinCh;iCh<=AliHMPIDParam::kMaxCh;iCh++){ //chambers loop - Printf(" HMPID: DaqSigCut successfully loaded for chamber %i -> %i ",iCh,(Int_t)fDaqSig->At(iCh)->GetUniqueID()); + AliDebug(1,Form("DaqSigCut successfully loaded for chamber %i -> %i ",iCh,(Int_t)fDaqSig->At(iCh)->GetUniqueID())); } }//AliHMPIDReconstructor //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -void AliHMPIDReconstructor::Dig2Clu(TObjArray *pDigAll,TObjArray *pCluAll,Bool_t isTryUnfold) +void AliHMPIDReconstructor::Dig2Clu(TObjArray *pDigAll,TObjArray *pCluAll,Int_t *pUserCut,Bool_t isTryUnfold) { // Finds all clusters for a given digits list provided not empty. Currently digits list is a list of all digits for a single chamber. // Puts all found clusters in separate lists, one per clusters. @@ -71,6 +68,7 @@ void AliHMPIDReconstructor::Dig2Clu(TObjArray *pDigAll,TObjArray *pCluAll,Bool_t // pCluAll - list of clusters for all chambers // isTryUnfold - flag to choose between CoG and Mathieson fitting // Returns: none + TMatrixF padMap(AliHMPIDParam::kMinPx,AliHMPIDParam::kMaxPcx,AliHMPIDParam::kMinPy,AliHMPIDParam::kMaxPcy); //pads map for single chamber 0..159 x 0..143 for(Int_t iCh=AliHMPIDParam::kMinCh;iCh<=AliHMPIDParam::kMaxCh;iCh++){ //chambers loop @@ -90,8 +88,7 @@ void AliHMPIDReconstructor::Dig2Clu(TObjArray *pDigAll,TObjArray *pCluAll,Bool_t AliHMPIDDigit *pDig=(AliHMPIDDigit*)pDigCur->At(iDig); //take current digit if(!(pDig=UseDig(pDig->PadChX(),pDig->PadChY(),pDigCur,&padMap))) continue; //this digit is already taken in FormClu(), go after next digit FormClu(&clu,pDig,pDigCur,&padMap); //form cluster starting from this digit by recursion - - clu.Solve(pCluCur,isTryUnfold); //solve this cluster and add all unfolded clusters to provided list + clu.Solve(pCluCur,pUserCut,isTryUnfold); //solve this cluster and add all unfolded clusters to provided list clu.Reset(); //empty current cluster }//digits loop for current chamber }//chambers loop @@ -124,61 +121,41 @@ void AliHMPIDReconstructor::Reconstruct(TTree *pDigTree,TTree *pCluTree)const // Returns: none AliDebug(1,"Start."); for(Int_t iCh=AliHMPIDParam::kMinCh;iCh<=AliHMPIDParam::kMaxCh;iCh++) { - pCluTree->Branch(Form("HMPID%d",iCh),&((*fClu)[iCh]),4000,0); + pCluTree->Branch(Form("HMPID%d",iCh),&((*fClu)[iCh]),7); pDigTree->SetBranchAddress(Form("HMPID%d",iCh),&((*fDig)[iCh])); } + + Int_t pUserCut[7]; + + if(AliHMPIDReconstructor::GetRecoParam()) { + for(Int_t iCh=AliHMPIDParam::kMinCh;iCh<=AliHMPIDParam::kMaxCh;iCh++) { + pUserCut[iCh] = AliHMPIDReconstructor::GetRecoParam()->GetHmpUserCut(iCh); + AliDebug(1,Form("UserCut successfully loaded (from AliHMPIDRecoParamV1) for chamber %i -> %i ",iCh,pUserCut[iCh])); + } + } + else { + for(Int_t iCh=AliHMPIDParam::kMinCh;iCh<=AliHMPIDParam::kMaxCh;iCh++) { + pUserCut[iCh] = 4; // minimal requirement for sigma cut + AliDebug(1,Form("UserCut loaded from defaults for chamber %i -> %i ",iCh,pUserCut[iCh])); + AliDebug(1,Form("Cannot get AliHMPIDRecoParamV1!")); + } + } + TVirtualFitter* fitter = TVirtualFitter::GetFitter(); + delete fitter; + fitter = TVirtualFitter::Fitter(0,3*6); // create a new fitter to avoid interferrence with others pDigTree->GetEntry(0); - Dig2Clu(fDig,fClu); //cluster finder + Dig2Clu(fDig,fClu,pUserCut); //cluster finder pCluTree->Fill(); //fill tree for current event - + delete fitter; for(Int_t iCh=AliHMPIDParam::kMinCh;iCh<=AliHMPIDParam::kMaxCh;iCh++){ fDig->At(iCh)->Clear(); fClu->At(iCh)->Clear(); } + AliDebug(1,"Stop."); }//Reconstruct(for simulated digits) //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -void AliHMPIDReconstructor::Reconstruct(AliRunLoader *pAL,AliRawReader* pRR)const -{ -//Invoked by AliReconstruction to convert raw digits from DDL files to clusters -//Arguments: pAL - ALICE run loader pointer -// pRR - ALICE raw reader pointer -// Returns: none - AliLoader *pRL=pAL->GetDetectorLoader("HMPID"); AliHMPID *pRich=(AliHMPID*)pAL->GetAliRun()->GetDetector("HMPID");//get pointers for HMPID and HMPID loader - - AliHMPIDDigit dig; //tmp digit, raw digit will be converted to it - - TObjArray digLst; Int_t iDigCnt[7]; for(Int_t i=0;i<7;i++){digLst.AddAt(new TClonesArray("AliHMPIDDigit"),i); iDigCnt[i]=0;} //tmp list of digits for allchambers - - Int_t iEvtN=0; - while(pRR->NextEvent()){//events loop - pAL->GetEvent(iEvtN++); - pRL->MakeTree("R"); pRich->MakeBranch("R"); - - for(Int_t iCh=0;iCh<7;iCh++){//chambers loop - pRR->Select("HMPID",2*iCh,2*iCh+1);//select only DDL files for the current chamber - UInt_t w32=0; - while(pRR->ReadNextInt(w32)){//raw records loop (in selected DDL files) - UInt_t ddl=pRR->GetDDLID(); //returns 0,1,2 ... 13 - dig.Raw(w32,ddl,pRR); - AliDebug(1,Form("Ch=%i DDL=%i raw=0x%x digit=(%3i,%3i,%3i,%3i) Q=%5.2f",iCh,ddl,w32,dig.Ch(),dig.Pc(),dig.PadPcX(),dig.PadPcY(),dig.Q())); - if(!IsDigSurvive(&dig)) continue; //sigma cut test - new((*((TClonesArray*)digLst.At(iCh)))[iDigCnt[iCh]++]) AliHMPIDDigit(dig); //add this digit to the tmp list - }//raw records loop - pRR->Reset(); - }//chambers loop - - Dig2Clu(&digLst,pRich->CluLst());//cluster finder for all chambers - for(Int_t i=0;i<7;i++){digLst.At(i)->Delete(); iDigCnt[i]=0;} //clean up list of digits for all chambers - - pRL->TreeR()->Fill(); //fill tree for current event - pRL->WriteRecPoints("OVERWRITE");//write out clusters for current event - pRich->CluReset(); - }//events loop - pRL->UnloadRecPoints(); -}//Reconstruct raw data -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ void AliHMPIDReconstructor::ConvertDigits(AliRawReader *pRR,TTree *pDigTree)const { //Invoked by AliReconstruction to convert raw digits from DDL files to digits @@ -186,62 +163,47 @@ void AliHMPIDReconstructor::ConvertDigits(AliRawReader *pRR,TTree *pDigTree)cons // pDigTree - pointer to Digit tree // Returns: none AliDebug(1,"Start."); - AliHMPIDDigit dig; //tmp digit, raw digit will be converted to it - for(Int_t iCh=AliHMPIDParam::kMinCh;iCh<=AliHMPIDParam::kMaxCh;iCh++) { - pDigTree->Branch(Form("HMPID%d",iCh),&((*fDig)[iCh]),4000,0); - pRR->Select("HMPID",2*iCh,2*iCh+1);//select only DDL files for the current chamber - Int_t iDigCnt=0; - UInt_t w32=0; - while(pRR->ReadNextInt(w32)){//raw records loop (in selected DDL files) - UInt_t ddl=pRR->GetDDLID(); //returns 0,1,2 ... 13 - if(!dig.Raw(w32,ddl,pRR)) continue; - AliDebug(1,Form("Ch=%i DDL=%i raw=0x%x digit=(%3i,%3i,%3i,%3i) Q=%5.2f",iCh,ddl,w32,dig.Ch(),dig.Pc(),dig.PadPcX(),dig.PadPcY(),dig.Q())); - if(!IsDigSurvive(&dig)) continue; //sigma cut test - new((*((TClonesArray*)fDig->At(iCh)))[iDigCnt++]) AliHMPIDDigit(dig); //add this digit to the tmp list - }//raw records loop - pRR->Reset(); - }//chambers loop +// Int_t digcnt=0; + + Int_t iDigCnt[7]={0,0,0,0,0,0,0}; + + for(Int_t iCh=AliHMPIDParam::kMinCh;iCh<=AliHMPIDParam::kMaxCh;iCh++){ + pDigTree->Branch(Form("HMPID%d",iCh),&((*fDig)[iCh])); + } + + Int_t pUserCut[7]; + + if(AliHMPIDReconstructor::GetRecoParam()) { + for(Int_t iCh=AliHMPIDParam::kMinCh;iCh<=AliHMPIDParam::kMaxCh;iCh++) { + pUserCut[iCh] = AliHMPIDReconstructor::GetRecoParam()->GetHmpUserCut(iCh); + AliDebug(1,Form("UserCut successfully loaded (from AliHMPIDRecoParamV1) for chamber %i -> %i ",iCh,pUserCut[iCh])); + } + } + else { + for(Int_t iCh=AliHMPIDParam::kMinCh;iCh<=AliHMPIDParam::kMaxCh;iCh++) { + pUserCut[iCh] = 4; // minimal requirement for sigma cut + AliDebug(1,Form("UserCut loaded from defaults for chamber %i -> %i ",iCh,pUserCut[iCh])); + AliDebug(1,Form("Cannot get AliHMPIDRecoParamV1!")); + } + } + + AliHMPIDRawStream stream(pRR); + + while(stream.Next()) + { + Int_t ch = AliHMPIDParam::DDL2C(stream.GetDDLNumber()); + for(Int_t iPad=0;iPadAt(ch)))[iDigCnt[ch]++]) AliHMPIDDigit(dig); //add this digit to the tmp list + } + } + pDigTree->Fill(); + for(Int_t iCh=AliHMPIDParam::kMinCh;iCh<=AliHMPIDParam::kMaxCh;iCh++)fDig->At(iCh)->Clear(); + + AliDebug(1,"Stop."); }//Reconstruct digits from raw digits //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -void AliHMPIDReconstructor::FillESD(AliRunLoader *, AliESD *pESD) const -{ -// Calculates probability to be a electron-muon-pion-kaon-proton -// from the given Cerenkov angle and momentum assuming no initial particle composition -// (i.e. apriory probability to be the particle of the given sort is the same for all sorts) - - AliPID ppp; //needed - Double_t pid[AliPID::kSPECIES],h[AliPID::kSPECIES]; - - for(Int_t iTrk=0;iTrkGetNumberOfTracks();iTrk++){//ESD tracks loop - AliESDtrack *pTrk = pESD->GetTrack(iTrk);// get next reconstructed track - if(pTrk->GetHMPIDsignal()<=0){//HMPID does not find anything reasonable for this track, assign 0.2 for all species - for(Int_t iPart=0;iPartSetHMPIDpid(pid); - continue; - } - Double_t pmod = pTrk->GetP(); - Double_t hTot=0; - for(Int_t iPart=0;iPartMeanIdxRad()*pmod); - if(cosThetaTh<1) //calculate the height of theoretical theta ckov on the gaus of experimental one - h[iPart] =TMath::Gaus(TMath::ACos(cosThetaTh),pTrk->GetHMPIDsignal(),TMath::Sqrt(pTrk->GetHMPIDchi2()),kTRUE); - else //beta < 1/ref. idx. => no light at all - h[iPart] =0 ; - hTot +=h[iPart]; //total height of all theoretical heights for normalization - }//species loop - - Double_t hMin=TMath::Gaus(pTrk->GetHMPIDsignal()-4*TMath::Sqrt(pTrk->GetHMPIDchi2()),pTrk->GetHMPIDsignal(),TMath::Sqrt(pTrk->GetHMPIDchi2()),kTRUE);//5 sigma protection - - for(Int_t iPart=0;iParthMin) - pid[iPart]=h[iPart]/hTot; - else //all theoretical values are far away from experemental one - pid[iPart]=1.0/AliPID::kSPECIES; - pTrk->SetHMPIDpid(pid); - }//ESD tracks loop -}//FillESD() -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++