Getting properly the run number and adding a protection in case of run number inconsi...

[u/mrichter/AliRoot.git] / STEER / AliDigitizer.cxx

diff --git a/STEER/AliDigitizer.cxx b/STEER/AliDigitizer.cxx
index 196a79aed8cd912d5d5d5a086a1427afe80edb95..a32be6e7ec423e3756ad3bfb7b879d00fd18db09 100644 (file)
--- a/STEER/AliDigitizer.cxx
+++ b/STEER/AliDigitizer.cxx
@@ -13,73 +13,79 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-////////////////////////////////////////////////////////////////////////
-//
+/* $Id$ */
+
+//----------------------------------------------------------------------
 //  Base Class for Detector specific Merging/Digitization   
-//                  
+//  Collaborates with AliRunDigitizer class                
 //  Author: Jiri Chudoba (CERN)
-//
-////////////////////////////////////////////////////////////////////////
-
-/*
-$Log$
-Revision 1.3.6.1  2002/07/24 10:08:13  alibrary
-Updating VirtualMC
-
-Revision 1.4  2002/07/17 07:29:53  jchudoba
-Add private method GetNInputStreams(). Do not use it, it's just a temporary fix the PHOS and EMCAL code.
-
-Revision 1.3  2001/11/14 14:50:33  jchudoba
-Pass custom name and title to the TTask base class
-
-Revision 1.2  2001/10/04 15:56:34  jchudoba
-TTask inheritance
-
-Revision 1.1  2001/07/27 13:02:06  jchudoba
-ABC for detector digits merging/digitization
-
-*/
+//----------------------------------------------------------------------
 
 // system includes
-#include <iostream.h>
+#include <Riostream.h>
 
 // ROOT includes
 
 // AliROOT includes
+#include "AliLog.h"
 #include "AliDigitizer.h"
 #include "AliRunDigitizer.h"
 
 ClassImp(AliDigitizer)
 
-AliDigitizer::AliDigitizer(const Text_t* name, const Text_t* title)
-  :TTask(name,title) 
+//_______________________________________________________________________
+AliDigitizer::AliDigitizer(const Text_t* name, const Text_t* title):
+  TTask(name,title),
+  fManager(0),
+  fRegionOfInterest(kTRUE)
 {
-//
-// dummy default ctor with name and title
-//
-  fManager = 0;
+  //
+  // Default ctor with name and title
+  //
 }
 
-AliDigitizer::AliDigitizer(AliRunDigitizer *manager, 
-                          const Text_t* name, const Text_t* title)
-  :TTask(name,title)
+//_______________________________________________________________________
+AliDigitizer::AliDigitizer(const AliDigitizer &dig):
+  TTask(dig.GetName(),dig.GetTitle()),
+  fManager(0),
+  fRegionOfInterest(kTRUE)
 {
-//
-// ctor with name and title
-//
-  fManager = manager;
-  manager->AddDigitizer(this);
+  //
+  // Copy ctor with
+  //
+  dig.Copy(*this);
 }
 
+//_______________________________________________________________________
+void AliDigitizer::Copy(TObject &) const
+{
+  AliFatal("Not yet implemented");
+}
+
+//_______________________________________________________________________
+AliDigitizer::AliDigitizer(AliRunDigitizer *manager, 
+                           const Text_t* name, const Text_t* title):
+  TTask(name,title),
+  fManager(manager),
+  fRegionOfInterest(kFALSE)
+{
+  //
+  // ctor with name and title
+  //
+  fManager->AddDigitizer(this);
+}
 
+//_______________________________________________________________________
+AliDigitizer::~AliDigitizer() 
+{
+}
 
-AliDigitizer::~AliDigitizer() {;}
-////////////////////////////////////////////////////////////////////////
+//_______________________________________________________________________
 Int_t AliDigitizer::GetNInputStreams() const
 {
-//
-// return number of input streams
-//
+  //
+  // return number of input streams
+  //
   Int_t nInputStreams = 0 ;
   if (fManager)
     nInputStreams = fManager->GetNinputs() ;