Implementing MUON in AliSimulation framework. For the moment Hits2Digits is empty...

diff --git a/MUON/AliMUON.cxx b/MUON/AliMUON.cxx
index 0ee4b5cd40e26ed152d2fdb29a485e65d092fb79..06da5b30fd241e05e0de724b0995ca8c032bd06d 100644 (file)
--- a/MUON/AliMUON.cxx
+++ b/MUON/AliMUON.cxx
@@ -243,9 +243,9 @@ void  AliMUON::SetTreeAddress()
   //  GetMUONData()->MakeBranch("D,S,RC");
   //  GetMUONData()->SetTreeAddress("H,D,S,RC");
   GetMUONData()->SetTreeAddress("H");
   //  GetMUONData()->MakeBranch("D,S,RC");
   //  GetMUONData()->SetTreeAddress("H,D,S,RC");
   GetMUONData()->SetTreeAddress("H");

-

   if (fHits !=  GetMUONData()->Hits())  {
   if (fHits !=  GetMUONData()->Hits())  {

-    if (gAlice->GetMCApp())
+    if ( gAlice->GetMCApp() )
+      if ( gAlice->GetMCApp()->GetHitLists() )

       gAlice->GetMCApp()->AddHitList (fHits); // For purifyKine, only necessary when Hit list is created in AliMUONData
   }
   fHits = GetMUONData()->Hits(); // Added by Ivana to use the methods FisrtHit, NextHit of AliDetector
       gAlice->GetMCApp()->AddHitList (fHits); // For purifyKine, only necessary when Hit list is created in AliMUONData
   }
   fHits = GetMUONData()->Hits(); // Added by Ivana to use the methods FisrtHit, NextHit of AliDetector


@@ -443,9 +443,8 @@ void AliMUON::SDigits2Digits()
 //_____________________________________________________________________
 void AliMUON::Hits2SDigits()
 {
 //_____________________________________________________________________
 void AliMUON::Hits2SDigits()
 {

-  // make SDigits from hits
-  AliMUONSDigitizerv1 SDigitizer = AliMUONSDigitizerv1();
-  SDigitizer.Exec(); // make SDigits for current event
+  // Empty for the moment which means that AliSimulation is 
+  // using AliMUONDigitalisationv1 and SDigits are not created. MErging is done at the Hit level

 }
 //_______________________________________________________________________
 AliLoader* AliMUON::MakeLoader(const char* topfoldername)
 }
 //_______________________________________________________________________
 AliLoader* AliMUON::MakeLoader(const char* topfoldername)