Adding histos

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

diff --git a/PHOS/AliPHOSRawDigiProducer.cxx b/PHOS/AliPHOSRawDigiProducer.cxx
index 82b1cfc78e9145a2d445a023de969bb36db1e6b9..5240912f87168107f67d88cc19e647a5f660cbfc 100644 (file)
--- a/PHOS/AliPHOSRawDigiProducer.cxx
+++ b/PHOS/AliPHOSRawDigiProducer.cxx
@@ -154,9 +154,19 @@ AliPHOSRawDigiProducer::~AliPHOSRawDigiProducer()
 }
 //--------------------------------------------------------------------------------------
 void AliPHOSRawDigiProducer::MakeDigits(TClonesArray *digits, AliPHOSRawFitterv0* fitter) 
+{
+  // Create a temporary array of LG digits and then make digits from raw data
+
+  TClonesArray *tmpLG = new TClonesArray("AliPHOSDigit",10000) ;
+  MakeDigits(digits, tmpLG, fitter);
+  tmpLG->Delete();
+  delete tmpLG;
+}
+//--------------------------------------------------------------------------------------
+void AliPHOSRawDigiProducer::MakeDigits(TClonesArray *digits, TClonesArray *tmpDigLG, AliPHOSRawFitterv0* fitter) 
 {
   //Makes the job.
-  //TClonesArray *digits and raw data fitter should be provided by calling function.
+  //TClonesArray *digits, *tmpDigLG and raw data fitter should be provided by calling function.
 
   digits->Clear();
  
@@ -173,8 +183,8 @@ void AliPHOSRawDigiProducer::MakeDigits(TClonesArray *digits, AliPHOSRawFitterv0
   else
     fSampleToSec=fRawStream->GetTSample() ;
   
-  //Temporary array for LowGain digits
-  TClonesArray tmpLG("AliPHOSDigit",10000) ;
+  // Clear a temporary array for LowGain digits
+  tmpDigLG->Clear();
   Int_t ilgDigit=0 ;
 
   //Let fitter subtract pedestals in case of ZS
@@ -250,17 +260,19 @@ void AliPHOSRawDigiProducer::MakeDigits(TClonesArray *digits, AliPHOSRawFitterv0
 //CalibrateT moved to Clusterizer
 //      time = CalibrateT(time,relId,!caloFlag) ;
       // subtract RCU L1 phase (L1Phase is in seconds) w.r.t. L0:
-      time -= fRawStream->GetL1Phase();
-
-
+      //Very strange behaviour of electronics, but cross-checkes several times...
+      if( fRawStream->GetL1Phase()<55.*1.e-9 ) //for phase=0,25,50
+        time -= fRawStream->GetL1Phase();
+      else //for phase 75
+        time += 25.*1.e-9 ;
       
       if(energy <= 0.) 
        continue;
       
       if (caloFlag == AliCaloRawStreamV3::kLowGain) {
-       new(tmpLG[ilgDigit]) AliPHOSDigit(-1,absId,(Float_t)energy,(Float_t)time);
+       new((*tmpDigLG)[ilgDigit]) AliPHOSDigit(-1,absId,(Float_t)energy,(Float_t)time);
        if (sigLength>0 && fADCValuesLG!=0)
-         dynamic_cast<AliPHOSDigit*>(tmpLG.At(ilgDigit))->SetALTROSamplesLG(sigLength,fADCValuesLG);
+         static_cast<AliPHOSDigit*>(tmpDigLG->At(ilgDigit))->SetALTROSamplesLG(sigLength,fADCValuesLG);
        ilgDigit++ ; 
       }
       else if (caloFlag == AliCaloRawStreamV3::kHighGain) {
@@ -270,7 +282,7 @@ void AliPHOSRawDigiProducer::MakeDigits(TClonesArray *digits, AliPHOSRawFitterv0
        else
          new((*digits)[iDigit]) AliPHOSDigit(-1,absId,(Float_t)energy,(Float_t)time);
        if (sigLength>0 && fADCValuesHG!=0)
-         dynamic_cast<AliPHOSDigit*>(digits->At(iDigit))->SetALTROSamplesHG(sigLength,fADCValuesHG);
+         static_cast<AliPHOSDigit*>(digits->At(iDigit))->SetALTROSamplesHG(sigLength,fADCValuesHG);
        iDigit++;
       }
     } // End of NextChannel()
@@ -279,17 +291,17 @@ void AliPHOSRawDigiProducer::MakeDigits(TClonesArray *digits, AliPHOSRawFitterv0
     //replace energy of HighGain digits only if there is overflow
     //negative energy (overflow)
     digits->Sort() ;
-    tmpLG.Sort() ;
+    tmpDigLG->Sort() ;
     Int_t iLG = 0;
-    Int_t nLG1 = tmpLG.GetEntriesFast()-1 ;
+    Int_t nLG1 = tmpDigLG->GetEntriesFast()-1 ;
     
     for(Int_t iDig=0 ; iDig < digits->GetEntriesFast() ; iDig++) { 
       AliPHOSDigit * digHG = dynamic_cast<AliPHOSDigit*>(digits->At(iDig)) ;
       if (!digHG) continue;
-      AliPHOSDigit * digLG = dynamic_cast<AliPHOSDigit*>(tmpLG.At(iLG)) ;
+      AliPHOSDigit * digLG = dynamic_cast<AliPHOSDigit*>(tmpDigLG->At(iLG)) ;
       while(digLG && iLG<nLG1 && digHG->GetId()> digLG->GetId()){
        iLG++ ;
-       digLG = dynamic_cast<AliPHOSDigit*>(tmpLG.At(iLG)) ;
+       digLG = dynamic_cast<AliPHOSDigit*>(tmpDigLG->At(iLG)) ;
       }
       absId=digHG->GetId() ;
       fGeom->AbsToRelNumbering(absId,relId) ;