X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=T0%2FAliT0Digitizer.cxx;h=1a27aec889e94d9195b5bbf847b5944d556a347d;hb=bc943889b924f0d7225de27671c3f0e46745f280;hp=e464a39f1a5af1eae59f16b5666953b602621dfc;hpb=9a5cba6d344e8e73e464d9de2ab967e03e1140c2;p=u%2Fmrichter%2FAliRoot.git diff --git a/T0/AliT0Digitizer.cxx b/T0/AliT0Digitizer.cxx index e464a39f1a5..1a27aec889e 100644 --- a/T0/AliT0Digitizer.cxx +++ b/T0/AliT0Digitizer.cxx @@ -95,7 +95,7 @@ AliT0Digitizer::AliT0Digitizer(AliRunDigitizer* manager) Double_t *x1 = new Double_t[np]; Double_t *y1 = new Double_t[np]; for (Int_t ii=0; iiGetPh2Mip(); - Int_t channelWidth = fParam->GetChannelWidth() ; + Float_t channelWidth = fParam->GetChannelWidth() ; Float_t delayVertex = fParam->GetTimeDelayTVD(); zdetC = TMath::Abs(fParam->GetZPosition("T0/C/PMT1")); @@ -267,6 +268,9 @@ void AliT0Digitizer::Exec(Option_t* /*option*/) } } + timeDelayCFD[0] = fParam->GetTimeDelayCFD(0); + Int_t meanTimeDelay=200; + for (Int_t i=0; i<24; i++) { Float_t al = countE[i]; @@ -284,7 +288,7 @@ void AliT0Digitizer::Exec(Option_t* /*option*/) sl = gr->Eval(qt); trLED = Int_t(( timeGaus[i] + 1000*sl )/channelWidth); - qtCh=Int_t (1000.*TMath::Log(qt)) / channelWidth; + qtCh=Int_t (1000.*TMath::Log(qt) / channelWidth); fADC0->AddAt(0,i); fADC->AddAt(qtCh,i); ftimeLED->AddAt(trLED,i); @@ -319,12 +323,9 @@ void AliT0Digitizer::Exec(Option_t* /*option*/) { timeDiff=Int_t (((besttimeC-besttimeA)+1000*delayVertex) /channelWidth); - meanTime=Int_t (((besttimeC+timeDelayCFD[pmtBestC]+ - besttimeA+timeDelayCFD[pmtBestA])/2.) - /channelWidth); + meanTime=Int_t (((besttimeC+besttimeA)/2. + meanTimeDelay)/channelWidth); } AliDebug(10,Form(" time A& C %i %i time diff && mean time in channels %i %i",bestATDC,bestCTDC, timeDiff, meanTime)); - timeDelayCFD[0] = fParam->GetTimeDelayCFD(0); if (sumMult > threshold){ fSumMult = Int_t (1000.* TMath::Log(Double_t(sumMult) / Double_t(sumMultCoeff)) @@ -333,10 +334,11 @@ void AliT0Digitizer::Exec(Option_t* /*option*/) sumMult, fSumMult, fSumMult*channelWidth)); } - fT0->AddDigit(bestATDC,bestCTDC,meanTime,timeDiff,fSumMult, + fT0->AddDigit(bestATDC,bestCTDC,meanTime,timeDiff,fSumMult, refpoint, ftimeCFD,fADC0,ftimeLED,fADC); - AliDebug(10,Form(" Digits wrote bestATDC %i bestCTDC %i meanTime %i timeDiff %i fSumMult %i ", bestATDC,bestCTDC,meanTime,timeDiff,fSumMult )); + + AliDebug(10,Form(" Digits wrote refpoint %i bestATDC %i bestCTDC %i meanTime %i timeDiff %i fSumMult %i ",refpoint ,bestATDC,bestCTDC,meanTime,timeDiff,fSumMult )); pOutStartLoader->UnloadHits(); } //input streams loop