Taking into account that only 1 or 2 values may be present for the

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

diff --git a/FMD/AliFMDDigitizer.cxx b/FMD/AliFMDDigitizer.cxx
index 2be36313fa68519e05234dda44ea02e8970383ed..c17a265073221a93ba75a8e3f49887dbe8a28a26 100644 (file)
--- a/FMD/AliFMDDigitizer.cxx
+++ b/FMD/AliFMDDigitizer.cxx
@@ -270,7 +270,7 @@ AliFMDDigitizer::Exec(Option_t*)
                    folderName.Data()));
       return;
     }
-    runLoader->LoadgAlice();
+    if (!runLoader->GetAliRun()) runLoader->LoadgAlice();
     runLoader->GetAliRun();
   }
   if (!gAlice) { 
@@ -339,6 +339,7 @@ AliFMDDigitizer::Exec(Option_t*)
     fFMD->SetTreeAddress();
 
     // Sum contributions from the sdigits
+    AliFMDDebug(3, ("Will now sum contributions from SDigits"));
     SumContributions(sdigitsBranch);
 
     // Unload the sdigits
@@ -365,7 +366,7 @@ AliFMDDigitizer::Exec(Option_t*)
   
   // Fill the tree
   Int_t write = outTree->Fill();
-  AliFMDDebug(1, ("Wrote %d bytes to digit tree", write));
+  AliFMDDebug(5, ("Wrote %d bytes to digit tree", write));
   
   // Store the digits
   StoreDigits(outFMD);
@@ -377,7 +378,7 @@ AliFMDDigitizer::SumContributions(TBranch* sdigitsBranch)
 {
   // Sum energy deposited contributions from each sdigits in a cache
   // (fEdep).  
-  AliFMDDebug(1, ("Runnin our version of SumContributions"));
+  AliFMDDebug(3, ("Runnin our version of SumContributions"));
 
   // Get a list of hits from the FMD manager 
   TClonesArray *fmdSDigits = fFMD->SDigits();
@@ -393,18 +394,31 @@ AliFMDDigitizer::SumContributions(TBranch* sdigitsBranch)
     
     // Get the number of sdigits 
     Int_t nsdigits = fmdSDigits->GetEntries ();
-    AliFMDDebug(1, ("Got %5d SDigits", nsdigits));
+    AliFMDDebug(3, ("Got %5d SDigits", nsdigits));
     for (Int_t sdigit = 0; sdigit < nsdigits; sdigit++) {
       // Get the sdigit number `sdigit'
       AliFMDSDigit* fmdSDigit = 
        static_cast<AliFMDSDigit*>(fmdSDigits->UncheckedAt(sdigit));
+
+      AliFMDDebug(5, ("Adding contribution of %d tracks", 
+                     fmdSDigit->GetNTrack()));
+      AliFMDDebug(15, ("Contrib from FMD%d%c[%2d,%3d] (%s) from track %d", 
+                      fmdSDigit->Detector(),
+                      fmdSDigit->Ring(),
+                      fmdSDigit->Sector(),
+                      fmdSDigit->Strip(),
+                      fmdSDigit->GetName(), 
+                      fmdSDigit->GetTrack(0)));
       
       // Extract parameters 
       AddContribution(fmdSDigit->Detector(),
                      fmdSDigit->Ring(),
                      fmdSDigit->Sector(),
                      fmdSDigit->Strip(),
-                     fmdSDigit->Edep());
+                     fmdSDigit->Edep(), 
+                     kTRUE,
+                     fmdSDigit->GetNTrack(),
+                     fmdSDigit->GetTracks());
     }  // sdigit loop
   } // event loop