reset DDL data buffers in case of decoding errors detected within the DDL payload

[u/mrichter/AliRoot.git] / PHOS / AliPHOSRawDigiProducer.cxx

diff --git a/PHOS/AliPHOSRawDigiProducer.cxx b/PHOS/AliPHOSRawDigiProducer.cxx
index 7a3fe0aa30e1b71fb0de5f3daf0c9c6f5c68c7c3..ae906a6bb8eb9a07aa597edbecfeafee0fc28892 100644 (file)
--- a/PHOS/AliPHOSRawDigiProducer.cxx
+++ b/PHOS/AliPHOSRawDigiProducer.cxx
@@ -52,6 +52,7 @@ AliPHOSRawDigiProducer::AliPHOSRawDigiProducer():
   fEmcMinE(0.),
   fCpvMinE(0.),
   fSampleQualityCut(1.),
+  fSampleToSec(0.),
   fEmcCrystals(0),
   fGeom(0),
   fPulseGenerator(0),
@@ -75,6 +76,7 @@ AliPHOSRawDigiProducer::AliPHOSRawDigiProducer(AliRawReader *rawReader,
   fEmcMinE(0.),
   fCpvMinE(0.),
   fSampleQualityCut(1.),
+  fSampleToSec(0.),
   fEmcCrystals(0),
   fGeom(0),
   fPulseGenerator(0),
@@ -99,6 +101,7 @@ AliPHOSRawDigiProducer::AliPHOSRawDigiProducer(const AliPHOSRawDigiProducer &dp)
   fEmcMinE(0.),
   fCpvMinE(0.),
   fSampleQualityCut(1.),
+  fSampleToSec(0.),
   fEmcCrystals(0),
   fGeom(0),
   fPulseGenerator(0),
@@ -110,6 +113,7 @@ AliPHOSRawDigiProducer::AliPHOSRawDigiProducer(const AliPHOSRawDigiProducer &dp)
   fEmcMinE = dp.fEmcMinE ;
   fCpvMinE = dp.fCpvMinE ;
   fSampleQualityCut = dp.fSampleQualityCut;
+  fSampleToSec = dp.fSampleToSec ;
   fEmcCrystals = dp.fEmcCrystals ;
   fPulseGenerator = new AliPHOSPulseGenerator();
   fGeom = dp.fGeom ;
@@ -124,6 +128,7 @@ AliPHOSRawDigiProducer& AliPHOSRawDigiProducer::operator= (const AliPHOSRawDigiP
   fEmcMinE = dp.fEmcMinE ;
   fCpvMinE = dp.fCpvMinE ;
   fSampleQualityCut = dp.fSampleQualityCut ;
+  fSampleToSec = dp.fSampleToSec ;
   fEmcCrystals = dp.fEmcCrystals ;
   fGeom = dp.fGeom ;
   if(fPulseGenerator) delete fPulseGenerator ;
@@ -150,6 +155,14 @@ void AliPHOSRawDigiProducer::MakeDigits(TClonesArray *digits, AliPHOSRawFitterv0
   Int_t relId[4], absId=-1, caloFlag=-1;
   
   const Double_t baseLine=1. ; //Minimal energy of digit in ADC ch. 
+
+  //Calculate conversion coeff. from Sample time step to seconds
+  //If OCDB contains negative or zero value - use one from RCU trailer
+  //Negative value in OCDB is used only for simulation of raw digits
+  if(fgCalibData->GetSampleTimeStep()>0.)
+    fSampleToSec=fgCalibData->GetSampleTimeStep() ;
+  else
+    fSampleToSec=fRawStream->GetTSample() ;
   
   //Temporary array for LowGain digits
   TClonesArray tmpLG("AliPHOSDigit",10000) ;
@@ -160,7 +173,7 @@ void AliPHOSRawDigiProducer::MakeDigits(TClonesArray *digits, AliPHOSRawFitterv0
   
   while (fRawStream->NextDDL()) {
     while (fRawStream->NextChannel()) {
-      relId[0] = fRawStream->GetModule() + 1; // counts from 1 to 5
+      relId[0] = 5 - fRawStream->GetModule() ; // counts from 1 to 5
       relId[1] = 0;
       relId[2] = fRawStream->GetCellX()  + 1; // counts from 1 to 64
       relId[3] = fRawStream->GetCellZ()  + 1; // counts from 1 to 56
@@ -168,20 +181,30 @@ void AliPHOSRawDigiProducer::MakeDigits(TClonesArray *digits, AliPHOSRawFitterv0
       
       if(caloFlag!=0 && caloFlag!=1) continue; //TRU data!
       
+      fitter->SetChannelGeo(relId[0],relId[2],relId[3],caloFlag);
+
+      if(fitter->GetAmpOffset()==0 && fitter->GetAmpThreshold()==0) {
+       short value = fRawStream->GetAltroCFG1();
+       bool ZeroSuppressionEnabled = (value >> 15) & 0x1;
+       if(ZeroSuppressionEnabled) {
+         short offset = (value >> 10) & 0xf;
+         short threshold = value & 0x3ff;
+         fitter->SubtractPedestals(kFALSE);
+         fitter->SetAmpOffset(offset);
+         fitter->SetAmpThreshold(threshold);
+       }
+      }
+      
       fGeom->RelToAbsNumbering(relId, absId);
       
-      Int_t nBunches = 0;
-      while (fRawStream->NextBunch()) {
-       nBunches++;
-       if (nBunches > 1) continue;
+      fitter->SetNBunches(0);
+      while (fRawStream->NextBunch()) { //Take first in time banch
        const UShort_t *sig = fRawStream->GetSignals();
        Int_t sigStart  = fRawStream->GetStartTimeBin();
        Int_t sigLength = fRawStream->GetBunchLength();
-       fitter->SetChannelGeo(relId[0],relId[2],relId[3],caloFlag);
        fitter->Eval(sig,sigStart,sigLength);
       } // End of NextBunch()
 
-      fitter->SetNBunches(nBunches);
       
       Double_t energy = fitter->GetEnergy() ; 
       Double_t time   = fitter->GetTime() ;
@@ -197,8 +220,11 @@ void AliPHOSRawDigiProducer::MakeDigits(TClonesArray *digits, AliPHOSRawFitterv0
       if(fitter->GetSignalQuality() > fSampleQualityCut && !(fitter->IsOverflow()))
        continue ;
       
-//       energy = CalibrateE(energy,relId,lowGainFlag) ;
+      energy = CalibrateE(energy,relId,!caloFlag) ;
 //       time   = CalibrateT(time,relId,lowGainFlag) ;
+
+      //convert time from sample bin units to s
+      time*=fSampleToSec ;
       
       if(energy <= 0.) 
        continue;