Merging changes from v4-04-Release

[u/mrichter/AliRoot.git] / PHOS / AliPHOSRaw2Digits.cxx

diff --git a/PHOS/AliPHOSRaw2Digits.cxx b/PHOS/AliPHOSRaw2Digits.cxx
index b7dc922a6755e778a039c17b695068e07f5f906d..219797a7a598d37ac4d6bddf316ae500b87c5c89 100644 (file)
--- a/PHOS/AliPHOSRaw2Digits.cxx
+++ b/PHOS/AliPHOSRaw2Digits.cxx
@@ -15,6 +15,11 @@
 
 /* $Id$ */
 
+/* History of cvs commits:
+ *
+ * $Log$
+ */
+
 //_________________________________________________________________________
 // Class designed to convert raw data to aliroot format. We assume, that
 // prototype is situated in the center of 3 PHOS module and convert prototype
@@ -61,15 +66,13 @@
 
 // --- Standard library ---
 
-#include <unistd.h>
+#include <stdio.h>
 
 // --- AliRoot header files ---
 #include "AliPHOSDigit.h"
 #include "AliPHOSConTableDB.h"
 #include "AliPHOSBeamTestEvent.h"
 #include "AliPHOSRaw2Digits.h"
-#include "AliPHOSv1.h"
-#include "../EVGEN/AliGenBox.h"
 #include "AliRun.h"
 
 ClassImp(AliPHOSRaw2Digits)
@@ -133,6 +136,7 @@ ClassImp(AliPHOSRaw2Digits)
 //____________________________________________________________________________ 
 AliPHOSRaw2Digits::AliPHOSRaw2Digits(AliPHOSRaw2Digits & r2d):TTask(r2d.GetName(), r2d.GetTitle()) 
 {
+  // cpy ctor
   fInName=r2d.fInName ;
 
   fMK1 =  r2d.fMK1 ;
@@ -167,7 +171,7 @@ AliPHOSRaw2Digits::~AliPHOSRaw2Digits()
   
 }
 //____________________________________________________________________________ 
-void AliPHOSRaw2Digits::Exec(Option_t * option){
+void AliPHOSRaw2Digits::Exec(const Option_t *){
   //This is steering method performing all the conversion
 
   if(!fIsInitialized) //need initialization
@@ -192,7 +196,7 @@ Bool_t AliPHOSRaw2Digits::Init(void){
 
 }
 //____________________________________________________________________________ 
-Bool_t AliPHOSRaw2Digits::StartRootFiles(void ){
+Bool_t AliPHOSRaw2Digits::StartRootFiles(void ) const {
 //   //Create PHOS geometry, sets magnetic field to zero, 
 //   //create Generator - to store target position, 
 //   //opens out file, creates TreeE 
@@ -634,7 +638,7 @@ void AliPHOSRaw2Digits::WriteDigits(void){
   gAlice->TreeE()->Fill();
 }
 //____________________________________________________________________________ 
-void AliPHOSRaw2Digits::Print(Option_t * option)const{
+void AliPHOSRaw2Digits::Print(const Option_t *)const{
   //prints current configuration and status.
 
   printf("----------AliPHOSRaw2Digits---------- \n") ;