First step towards reading of the new RCU firmware trailer. Thanks to Luciano we...

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

diff --git a/PHOS/AliPHOSRawDecoder.cxx b/PHOS/AliPHOSRawDecoder.cxx
index b6942da68ece6dbc8e551016e94c24e4ba54c402..9184b4fd6790b5f7b9300fd667299ee44075f708 100644 (file)
--- a/PHOS/AliPHOSRawDecoder.cxx
+++ b/PHOS/AliPHOSRawDecoder.cxx
@@ -22,7 +22,6 @@
 //     AliRawReader* rf = new AliRawReaderDate("2006run2211.raw");
 //     AliPHOSRawDecoder dc(rf);
 //     while (rf->NextEvent()) {
-//       dc.SetOldRCUFormat(kTRUE);
 //       dc.SubtractPedestals(kTRUE);
 //       while ( dc.NextDigit() ) {
 //         Int_t module = dc.GetModule();
@@ -42,22 +41,24 @@
 
 // --- AliRoot header files ---
 #include "AliPHOSRawDecoder.h"
-#include "AliPHOSPulseGenerator.h"
+#include "AliRawReader.h"
 
 ClassImp(AliPHOSRawDecoder)
 
 //-----------------------------------------------------------------------------
 AliPHOSRawDecoder::AliPHOSRawDecoder():
-  fRawReader(0),fCaloStream(0),fPedSubtract(kFALSE),fEnergy(-111),fTime(-111),fModule(-1),fColumn(-1),fRow(-1),
-  fLowGainFlag(kFALSE),fOverflow(kFALSE),fSamples(0),fTimes(0),fPulseGenerator(0)
+  fRawReader(0),fCaloStream(0),fPedSubtract(kFALSE),fEnergy(-111),fTime(-111),fQuality(0.),
+  fModule(-1),fColumn(-1),fRow(-1),fNewModule(-1),fNewColumn(-1),fNewRow(-1),fNewAmp(0),fNewTime(0), 
+  fLowGainFlag(kFALSE),fNewLowGainFlag(kFALSE),fOverflow(kFALSE),fSamples(0),fTimes(0)
 {
   //Default constructor.
 }
 
 //-----------------------------------------------------------------------------
 AliPHOSRawDecoder::AliPHOSRawDecoder(AliRawReader* rawReader,  AliAltroMapping **mapping):
-  fRawReader(0),fCaloStream(0),fPedSubtract(kFALSE),fEnergy(-111),fTime(-111),fModule(-1),fColumn(-1),fRow(-1),
-  fLowGainFlag(kFALSE),fOverflow(kFALSE),fSamples(0),fTimes(0),fPulseGenerator(0)
+  fRawReader(0),fCaloStream(0),fPedSubtract(kFALSE),fEnergy(-111),fTime(-111),fQuality(0.),
+  fModule(-1),fColumn(-1),fRow(-1),fNewModule(-1),fNewColumn(-1),fNewRow(-1),fNewAmp(0),fNewTime(0),
+  fLowGainFlag(kFALSE),fNewLowGainFlag(kFALSE),fOverflow(kFALSE),fSamples(0),fTimes(0)
 {
   //Construct a decoder object.
   //Is is user responsibility to provide next raw event 
@@ -65,10 +66,8 @@ AliPHOSRawDecoder::AliPHOSRawDecoder(AliRawReader* rawReader,  AliAltroMapping *
 
   fRawReader =  rawReader;
   fCaloStream = new AliCaloRawStream(rawReader,"PHOS",mapping);
-  fCaloStream->SetOldRCUFormat(kFALSE);
   fSamples = new TArrayI(100);
   fTimes = new TArrayI(100);
-  fPulseGenerator = new AliPHOSPulseGenerator();
 }
 
 //-----------------------------------------------------------------------------
@@ -79,18 +78,19 @@ AliPHOSRawDecoder::~AliPHOSRawDecoder()
   if(fCaloStream){ delete fCaloStream; fCaloStream=0;}
   if(fSamples){ delete fSamples; fSamples=0 ;}
   if(fTimes){ delete fTimes; fTimes=0 ;}
-  if(fPulseGenerator){ delete fPulseGenerator; fPulseGenerator=0 ;}
 }
 
 //-----------------------------------------------------------------------------
 AliPHOSRawDecoder::AliPHOSRawDecoder(const AliPHOSRawDecoder &phosDecoder ):
   fRawReader(phosDecoder.fRawReader),fCaloStream(phosDecoder.fCaloStream),
   fPedSubtract(phosDecoder.fPedSubtract),
-  fEnergy(phosDecoder.fEnergy),fTime(phosDecoder.fTime),
+  fEnergy(phosDecoder.fEnergy),fTime(phosDecoder.fTime),fQuality(phosDecoder.fQuality),
   fModule(phosDecoder.fModule),fColumn(phosDecoder.fColumn),
