Applying modification so that LUTs are generated from CDB, which also solves LUT...

[u/mrichter/AliRoot.git] / VZERO / AliVZEROReconstructor.cxx

diff --git a/VZERO/AliVZEROReconstructor.cxx b/VZERO/AliVZEROReconstructor.cxx
index 6ae093e37da71494ffd7da70ca75982bdd95fd99..1d345a8cc8c7da7acc1de938c187c683ba0005c9 100644 (file)
--- a/VZERO/AliVZEROReconstructor.cxx
+++ b/VZERO/AliVZEROReconstructor.cxx
@@ -25,7 +25,7 @@
 #include "AliRawReader.h"
 #include "AliVZEROReconstructor.h"
 #include "AliVZERORawStream.h"
-#include "AliESD.h"
+#include "AliESDEvent.h"
 
 ClassImp(AliVZEROReconstructor)
 
@@ -33,7 +33,6 @@ ClassImp(AliVZEROReconstructor)
 AliVZEROReconstructor:: AliVZEROReconstructor(): AliReconstructor(),
    fESDVZERO(0x0),
    fESD(0x0),
-   fRunLoader(0x0),
    fCalibData(GetCalibData())
 {
   // Default constructor  
@@ -62,11 +61,10 @@ AliVZEROReconstructor::~AliVZEROReconstructor()
 }
 
 //_____________________________________________________________________________
-void AliVZEROReconstructor::Init(AliRunLoader* runLoader)
+void AliVZEROReconstructor::Init()
 {
 // initializer
 
-  fRunLoader = runLoader;
   fESDVZERO  = new AliESDVZERO;
 }
 
