Load pythia libraries.

[u/mrichter/AliRoot.git] / FMD / AliFMDDigitizer.cxx

diff --git a/FMD/AliFMDDigitizer.cxx b/FMD/AliFMDDigitizer.cxx
index ab26a1eb6077d93459a2ff90c486752e8d61c5f1..bd421ec7b8dd93318787cee0ffd3aaecbda4a67a 100644 (file)
--- a/FMD/AliFMDDigitizer.cxx
+++ b/FMD/AliFMDDigitizer.cxx
@@ -197,8 +197,9 @@
 //
 
 #include <TTree.h>             // ROOT_TTree
-//#include <TRandom.h>         // ROOT_TRandom
-#include <AliLog.h>            // ALILOG_H
+#include <TRandom.h>           // ROOT_TRandom
+// #include <AliLog.h>         // ALILOG_H
+#include "AliFMDDebug.h" // Better debug macros
 #include "AliFMDDigitizer.h"   // ALIFMDDIGITIZER_H
 #include "AliFMD.h"            // ALIFMD_H
 // #include "AliFMDGeometry.h" // ALIFMDGEOMETRY_H
@@ -227,7 +228,7 @@ AliFMDDigitizer::AliFMDDigitizer(AliRunDigitizer* manager)
   : AliFMDBaseDigitizer(manager)
 {
   // Normal CTOR
-  AliDebug(1," processed");
+  AliFMDDebug(1, (" processed"));
 }
 
 //____________________________________________________________________
@@ -262,7 +263,7 @@ AliFMDDigitizer::Exec(Option_t*)
 
   Int_t nFiles= fManager->GetNinputs();
   for (Int_t inputFile = 0; inputFile < nFiles; inputFile++) {
-    AliDebug(1,Form(" Digitizing event number %d",
+    AliFMDDebug(1, (" Digitizing event number %d",
                    fManager->GetOutputEventNr()));
     // Get the current loader 
     fRunLoader = 
@@ -290,7 +291,7 @@ AliFMDDigitizer::Exec(Option_t*)
   // Fill the tree 
   Int_t write = 0;
   write = digitTree->Fill();
-  AliDebug(1, Form("Wrote %d bytes to digit tree", write));
+  AliFMDDebug(1, ("Wrote %d bytes to digit tree", write));
   
   // Write the digits to disk 
   outFMD->WriteDigits("OVERWRITE");
@@ -326,10 +327,12 @@ AliFMDDigitizer::AddDigit(AliFMD*  fmd,
                          Float_t  /* edep */, 
                          UShort_t count1, 
                          Short_t  count2, 
-                         Short_t  count3) const
+                         Short_t  count3,
+                         Short_t  count4) const
 {
   // Add a digit
-  fmd->AddDigitByFields(detector, ring, sector, strip, count1, count2, count3);
+  fmd->AddDigitByFields(detector, ring, sector, strip, 
+                       count1, count2, count3, count4);
 }
 
 //____________________________________________________________________
@@ -351,6 +354,7 @@ AliFMDDigitizer::CheckDigit(AliFMDDigit*    digit,
   Int_t             integral = counts[0];
   if (counts[1] >= 0) integral += counts[1];
   if (counts[2] >= 0) integral += counts[2];
+  if (counts[3] >= 0) integral += counts[3];
   integral -= Int_t(mean + 2 * width);
   if (integral < 0) integral = 0;