fPrimary = 0 ;
fIparent = 0 ;
fMaxIter = 0;
+ fTime = 0. ;
+ fTimeR = 0. ;
}
//____________________________________________________________________________
fIparent = new Int_t[fNMaxiparent] ;
fAmp = DigEnergy ;
fTime = time ;
+ fTimeR = fTime ;
fId = id ;
fIndexInList = index ;
fMaxIter = 5;
fIparent[j] = digit.fIparent[j] ;
fAmp = digit.fAmp ;
fTime = digit.fTime ;
+ fTimeR = digit.fTimeR ;
fId = digit.fId;
fMaxIter = digit.fMaxIter;
fIndexInList = digit.fIndexInList ;
fAmp += digit.fAmp ;
if(fTime > digit.fTime)
fTime = digit.fTime ;
+ fTimeR = fTime ;
Int_t max1 = fNprimary ;
Int_t max2 = fNiparent ;
Int_t GetIparent(Int_t index) const ;
Float_t GetPhi() const;
Float_t GetTime(void) const {return fTime ;}
+ Float_t GetTimeR(void) const {return fTimeR ;}
Bool_t IsSortable() const { return kTRUE ; }
void SetAmp(Int_t amp) { fAmp= amp ; }
void SetId(Int_t id) {fId = id ;}
void SetTime(Float_t time) {fTime = time ;}
+ void SetTimeR(Float_t time) {fTimeR = time ;}
void ShiftPrimary(Int_t shift); // shift to separate different TreeK in merging
private:
Int_t *fIparent ; //[fNMaxiparent] Array of parents
Int_t fMaxIter ; // Number to Increment Maxiparent, and MaxPrimary if default is not sufficient
Float_t fTime ; // Calculated time
-
- ClassDef(AliEMCALDigit,1) // Digit in EMCAL
+ Float_t fTimeR ; // Earliest time: to be used by Digits2Raw
+
+ ClassDef(AliEMCALDigit,2) // Digit in EMCAL
} ;
//__________________________________________________________________
Float_t AliEMCALDigitizer::TimeOfNoise(void)
-{ // Calculates the time signal generated by noise
- //to be rewritten, now returns just big number
- return 1. ;
-
+{
+ // Calculates the time signal generated by noise
+ Info("TimeOfNoise", "Change me") ;
+ return gRandom->Rndm() * 1.28E-5;
}
//__________________________________________________________________
Int_t ievent ;
for (ievent = fFirstEvent; ievent <= fLastEvent; ievent++) {
gime->Event(ievent, "D");
-
+
GetCalibrationParameters() ;
fNumberOfEmcClusters = fNumberOfCpvClusters = 0 ;
fIndexInList = -1 ;
fNprimary = 0 ;
fPrimary = 0;
+ fTime = 0. ;
+ fTimeR = 0. ;
}
//____________________________________________________________________________
fAmp = digEnergy ;
fTime = time ;
+ fTimeR = fTime ;
fId = id ;
fIndexInList = index ;
if( primary != -1){
fPrimary = 0 ;
fAmp = digit.fAmp ;
fTime = digit.fTime ;
+ fTimeR = digit.fTimeR ;
fId = digit.fId;
fIndexInList = digit.fIndexInList ;
}
void AliPHOSDigit::Print() const
{
// Print the digit together with list of primaries
- printf("PHOS digit: Amp=%d, Id=%d, Time=%f, NPrim=%d ",fAmp,fId,fTime,fNprimary);
+ printf("PHOS digit: Amp=%d, Id=%d, Time=%e, TimeR=%e, NPrim=%d ",fAmp,fId,fTime,fTimeR,fNprimary);
for(Int_t index = 0; index <fNprimary; index ++ )
printf(" %d ",fPrimary[index]);
printf("\n") ;
fAmp += digit.fAmp ;
if(fTime > digit.fTime)
fTime = digit.fTime ;
+ fTimeR = fTime ;
return *this ;
}
//____________________________________________________________________________
Int_t GetNprimary() const { return fNprimary ; }
Int_t GetPrimary(Int_t index) const ;
Float_t GetTime(void) const {return fTime ;}
+ Float_t GetTimeR(void) const {return fTimeR ;}
Bool_t IsSortable() const { return kTRUE ; }
void Print() const;
void SetAmp(Int_t Amp) { fAmp=Amp ; }
- void SetTime(Float_t Time) {fTime = Time ;}
+ void SetTime(Float_t time) {fTime = time ;}
+ void SetTimeR(Float_t time) {fTimeR = time ;}
void ShiftPrimary(Int_t shift); // shift to separate different TreeK in merging
private:
Int_t fNprimary ; // Number of primaries
Int_t * fPrimary ; //[fNprimary] Array of primaries
Float_t fTime ; // Calculcated time
+ Float_t fTimeR ; // Earliest time: to be used by Digits2Raw
- ClassDef(AliPHOSDigit,2) // Digit in PHOS
+ ClassDef(AliPHOSDigit,3) // Digit in PHOS
} ;
//__________________________________________________________________
Float_t AliPHOSDigitizer::TimeOfNoise(void) const
{ // Calculates the time signal generated by noise
- //to be rewritten, now returns just big number
- return 1. ;
-
+ Info("TimeOfNoise", "Change me") ;
+ return gRandom->Rndm() * 1.28E-5;
}
//__________________________________________________________________