Test beam raw data reading

[u/mrichter/AliRoot.git] / EMCAL / AliEMCALSDigitizer.cxx

diff --git a/EMCAL/AliEMCALSDigitizer.cxx b/EMCAL/AliEMCALSDigitizer.cxx
index ffa878f18f4ca437140fa9879d83525996bb16e4..476610b447e30ede56ceb81cad2140837f74cc31 100644 (file)
--- a/EMCAL/AliEMCALSDigitizer.cxx
+++ b/EMCAL/AliEMCALSDigitizer.cxx
@@ -54,6 +54,7 @@
 #include <TBrowser.h>
 #include <Riostream.h>
 #include <TMath.h>
+#include <TROOT.h>
 
 // --- Standard library ---
 #include "stdlib.h"
@@ -72,44 +73,62 @@
 ClassImp(AliEMCALSDigitizer)
            
 //____________________________________________________________________________ 
-  AliEMCALSDigitizer::AliEMCALSDigitizer():TTask("","") 
+AliEMCALSDigitizer::AliEMCALSDigitizer()
+  : TTask("",""),
+    fA(0.),fB(0.),fECPrimThreshold(0.),
+    fDefaultInit(kTRUE),
+    fEventFolderName(0),
+    fInit(0),
+    fSDigitsInRun(0),
+    fFirstEvent(0),
+    fLastEvent(0),
+    fSampling(0.),
+    fControlHists(0),
+    fHists(0)
 {
   // ctor
-  fFirstEvent = fLastEvent  = fControlHists = 0;  
-  fDefaultInit = kTRUE ; 
-  fHists = 0;
+  InitParameters();
 }
 
 //____________________________________________________________________________ 
 AliEMCALSDigitizer::AliEMCALSDigitizer(const char * alirunFileName, 
-                                      const char * eventFolderName):
-  TTask("EMCAL"+AliConfig::Instance()->GetSDigitizerTaskName(), alirunFileName),
-  fEventFolderName(eventFolderName)
+                                      const char * eventFolderName)
+  : TTask("EMCAL"+AliConfig::Instance()->GetSDigitizerTaskName(), alirunFileName),
+    fA(0.),fB(0.),fECPrimThreshold(0.),
+    fDefaultInit(kFALSE),
+    fEventFolderName(eventFolderName),
+    fInit(0),
+    fSDigitsInRun(0),
+    fFirstEvent(0),
+    fLastEvent(0),
+    fSampling(0.),
+    fControlHists(1),
+    fHists(0)
 {
   // ctor
-  fFirstEvent = fLastEvent  = fControlHists = 0 ; // runs one event by defaut  
   Init();
   InitParameters() ; 
-  fDefaultInit = kFALSE ; 
-  fHists = 0;
-  fControlHists = 1;
   if(fControlHists) BookControlHists(1);
 }
 
 
 //____________________________________________________________________________ 
-AliEMCALSDigitizer::AliEMCALSDigitizer(const AliEMCALSDigitizer & sd) : TTask(sd) {
+AliEMCALSDigitizer::AliEMCALSDigitizer(const AliEMCALSDigitizer & sd) 
+  : TTask(sd.GetName(),sd.GetTitle()),
+    fA(sd.fA),
+    fB(sd.fB),
+    fECPrimThreshold(sd.fECPrimThreshold),
+    fDefaultInit(sd.fDefaultInit),
+    fEventFolderName(sd.fEventFolderName),
+    fInit(sd.fInit),
+    fSDigitsInRun(sd.fSDigitsInRun),
+    fFirstEvent(sd.fFirstEvent),
+    fLastEvent(sd.fLastEvent),
+    fSampling(sd.fSampling),
+    fControlHists(sd.fControlHists),
+    fHists(sd.fHists)
+{
   //cpy ctor 
-
-  fFirstEvent    = sd.fFirstEvent ; 
-  fLastEvent     = sd.fLastEvent ;
-  fA             = sd.fA ;
-  fB             = sd.fB ;
-  fECPrimThreshold  = sd.fECPrimThreshold ;
-  fSDigitsInRun  = sd.fSDigitsInRun ;
-  SetName(sd.GetName()) ; 
-  SetTitle(sd.GetTitle()) ; 
-  fEventFolderName = sd.fEventFolderName;
 }
 
 
@@ -130,7 +149,7 @@ void AliEMCALSDigitizer::Init(){
   //============================================================= YS
   //  The initialisation is now done by the getter
 
-  fInit = kTRUE ; 
+  fInit = kTRUE; 
    
   AliEMCALLoader *emcalLoader = dynamic_cast<AliEMCALLoader*>(AliRunLoader::GetRunLoader()->GetDetectorLoader("EMCAL"));
 
@@ -155,12 +174,25 @@ void AliEMCALSDigitizer::InitParameters()
   }
   // Initializes parameters
   fA         = 0;
-  fB         = 1.e+7;
+  fB         = 1.e+6;  // Changed 24 Apr 2007. Dynamic range now 2 TeV
   fSampling  = geom->GetSampling();
 
- // threshold for deposit energy of hit
-  fECPrimThreshold  = 0.; // 24-nov-04 - was 1.e-6;
-  Print("");
+  // threshold for deposit energy of hit
+  fECPrimThreshold  = 0.05;// GeV // 22-may-07 was 0// 24-nov-04 - was 1.e-6;
+  
+  AliDebug(2,Form("Print: \n------------------- %s -------------\n",GetName()));
+  AliDebug(2,Form("   fInit                                 %i\n", int(fInit)));
+  AliDebug(2,Form("   fFirstEvent                           %i\n", fFirstEvent));
+  AliDebug(2,Form("   fLastEvent                            %i\n", fLastEvent));
+  AliDebug(2,Form("   Writing SDigits to branch with title  %s\n", fEventFolderName.Data()));
+  AliDebug(2,Form("   with digitization parameters       A = %f\n", fA));
+  AliDebug(2,Form("                                      B = %f\n", fB));
+  AliDebug(2,Form("   Threshold for EC Primary assignment  = %f\n", fECPrimThreshold));
+  AliDebug(2,Form("   Sampling                             = %f\n", fSampling));
+  AliDebug(2,Form("---------------------------------------------------\n"));
+
+  //  Print("");
+
 }
 
 //____________________________________________________________________________