@@ -85,12 +83,13 @@ void AliVZEROReconstructor::ConvertDigits(AliRawReader* rawReader, TTree* digits
 
   rawReader->Reset();
   AliVZERORawStream rawStream(rawReader);
-  while (rawStream.Next()) {
-    Int_t pmNumber = rawStream.GetCell();
-    Int_t adc = rawStream.GetADC();  
-    Int_t time = rawStream.GetTime();
+  if (rawStream.Next()) {
+    for(Int_t iChannel = 0; iChannel < 64; iChannel++) {
+    Int_t adc = rawStream.GetADC(iChannel);  
+    Int_t time = rawStream.GetTime(iChannel);
     new ((*digitsArray)[digitsArray->GetEntriesFast()])
-      AliVZEROdigit(pmNumber,adc,time);
+      AliVZEROdigit(iChannel,adc,time);
+    }
   }
 
   digitsTree->Fill();
@@ -98,7 +97,7 @@ void AliVZEROReconstructor::ConvertDigits(AliRawReader* rawReader, TTree* digits
 
 //______________________________________________________________________
 void AliVZEROReconstructor::FillESD(TTree* digitsTree, TTree* /*clustersTree*/,
-                                   AliESD* esd) const
+                                   AliESDEvent* esd) const
 {
 // fills multiplicities to the ESD
 
@@ -143,22 +142,25 @@ void AliVZEROReconstructor::FillESD(TTree* digitsTree, TTree* /*clustersTree*/,
     for (Int_t d=0; d<nDigits; d++) {    
       AliVZEROdigit* digit = (AliVZEROdigit*)digitsArray->At(d);      
       Int_t  pmNumber      = digit->PMNumber();  
-      adc[pmNumber] = digit->ADC();  
-      if (pmNumber<=31) {
-        if (pmNumber<=7) multV0C[0]=multV0C[0]+ float(adc[pmNumber])/mip[pmNumber];
-       if (pmNumber>=8  && pmNumber<=15) multV0C[1]=multV0C[1]+ float(adc[pmNumber])/mip[pmNumber];
-       if (pmNumber>=16 && pmNumber<=23) multV0C[2]=multV0C[2]+ float(adc[pmNumber])/mip[pmNumber];
-       if (pmNumber>=24 && pmNumber<=31) multV0C[3]=multV0C[3]+ float(adc[pmNumber])/mip[pmNumber];
-        adcV0C = adcV0C + float(adc[pmNumber])/mip[pmNumber];
-       if(adc[pmNumber] > 4) nbPMV0C++;
-      }        
-      if (pmNumber>=32) {
-        if (pmNumber>=32 && pmNumber<=39) multV0A[0]=multV0A[0]+ float(adc[pmNumber])/mip[pmNumber];
-       if (pmNumber>=40 && pmNumber<=47) multV0A[1]=multV0A[1]+ float(adc[pmNumber])/mip[pmNumber];
-       if (pmNumber>=48 && pmNumber<=55) multV0A[2]=multV0A[2]+ float(adc[pmNumber])/mip[pmNumber];
-       if (pmNumber>=56 && pmNumber<=63) multV0A[3]=multV0A[3]+ float(adc[pmNumber])/mip[pmNumber];
-        adcV0A = adcV0A + float(adc[pmNumber])/mip[pmNumber];
-       if(adc[pmNumber] > 4) nbPMV0A++;
+      adc[pmNumber] = digit->ADC(); 
+      // cut of ADC at MIP/2
+      if  (adc[pmNumber] > (mip[pmNumber]/2)) { 
+        if (pmNumber<=31) {
+          if (pmNumber<=7) multV0C[0]=multV0C[0]+ float(adc[pmNumber])/mip[pmNumber];
+         if (pmNumber>=8  && pmNumber<=15) multV0C[1]=multV0C[1]+ float(adc[pmNumber])/mip[pmNumber];
+         if (pmNumber>=16 && pmNumber<=23) multV0C[2]=multV0C[2]+ float(adc[pmNumber])/mip[pmNumber];
+         if (pmNumber>=24 && pmNumber<=31) multV0C[3]=multV0C[3]+ float(adc[pmNumber])/mip[pmNumber];
+          adcV0C = adcV0C + float(adc[pmNumber])/mip[pmNumber];
+         nbPMV0C++;
+        }      
+        if (pmNumber>=32 ) {
+          if (pmNumber>=32 && pmNumber<=39) multV0A[0]=multV0A[0]+ float(adc[pmNumber])/mip[pmNumber];
+         if (pmNumber>=40 && pmNumber<=47) multV0A[1]=multV0A[1]+ float(adc[pmNumber])/mip[pmNumber];
+         if (pmNumber>=48 && pmNumber<=55) multV0A[2]=multV0A[2]+ float(adc[pmNumber])/mip[pmNumber];
+         if (pmNumber>=56 && pmNumber<=63) multV0A[3]=multV0A[3]+ float(adc[pmNumber])/mip[pmNumber];
+          adcV0A = adcV0A + float(adc[pmNumber])/mip[pmNumber];
+         nbPMV0A++;
+        }
       }
     } // end of loop over digits
     
@@ -223,21 +225,21 @@ AliVZEROCalibData* AliVZEROReconstructor::GetCalibData() const
 
   entry = man->Get("VZERO/Calib/Data");
 
-  if(!entry){
-    AliWarning("Load of calibration data from default storage failed!");
-    AliWarning("Calibration data will be loaded from local storage ($ALICE_ROOT)");
-    Int_t runNumber = man->GetRun();
-    entry = man->GetStorage("local://$ALICE_ROOT")
-      ->Get("VZERO/Calib/Data",runNumber);
-       
-  }
+//   if(!entry){
+//     AliWarning("Load of calibration data from default storage failed!");
+//     AliWarning("Calibration data will be loaded from local storage ($ALICE_ROOT)");
+//     Int_t runNumber = man->GetRun();
+//     entry = man->GetStorage("local://$ALICE_ROOT")
+//       ->Get("VZERO/Calib/Data",runNumber);
+//     
+//   }
 
   // Retrieval of data in directory VZERO/Calib/Data:
 
   AliVZEROCalibData *calibdata = 0;
 
   if (entry) calibdata = (AliVZEROCalibData*) entry->GetObject();
-  if (!calibdata)  AliError("No calibration data from calibration database !");
+  if (!calibdata)  AliFatal("No calibration data from calibration database !");
 
   return calibdata;
 }