X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=HMPID%2FAliHMPIDDigitizer.cxx;h=15b9fe02a70bbf10f24ec5dd31ad1d0e805ae098;hb=e5c41d3ed41ca47ed14177a8898bed89b59b7d71;hp=b269a74237cd58ef29d5d2cc18034cdd97bb619e;hpb=23ba1e93cbb57acd0837b1d59c3a6d47d493c75a;p=u%2Fmrichter%2FAliRoot.git diff --git a/HMPID/AliHMPIDDigitizer.cxx b/HMPID/AliHMPIDDigitizer.cxx index b269a74237c..15b9fe02a70 100644 --- a/HMPID/AliHMPIDDigitizer.cxx +++ b/HMPID/AliHMPIDDigitizer.cxx @@ -19,9 +19,9 @@ //. #include #include -#include "AliRunDigitizer.h" +#include "AliDigitizationInput.h" #include -#include +#include "AliLog.h" #include #include #include "AliHMPIDDigitizer.h" @@ -38,18 +38,18 @@ ClassImp(AliHMPIDDigitizer) Bool_t AliHMPIDDigitizer::fgDoNoise=kTRUE; //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -void AliHMPIDDigitizer::Exec(Option_t*) +void AliHMPIDDigitizer::Digitize(Option_t*) { // This methode is responsible for merging sdigits to a list of digits //Disintegration leeds to the fact that one hit affects several neighbouring pads, which means that the same pad might be affected by few hits. - AliDebug(1,Form("Start with %i input(s) for event %i",fManager->GetNinputs(),fManager->GetOutputEventNr())); + AliDebug(1,Form("Start with %i input(s) for event %i",fDigInput->GetNinputs(),fDigInput->GetOutputEventNr())); //First we read all sdigits from all inputs AliRunLoader *pInRunLoader=0;//in and out Run loaders AliLoader *pInRichLoader=0;//in and out HMPID loaders static TClonesArray sdigs("AliHMPIDDigit");//tmp storage for sdigits sum up from all input files Int_t total=0; - for(Int_t inFileN=0;inFileNGetNinputs();inFileN++){//files loop - pInRunLoader = AliRunLoader::GetRunLoader(fManager->GetInputFolderName(inFileN)); //get run loader from current input + for(Int_t inFileN=0;inFileNGetNinputs();inFileN++){//files loop + pInRunLoader = AliRunLoader::GetRunLoader(fDigInput->GetInputFolderName(inFileN)); //get run loader from current input pInRichLoader = pInRunLoader->GetLoader("HMPIDLoader"); if(pInRichLoader==0) continue; //no HMPID in this input, check the next input if (!pInRunLoader->GetAliRun()) pInRunLoader->LoadgAlice(); AliHMPID* pInRich=(AliHMPID*)pInRunLoader->GetAliRun()->GetDetector("HMPID"); //take HMPID from current input @@ -57,7 +57,7 @@ void AliHMPIDDigitizer::Exec(Option_t*) AliDebug(1,Form("input %i has %i sdigits",inFileN,pInRich->SdiLst()->GetEntries())); for(Int_t i=0;iSdiLst()->GetEntries();i++){ //collect sdigits from current input AliHMPIDDigit *pSDig=(AliHMPIDDigit*)pInRich->SdiLst()->At(i); - pSDig->AddTidOffset(fManager->GetMask(inFileN)); //apply TID shift since all inputs count tracks independently starting from 0 + pSDig->AddTidOffset(fDigInput->GetMask(inFileN)); //apply TID shift since all inputs count tracks independently starting from 0 new(sdigs[total++]) AliHMPIDDigit(*pSDig); } pInRichLoader->UnloadSDigits(); pInRich->SdiReset(); //close current input and reset @@ -65,7 +65,7 @@ void AliHMPIDDigitizer::Exec(Option_t*) //PH if(sdigs.GetEntries()==0) return; //no sdigits collected, nothing to convert - AliRunLoader *pOutRunLoader = AliRunLoader::GetRunLoader(fManager->GetOutputFolderName()); //open output stream (only 1 possible) + AliRunLoader *pOutRunLoader = AliRunLoader::GetRunLoader(fDigInput->GetOutputFolderName()); //open output stream (only 1 possible) AliLoader *pOutRichLoader = pOutRunLoader->GetLoader("HMPIDLoader"); //take output HMPID loader AliRun *pArun = pOutRunLoader->GetAliRun(); AliHMPID *pOutRich = (AliHMPID*)pArun->GetDetector("HMPID"); //take output HMPID @@ -93,28 +93,38 @@ void AliHMPIDDigitizer::Sdi2Dig(TClonesArray *pSdiLst,TObjArray *pDigLst) pLst[i]=(TClonesArray*)(*pDigLst)[i]; iCnt[i]=0; if(pLst[i]->GetEntries()!=0) AliErrorClass("Some of digits lists is not empty"); //in principle those lists should be empty } - - TMatrixF *pM[7]; - - AliCDBEntry *pDaqSigEnt = AliCDBManager::Instance()->Get("HMPID/Calib/DaqSig"); //contains TObjArray of TObjArray 14 TMatrixF sigmas values for pads - if(!pDaqSigEnt) Printf("prova"); - TObjArray *pDaqSig = (TObjArray*)pDaqSigEnt->GetObject(); - for(Int_t iCh=AliHMPIDParam::kMinCh;iCh<=AliHMPIDParam::kMaxCh;iCh++){ //chambers loop - pM[iCh] = (TMatrixF*)pDaqSig->At(iCh); - } - + // make noise array - Float_t arrNoise[7][6][80][48]; + Float_t arrNoise[7][6][80][48], arrSigmaPed[7][6][80][48]; if(fgDoNoise) { - for (Int_t iCh=AliHMPIDParam::kMinCh;iCh<=AliHMPIDParam::kMaxCh;iCh++){ + for (Int_t iCh=AliHMPIDParam::kMinCh;iCh<=AliHMPIDParam::kMaxCh;iCh++) for (Int_t iPc=AliHMPIDParam::kMinPc;iPc<=AliHMPIDParam::kMaxPc;iPc++) for(Int_t iPx=AliHMPIDParam::kMinPx;iPx<=AliHMPIDParam::kMaxPx;iPx++) for(Int_t iPy=AliHMPIDParam::kMinPy;iPy<=AliHMPIDParam::kMaxPy;iPy++){ - Int_t padX = (iPc%2)*AliHMPIDParam::kPadPcX+iPx; - Int_t padY = (iPc/2)*AliHMPIDParam::kPadPcY+iPy; - arrNoise[iCh][iPc][iPx][iPy] = gRandom->Gaus(0,(*pM[iCh])(padX,padY)); - } - } + arrNoise[iCh][iPc][iPx][iPy] = gRandom->Gaus(0,1.); + arrSigmaPed[iCh][iPc][iPx][iPy] = 1.; + } + + AliCDBEntry *pDaqSigEnt = AliCDBManager::Instance()->Get("HMPID/Calib/DaqSig"); //contains TObjArray of TObjArray 14 TMatrixF sigmas values for pads + + if(pDaqSigEnt){ + TObjArray *pDaqSig = (TObjArray*)pDaqSigEnt->GetObject(); + for(Int_t iCh=AliHMPIDParam::kMinCh;iCh<=AliHMPIDParam::kMaxCh;iCh++){ //chambers loop + TMatrixF *pM = (TMatrixF*)pDaqSig->At(iCh); + for (Int_t iPc=AliHMPIDParam::kMinPc;iPc<=AliHMPIDParam::kMaxPc;iPc++) + for(Int_t iPx=AliHMPIDParam::kMinPx;iPx<=AliHMPIDParam::kMaxPx;iPx++) + for(Int_t iPy=AliHMPIDParam::kMinPy;iPy<=AliHMPIDParam::kMaxPy;iPy++){ + Int_t padX = (iPc%2)*AliHMPIDParam::kPadPcX+iPx; + Int_t padY = (iPc/2)*AliHMPIDParam::kPadPcY+iPy; + if((*pM)(padX,padY)>0.){ + arrNoise[iCh][iPc][iPx][iPy] = gRandom->Gaus(0,(*pM)(padX,padY)); + arrSigmaPed[iCh][iPc][iPx][iPy] = (*pM)(padX,padY);} + else{ + arrNoise[iCh][iPc][iPx][iPy] = gRandom->Gaus(0,1.); + arrSigmaPed[iCh][iPc][iPx][iPy] = 1.;} + } + } + } } pSdiLst->Sort(); @@ -128,7 +138,7 @@ void AliHMPIDDigitizer::Sdi2Dig(TClonesArray *pSdiLst,TObjArray *pDigLst) continue; } if(i!=0 && iCh>=AliHMPIDParam::kMinCh && iCh<=AliHMPIDParam::kMaxCh){ - AliHMPIDParam::Instance()->SetThreshold(TMath::Nint(((*pM[iCh])(pSdig->PadChX(),pSdig->PadChY()))*AliHMPIDParam::Nsig())); + AliHMPIDParam::Instance()->SetThreshold((TMath::Nint(arrSigmaPed[iCh][pSdig->Pc()][pSdig->PadPcX()][pSdig->PadPcY()])*AliHMPIDParam::Nsig())); if(AliHMPIDParam::IsOverTh(q)) new((*pLst[iCh])[iCnt[iCh]++]) AliHMPIDDigit(iPad,(Int_t)q,aTids);} //do not create digit for the very first sdigit iPad=pSdig->Pad(); iCh=AliHMPIDParam::A2C(iPad); //new sdigit comes, reset collectors @@ -141,10 +151,11 @@ void AliHMPIDDigitizer::Sdi2Dig(TClonesArray *pSdiLst,TObjArray *pDigLst) if(iCh>=AliHMPIDParam::kMinCh && iCh<=AliHMPIDParam::kMaxCh){ Int_t pc = AliHMPIDParam::A2P(iPad); - Int_t padX = (pc%2)*AliHMPIDParam::kPadPcX+AliHMPIDParam::A2X(iPad); - Int_t padY = (pc/2)*AliHMPIDParam::kPadPcY+AliHMPIDParam::A2Y(iPad); - AliHMPIDParam::Instance()->SetThreshold(TMath::Nint(((*pM[iCh])(padX,padY))*AliHMPIDParam::Nsig())); - if(AliHMPIDParam::IsOverTh(q)) new((*pLst[iCh])[iCnt[iCh]++]) AliHMPIDDigit(iPad,(Int_t)q,aTids);} //add the last one, in case of empty sdigits list q=-1 + Int_t px = AliHMPIDParam::A2X(iPad); + Int_t py = AliHMPIDParam::A2Y(iPad); + AliHMPIDParam::Instance()->SetThreshold((TMath::Nint(arrSigmaPed[iCh][pc][px][py])*AliHMPIDParam::Nsig())); + if(AliHMPIDParam::IsOverTh(q)) new((*pLst[iCh])[iCnt[iCh]++]) AliHMPIDDigit(iPad,(Int_t)q,aTids); + } //add the last one, in case of empty sdigits list q=-1 // add noise pad above threshold with no signal merged...if any if(!fgDoNoise) return; @@ -155,9 +166,7 @@ void AliHMPIDDigitizer::Sdi2Dig(TClonesArray *pSdiLst,TObjArray *pDigLst) for(Int_t iPx=AliHMPIDParam::kMinPx;iPx<=AliHMPIDParam::kMaxPx;iPx++) for(Int_t iPy=AliHMPIDParam::kMinPy;iPy<=AliHMPIDParam::kMaxPy;iPy++) { Float_t qNoise = arrNoise[iChCurr][iPc][iPx][iPy]; - Int_t padX = (iPc%2)*AliHMPIDParam::kPadPcX+iPx; - Int_t padY = (iPc/2)*AliHMPIDParam::kPadPcY+iPy; - AliHMPIDParam::Instance()->SetThreshold(TMath::Nint(((*pM[iChCurr])(padX,padY))*AliHMPIDParam::Nsig())); + AliHMPIDParam::Instance()->SetThreshold((TMath::Nint(arrSigmaPed[iChCurr][iPc][iPx][iPy])*AliHMPIDParam::Nsig())); if(AliHMPIDParam::IsOverTh(qNoise)) new((*pLst[iChCurr])[iCnt[iChCurr]++]) AliHMPIDDigit(AliHMPIDParam::Abs(iChCurr,iPc,iPx,iPy),(Int_t)qNoise,aTids); } }