@@ -169,7 +201,19 @@ void AliEMCALSDigitizer::Exec(Option_t *option)
   // Collects all hit of the same tower into digits
   TString o(option); o.ToUpper();
   if (strstr(option, "print") ) {
-    Print() ; 
+
+    AliDebug(2,Form("Print: \n------------------- %s -------------\n",GetName()));
+    AliDebug(2,Form("   fInit                                 %i\n", int(fInit)));
+    AliDebug(2,Form("   fFirstEvent                           %i\n", fFirstEvent));
+    AliDebug(2,Form("   fLastEvent                            %i\n", fLastEvent));
+    AliDebug(2,Form("   Writing SDigits to branch with title  %s\n", fEventFolderName.Data()));
+    AliDebug(2,Form("   with digitization parameters       A = %f\n", fA));
+    AliDebug(2,Form("                                      B = %f\n", fB));
+    AliDebug(2,Form("   Threshold for EC Primary assignment  = %f\n", fECPrimThreshold));
+    AliDebug(2,Form("   Sampling                             = %f\n", fSampling));
+    AliDebug(2,Form("---------------------------------------------------\n"));
+
+    //    Print();
     return ; 
   }
   
@@ -224,12 +268,14 @@ void AliEMCALSDigitizer::Exec(Option_t *option)
          // Assign primary number only if deposited energy is significant
          curSDigit =  new AliEMCALDigit( hit->GetPrimary(),
                                          hit->GetIparent(), hit->GetId(), 
-                                         Digitize(energy), hit->GetTime() ) ;
+                                         Digitize(energy), hit->GetTime(), 
+                                         -1, energy ) ;
          else
            curSDigit =  new AliEMCALDigit( -1               , 
                                            -1               ,
                                            hit->GetId(), 
-                                           Digitize(energy), hit->GetTime() ) ;
+                                           Digitize(energy), hit->GetTime(), 
+                                           -1, energy ) ;
       } else {
        Warning("Exec"," abs id %i is bad \n", hit->GetId());
        newsdigit = kFALSE;
@@ -413,7 +459,7 @@ TList *AliEMCALSDigitizer::BookControlHists(int var)
   gROOT->cd();
   const AliEMCALGeometry *geom = AliEMCALGeometry::GetInstance() ;
   if(var>=1){
-    printf(" AliEMCALSDigitizer::BookControlHists() in action \n");
+    AliDebug(1, " BookControlHists() in action ");
     new TH1F("HSDigiN",  "#EMCAL  sdigits ", 1001, -0.5, 1000.5);
     new TH1F("HSDigiSumEnergy","Sum.EMCAL energy", 1000, 0.0, 100.);
     new TH1F("HSDigiAmp",  "EMCAL sdigits amplitude", 1000, 0., 2.e+9);
@@ -423,7 +469,7 @@ TList *AliEMCALSDigitizer::BookControlHists(int var)
   }
 
   fHists = AliEMCALHistoUtilities::MoveHistsToList("EmcalSDigiControlHists", kFALSE);
-  fHists = 0;
+  //  fHists = 0; ??
 
   return fHists;
 }