fRecPoints->Delete();
- // set up TObjArray with pointers to digits to work on
+ // set up TObjArray with pointers to digits to work on, calibrate digits
TObjArray digitsC;
- Double_t e = 0.0, ehs = 0.0;
+ Double_t ehs = 0.0;
AliEMCALDigit *digit = 0;
TIter nextdigit(fDigitsArr);
while ( (digit = static_cast<AliEMCALDigit*>(nextdigit())) ) {
- Float_t dEnergyCalibrated = Calibrate(digit->GetAmplitude(), digit->GetTime(),digit->GetId());
+ Float_t dEnergyCalibrated = digit->GetAmplitude();
+ Float_t time = digit->GetTime();
+ Calibrate(dEnergyCalibrated, time ,digit->GetId());
digit->SetCalibAmp(dEnergyCalibrated);
- if (dEnergyCalibrated < fMinECut)
+ digit->SetTime(time);
+ if (dEnergyCalibrated < fMinECut || time > fTimeMax || time < fTimeMin)
continue;
if (!fGeom->CheckAbsCellId(digit->GetId()))
continue;
nextdigitC.Reset();
while ( (digit = static_cast<AliEMCALDigit *>(nextdigitC())) ) {
Float_t dEnergyCalibrated = digit->GetCalibAmp();
- if (dEnergyCalibrated>fECAClusteringThreshold && dEnergyCalibrated>dMaxEnergyDigit) {
+ if (dEnergyCalibrated>fECAClusteringThreshold && dEnergyCalibrated>dMaxEnergyDigit) {
dMaxEnergyDigit = dEnergyCalibrated;
iMaxEnergyDigit = digit->GetId();
pMaxEnergyDigit = digit;
AliEMCALRecPoint *recPoint = new AliEMCALRecPoint("");
recPoint->SetClusterType(AliVCluster::kEMCALClusterv1);
- recPoint->AddDigit(*pMaxEnergyDigit, dMaxEnergyDigit, kFALSE);
+ recPoint->AddDigit(*pMaxEnergyDigit, pMaxEnergyDigit->GetCalibAmp(), kFALSE);
fRecPoints->AddAt(recPoint, fNumberOfECAClusters++);
digitsC.Remove(pMaxEnergyDigit);
TObjArray clusterDigits;