-  fRow(phosDecoder.fRow),fLowGainFlag(phosDecoder.fLowGainFlag),
+  fRow(phosDecoder.fRow),fNewModule(phosDecoder.fNewModule),fNewColumn(phosDecoder.fNewColumn),
+  fNewRow(phosDecoder.fNewRow),fNewAmp(phosDecoder.fNewAmp),fNewTime(phosDecoder.fNewTime),
+  fLowGainFlag(phosDecoder.fLowGainFlag),fNewLowGainFlag(phosDecoder.fNewLowGainFlag),
   fOverflow(phosDecoder.fOverflow),fSamples(phosDecoder.fSamples),
-  fTimes(phosDecoder.fTimes),fPulseGenerator(phosDecoder.fPulseGenerator)
+  fTimes(phosDecoder.fTimes)
 {
   //Copy constructor.
 }
@@ -108,10 +108,17 @@ AliPHOSRawDecoder& AliPHOSRawDecoder::operator = (const AliPHOSRawDecoder &phosD
 
     fEnergy = phosDecode.fEnergy;
     fTime = phosDecode.fTime;
+    fQuality = phosDecode.fQuality ;
     fModule = phosDecode.fModule;
     fColumn = phosDecode.fColumn;
     fRow = phosDecode.fRow;
+    fNewModule = phosDecode.fNewModule;
+    fNewColumn = phosDecode.fNewColumn;
+    fNewRow = phosDecode.fNewRow;
+    fNewAmp = phosDecode.fNewAmp ;
+    fNewTime= phosDecode.fNewTime ;
     fLowGainFlag = phosDecode.fLowGainFlag;
+    fNewLowGainFlag = phosDecode.fNewLowGainFlag;
     fOverflow = phosDecode.fOverflow ;
     
     if(fSamples) delete fSamples;
@@ -119,9 +126,6 @@ AliPHOSRawDecoder& AliPHOSRawDecoder::operator = (const AliPHOSRawDecoder &phosD
 
     if(fTimes) delete fTimes;
     fTimes = phosDecode.fTimes;
-
-    if(fPulseGenerator) delete fPulseGenerator;
-    fPulseGenerator = phosDecode.fPulseGenerator;
   }
 
   return *this;
@@ -144,7 +148,7 @@ Bool_t AliPHOSRawDecoder::NextDigit()
   Float_t pedMean = 0;
   Int_t   nPed = 0;
   Float_t baseLine = 1.0;
-  const Int_t nPreSamples = 10;
+  const Int_t kPreSamples = 10;
   
   fSamples->Reset();
   while ( in->Next() ) { 
@@ -160,6 +164,13 @@ Bool_t AliPHOSRawDecoder::NextDigit()
      if(in->IsNewHWAddress() && iBin>0) {
        
        iBin=0;
+       //First remember new sample
+       fNewLowGainFlag = in->IsLowGain();
+       fNewModule = in->GetModule()+1;
+       fNewRow    = in->GetRow()   +1;
+       fNewColumn = in->GetColumn()+1;
+       fNewAmp = in->GetSignal() ;
+       fNewTime=in->GetTime() ;                                                                                                                               
        
        // Temporarily we take the energy as a maximum amplitude
        // and the pedestal from the 0th point (30 Aug 2006).
@@ -171,7 +182,6 @@ Bool_t AliPHOSRawDecoder::NextDigit()
           fEnergy -= (Double_t)(pedMean/nPed); // pedestal subtraction
         else
           return kFALSE;
-       
        if (fEnergy < baseLine) fEnergy = 0;
 
        pedMean = 0;
@@ -179,13 +189,19 @@ Bool_t AliPHOSRawDecoder::NextDigit()
      }
 
      fLowGainFlag = in->IsLowGain();
-     fTime = fPulseGenerator->GetRawFormatTimeTrigger() * in->GetTime();
+//     fTime =   in->GetTime();
      fModule = in->GetModule()+1;
      fRow    = in->GetRow()   +1;
      fColumn = in->GetColumn()+1;
 
+    if(fLowGainFlag==fNewLowGainFlag && fModule==fNewModule &&
+       fRow==fNewRow && fColumn==fNewColumn ){
+       if(fNewAmp>fEnergy)  fEnergy = (Double_t)fNewAmp ;
+       fNewModule=-1 ;
+    } 
+
      //Calculate pedestal if necessary
-     if(fPedSubtract && in->GetTime() < nPreSamples) {
+     if(fPedSubtract && in->GetTime() < kPreSamples) {
        pedMean += in->GetSignal();
        nPed++;
      }