From: schutz <schutz@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Thu, 12 Dec 2002 15:06:44 +0000 (+0000)
Subject: MixWith signature changed
X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=58649d9d227e8605f2994c9266effa80f328f7ea

MixWith signature changed
---

diff --git a/PHOS/AliPHOSDigitizer.cxx b/PHOS/AliPHOSDigitizer.cxx
index b8e40092c93..9b464730644 100644
--- a/PHOS/AliPHOSDigitizer.cxx
+++ b/PHOS/AliPHOSDigitizer.cxx
@@ -567,7 +567,7 @@ void AliPHOSDigitizer::InitParameters()
 }
 
 //__________________________________________________________________
-void AliPHOSDigitizer::MixWith(const char* headerFile)
+void AliPHOSDigitizer::MixWith(const char* headerFile,const char* brname)
 {
   // Allows to produce digits by superimposing background and signal event.
   // It is assumed, that headers file with SIGNAL events is opened in 
@@ -598,16 +598,17 @@ void AliPHOSDigitizer::MixWith(const char* headerFile)
   // before it was ???? "Folders/RunMC/Event/Data/PHOS/SDigits" ; 
   path += headerFile ; 
   path += "/" ; 
-  path += GetName() ;
+  if(brname)
+     path += brname ; 
+  else
+    path += GetName() ;
   if ( gROOT->FindObjectAny(path.Data()) ) {
     Warning("MixWith", "Entry already exists, do not add\n" ) ;
     return;
   }
-  
   gime->PostSDigits(GetName(),headerFile) ;
-  
   // check if the requested file is already open or exist and if SDigits Branch exist
-  TFile * file = (TFile*)gROOT->FindObject(headerFile); 
+  TFile * file = (TFile*)gROOT->GetFile(headerFile); 
   if ( !file ) { 
     file = new TFile(headerFile, "READ") ; 
     if (!file) { 
diff --git a/PHOS/AliPHOSDigitizer.h b/PHOS/AliPHOSDigitizer.h
index 29596fb2c71..cb62592affa 100644
--- a/PHOS/AliPHOSDigitizer.h
+++ b/PHOS/AliPHOSDigitizer.h
@@ -68,7 +68,7 @@ public:
 
   //General
   const Int_t   GetDigitsInRun()  const { return fDigitsInRun ;}  
-  void    MixWith(const char* HeaderFile) ; // Add another one file to mix
+  void    MixWith(const char* HeaderFile,const char* brname = 0) ; // Add another one file to mix
   void    Print(Option_t* option)const ;
  
   AliPHOSDigitizer & operator = (const AliPHOSDigitizer & rvalue)  {