X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=HMPID%2FAliHMPIDDigitizer.cxx;h=64318503bd77359ea385ad26f37706570abc9fe4;hb=20169737568238266b28be2b1f3550705276d7a1;hp=7eece0d6f5f1b04ddbeefe092211ed709c0fde65;hpb=c5c19d6ac48c0b963c0629560c5255d4e0e66c8b;p=u%2Fmrichter%2FAliRoot.git diff --git a/HMPID/AliHMPIDDigitizer.cxx b/HMPID/AliHMPIDDigitizer.cxx index 7eece0d6f5f..64318503bd7 100644 --- a/HMPID/AliHMPIDDigitizer.cxx +++ b/HMPID/AliHMPIDDigitizer.cxx @@ -12,19 +12,27 @@ * about the suitability of this software for any purpose. It is * * provided "as is" without express or implied warranty. * **************************************************************************/ - -#include "AliHMPIDDigitizer.h" -#include "AliHMPID.h" +//. +//. +//. +//. +//. #include #include #include "AliRunDigitizer.h" #include #include +#include "AliHMPIDDigitizer.h" +#include "AliHMPIDDigit.h" +#include "AliHMPID.h" +#include "AliHMPIDParam.h" +#include +extern TRandom *gRandom; ClassImp(AliHMPIDDigitizer) -Bool_t AliHMPIDDigitizer::fDoNoise=kTRUE; +Bool_t AliHMPIDDigitizer::fgDoNoise=kFALSE; //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ void AliHMPIDDigitizer::Exec(Option_t*) { @@ -34,7 +42,7 @@ void AliHMPIDDigitizer::Exec(Option_t*) //First we read all sdigits from all inputs AliRunLoader *pInRunLoader=0;//in and out Run loaders AliLoader *pInRichLoader=0;//in and out HMPID loaders - TClonesArray sdigs("AliHMPIDDigit");//tmp storage for sdigits sum up from all input files + 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 @@ -55,7 +63,8 @@ void AliHMPIDDigitizer::Exec(Option_t*) AliRunLoader *pOutRunLoader = AliRunLoader::GetRunLoader(fManager->GetOutputFolderName()); //open output stream (only 1 possible) AliLoader *pOutRichLoader = pOutRunLoader->GetLoader("HMPIDLoader"); //take output HMPID loader - AliHMPID *pOutRich = (AliHMPID*)pOutRunLoader->GetAliRun()->GetDetector("HMPID"); //take output HMPID + AliRun *pArun = pOutRunLoader->GetAliRun(); + AliHMPID *pOutRich = (AliHMPID*)pArun->GetDetector("HMPID"); //take output HMPID pOutRichLoader->MakeTree("D"); pOutRich->MakeBranch("D"); //create TreeD in output stream Sdi2Dig(&sdigs,pOutRich->DigLst()); @@ -75,7 +84,7 @@ void AliHMPIDDigitizer::Sdi2Dig(TClonesArray *pSdiLst,TObjArray *pDigLst) // Returns: none TClonesArray *pLst[7]; Int_t iCnt[7]; - + for(Int_t i=0;i<7;i++){ 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 @@ -83,11 +92,11 @@ void AliHMPIDDigitizer::Sdi2Dig(TClonesArray *pSdiLst,TObjArray *pDigLst) // make noise array Float_t arrNoise[7][6][80][48]; - if(fDoNoise) { - for (Int_t iCh=AliHMPIDDigit::kMinCh;iCh<=AliHMPIDDigit::kMaxCh;iCh++) - for (Int_t iPc=AliHMPIDDigit::kMinPc;iPc<=AliHMPIDDigit::kMaxPc;iPc++) - for(Int_t iPx=AliHMPIDDigit::kMinPx;iPx<=AliHMPIDDigit::kMaxPx;iPx++) - for(Int_t iPy=AliHMPIDDigit::kMinPy;iPy<=AliHMPIDDigit::kMaxPy;iPy++) arrNoise[iCh][iPc][iPx][iPy] = gRandom->Gaus(0,1); + if(fgDoNoise) { + 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++) arrNoise[iCh][iPc][iPx][iPy] = gRandom->Gaus(0,1.1); } pSdiLst->Sort(); @@ -100,25 +109,25 @@ void AliHMPIDDigitizer::Sdi2Dig(TClonesArray *pSdiLst,TObjArray *pDigLst) iNdigPad++; if(iNdigPad<=3) aTids[iNdigPad-1]=pSdig->GetTrack(0); //collect TID continue; } - if(i!=0 && AliHMPIDDigit::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=AliHMPIDDigit::A2C(iPad); //new sdigit comes, reset collectors + if(i!=0 && 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 iNdigPad=1; aTids[0]=pSdig->GetTrack(0);aTids[1]=aTids[2]=-1; q=pSdig->Q(); - if(fDoNoise) q+=arrNoise[iCh][pSdig->Pc()][pSdig->PadPcX()][pSdig->PadPcY()]; + if(fgDoNoise) q+=arrNoise[iCh][pSdig->Pc()][pSdig->PadPcX()][pSdig->PadPcY()]; arrNoise[iCh][pSdig->Pc()][pSdig->PadPcX()][pSdig->PadPcY()]=0; }//sdigits loop (sorted) - if(AliHMPIDDigit::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 + 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(!fDoNoise) return; + if(!fgDoNoise) return; aTids[0]=aTids[1]=aTids[2]=-1; - for (Int_t iCh=AliHMPIDDigit::kMinCh;iCh<=AliHMPIDDigit::kMaxCh;iCh++) - for (Int_t iPc=AliHMPIDDigit::kMinPc;iPc<=AliHMPIDDigit::kMaxPc;iPc++) - for(Int_t iPx=AliHMPIDDigit::kMinPx;iPx<=AliHMPIDDigit::kMaxPx;iPx++) - for(Int_t iPy=AliHMPIDDigit::kMinPy;iPy<=AliHMPIDDigit::kMaxPy;iPy++) { - Float_t q = arrNoise[iCh][iPc][iPx][iPy]; - if(AliHMPIDDigit::IsOverTh(q)) new((*pLst[iCh])[iCnt[iCh]++]) AliHMPIDDigit(AliHMPIDDigit::Abs(iCh,iPc,iPx,iPy),(Int_t)q,aTids); + for (Int_t iChCurr=AliHMPIDParam::kMinCh;iChCurr<=AliHMPIDParam::kMaxCh;iChCurr++) + 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++) { + Float_t qNoise = arrNoise[iChCurr][iPc][iPx][iPy]; + if(AliHMPIDParam::IsOverTh(qNoise)) new((*pLst[iChCurr])[iCnt[iChCurr]++]) AliHMPIDDigit(AliHMPIDParam::Abs(iChCurr,iPc,iPx,iPy),(Int_t)qNoise,aTids); } }//Sdi2Dig()