Fixing Coding violations

diff --git a/DISPLAY/AliDisplayClusters.cxx b/DISPLAY/AliDisplayClusters.cxx
index f8574bed886b3e9769950c296b54a77170ee7893..b58b2087d026e461da78b38a8af372cc36d22176 100644 (file)
--- a/DISPLAY/AliDisplayClusters.cxx
+++ b/DISPLAY/AliDisplayClusters.cxx
@@ -20,24 +20,23 @@
 /////////////////////////////////////////////////////////////////////////
 
 #include <Riostream.h>
+#include <TFile.h>
 #include <TPolyMarker3D.h>
 
+#include "AliClusters.h"
+#include "AliDisplay2.h"
 #include "AliDisplayClusters.h"
-#include "AliModuleInfo.h"
-
-#include "AliRun.h"
-#include "AliRunLoader.h"
 #include "AliITS.h"
 #include "AliITSLoader.h"
-#include "AliITSgeom.h"
 #include "AliITSclusterV2.h"
-#include "AliTPCParam.h"
+#include "AliITSgeom.h"
+#include "AliModuleInfo.h"
+#include "AliRun.h"
+#include "AliRunLoader.h"
 #include "AliTPCLoader.h"
-#include "AliClusters.h"
+#include "AliTPCParam.h"
 #include "AliTPCcluster.h"
 
-#include "AliDisplay2.h"
-
 ClassImp(AliDisplayClusters);
 
 //_____________________________________________________________

diff --git a/EMCAL/AliEMCALGetter.cxx b/EMCAL/AliEMCALGetter.cxx
index b0a896265cf6dbf987e3fa7ecabbc65b2f496d03..dc14f7a3a3e0e2ab0398e4656068595eddeedce7 100644 (file)
--- a/EMCAL/AliEMCALGetter.cxx
+++ b/EMCAL/AliEMCALGetter.cxx
@@ -40,21 +40,22 @@
 
 // --- ROOT system ---
 
-#include "TSystem.h"
-#include "TROOT.h"
+#include <TFile.h>
+#include <TROOT.h>
+#include <TSystem.h>
 
 
 // --- Standard library ---
 
 // --- AliRoot header files ---
 
-#include "AliEMCALGetter.h"
 #include "AliEMCAL.h"
-#include "AliRunLoader.h"
-#include "AliStack.h"  
-#include "AliHeader.h"  
+#include "AliEMCALGetter.h"
 #include "AliEMCALLoader.h"
+#include "AliHeader.h"  
 #include "AliMC.h"
+#include "AliRunLoader.h"
+#include "AliStack.h"  
 
 ClassImp(AliEMCALGetter)
   

diff --git a/EMCAL/AliEMCALJetMicroDst.cxx b/EMCAL/AliEMCALJetMicroDst.cxx
index 438702b1dcc035ef7fd31581e5ee8b0c90cb53fd..79328b60282defe6acdf85e011be05907ad81a69 100644 (file)
--- a/EMCAL/AliEMCALJetMicroDst.cxx
+++ b/EMCAL/AliEMCALJetMicroDst.cxx
@@ -20,21 +20,22 @@
 
 //*
 
+#include <TBrowser.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2.h>
+#include <TParticle.h>
+#include <TROOT.h>
+#include <TString.h>
+#include <TVector3.h>
+
+#include "AliEMCALJetFinder.h"
 #include "AliEMCALJetMicroDst.h"
-#include "AliRun.h"
-#include "AliHeader.h"
 #include "AliGenEventHeader.h"
 #include "AliGenHijingEventHeader.h"
-#include "AliEMCALJetFinder.h"
-#include <TVector3.h>
-#include <TROOT.h>
-#include <TBrowser.h>
-#include <TString.h>
-#include <TParticle.h>
+#include "AliHeader.h"
 #include "AliMC.h"
-#include <TH2.h>
-#include <TH1F.h>
-
+#include "AliRun.h"
 
 ClassImp(AliEMCALJetMicroDst)
 

diff --git a/HBTAN/AliHBTReaderITSv1.cxx b/HBTAN/AliHBTReaderITSv1.cxx
index fed34df6fae8ff7f75dcb93486b5f9e3e7c9da17..11ec99f2078adfb77803a116f135346a07f59d50 100644 (file)
--- a/HBTAN/AliHBTReaderITSv1.cxx
+++ b/HBTAN/AliHBTReaderITSv1.cxx
@@ -8,24 +8,23 @@
 //                                                                  //
 //////////////////////////////////////////////////////////////////////
 
-#include "AliHBTReaderITSv1.h"
-#include "AliHBTRun.h"
-#include "AliHBTParticle.h"
-#include "AliHBTParticleCut.h"
-
 #include <Riostream.h>
-
-#include <TTree.h>
 #include <TBranch.h>
+#include <TFile.h>
 #include <TObjArray.h>
 #include <TParticle.h>
 #include <TString.h>
+#include <TTree.h>
 
-#include <AliRun.h>
-#include <AliStack.h>
-#include <AliMagF.h>
-#include <AliKalmanTrack.h>
-#include <AliITSIOTrack.h>
+#include "AliHBTParticle.h"
+#include "AliHBTParticleCut.h"
+#include "AliHBTReaderITSv1.h"
+#include "AliHBTRun.h"
+#include "AliITSIOTrack.h"
+#include "AliKalmanTrack.h"
+#include "AliMagF.h"
+#include "AliRun.h"
+#include "AliStack.h"
 
 ClassImp(AliHBTReaderITSv1)
 /********************************************************************/

diff --git a/HBTAN/AliHBTTrackPoints.cxx b/HBTAN/AliHBTTrackPoints.cxx
index 91f3b7a3290a37c703c841f532a4961d76d7a8fd..673aa8bb156812cbeb1a51333b9b6ba5daa5164d 100644 (file)
--- a/HBTAN/AliHBTTrackPoints.cxx
+++ b/HBTAN/AliHBTTrackPoints.cxx
@@ -1,4 +1,3 @@
-#include "AliHBTTrackPoints.h"
 //_________________________________
 ////////////////////////////////////////////////////////////
 //                                                        //
@@ -12,13 +11,15 @@
 // different events (that are use to fill deniminators)   //
 //                                                        //
 ////////////////////////////////////////////////////////////
-#include "AliTrackReference.h"
-
-#include "AliTPCtrack.h"
-#include "AliESDtrack.h"
 
-#include <TMath.h>
 #include <TClonesArray.h>
+#include <TFile.h>
+#include <TMath.h>
+
+#include "AliESDtrack.h"
+#include "AliHBTTrackPoints.h"
+#include "AliTPCtrack.h"
+#include "AliTrackReference.h"
 
 ClassImp(AliHBTTrackPoints)
 

diff --git a/MONITOR/AliMonitorProcess.cxx b/MONITOR/AliMonitorProcess.cxx
index 9a0f3009d59a918ebc799a62d345254f6f9a9973..9097d42954874f9894b5805c90209ab4734c08f3 100644 (file)
--- a/MONITOR/AliMonitorProcess.cxx
+++ b/MONITOR/AliMonitorProcess.cxx
@@ -25,6 +25,7 @@
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
+#include <TFile.h>
 #include <TGrid.h>
 #include <TGridResult.h>
 #include <TMessage.h>

diff --git a/PHOS/AliPHOSCalibrator.cxx b/PHOS/AliPHOSCalibrator.cxx
index 12634dff3f43d5c2b17bdb1abcbe2bbdd10541b6..30fbe2d319828e8d5454dcdbd181cad7f40863a0 100644 (file)
--- a/PHOS/AliPHOSCalibrator.cxx
+++ b/PHOS/AliPHOSCalibrator.cxx
@@ -45,18 +45,19 @@
 //////////////////////////////////////////////////////////////////////////////
 
 // --- ROOT system ---
-#include "TROOT.h"
 #include "TF1.h"
+#include "TFile.h"
 #include "TObjString.h"
+#include "TROOT.h"
 
 // --- Standard library ---
 
 // --- AliRoot header files ---
-#include "AliPHOSGetter.h"
-#include "AliPHOSCalibrator.h"
-#include "AliPHOSConTableDB.h"
 #include "AliPHOSCalibrManager.h"
 #include "AliPHOSCalibrationData.h"
+#include "AliPHOSCalibrator.h"
+#include "AliPHOSConTableDB.h"
+#include "AliPHOSGetter.h"
 
 ClassImp(AliPHOSCalibrator)
 

diff --git a/PHOS/AliPHOSGetter.cxx b/PHOS/AliPHOSGetter.cxx
index 63ec849b7002156ee4c87768cb8f45a0ed39e7bf..56dfbd3a84bf27bf203466014f520d4b1736480f 100644 (file)
--- a/PHOS/AliPHOSGetter.cxx
+++ b/PHOS/AliPHOSGetter.cxx
@@ -40,22 +40,23 @@
 
 // --- ROOT system ---
 
-#include "TSystem.h"
+#include "TFile.h"
 #include "TROOT.h"
+#include "TSystem.h"
 
 
 // --- Standard library ---
 
 // --- AliRoot header files ---
-#include "AliPHOSGetter.h"
+#include "AliESD.h"
+#include "AliHeader.h"  
+#include "AliMC.h"
 #include "AliPHOS.h"
+#include "AliPHOSBeamTestEvent.h"
+#include "AliPHOSGetter.h"
+#include "AliPHOSLoader.h"
 #include "AliRunLoader.h"
 #include "AliStack.h"  
-#include "AliHeader.h"  
-#include "AliPHOSLoader.h"
-#include "AliPHOSBeamTestEvent.h"
-#include "AliMC.h"
-#include "AliESD.h"
 
 ClassImp(AliPHOSGetter)
   

diff --git a/RICH/AliRICHRecon.cxx b/RICH/AliRICHRecon.cxx
index d0f74855c7e53798af051d40d839d959505b4fb1..16e4bc2756b720fe3c2e700a90fb9eebc135cb01 100644 (file)
--- a/RICH/AliRICHRecon.cxx
+++ b/RICH/AliRICHRecon.cxx
@@ -21,25 +21,26 @@
 //                                                                      //
 //////////////////////////////////////////////////////////////////////////
 
-
-#include "AliRICH.h"
-#include "AliRICHRecon.h"
-#include "AliRICHParam.h"
-#include "AliRICHChamber.h"
-#include <AliLoader.h>
-#include <AliRun.h>
-#include <AliStack.h>
 #include <Riostream.h>
-#include <TParticle.h>
+#include <TCanvas.h>
+#include <TFile.h>
 #include <TH2.h>
 #include <TMath.h>
-#include <TRandom.h>
+#include <TMath.h>
 #include <TMinuit.h>
 #include <TNtuple.h>
-#include <TMath.h>
+#include <TParticle.h>
+#include <TRandom.h>
 #include <TRotation.h>
 #include <TVector3.h>
-#include <TCanvas.h>
+
+#include "AliLoader.h"
+#include "AliRICH.h"
+#include "AliRICHChamber.h"
+#include "AliRICHParam.h"
+#include "AliRICHRecon.h"
+#include "AliRun.h"
+#include "AliStack.h"
 
 #define NPointsOfRing 201
 

diff --git a/STEER/AliDataLoader.cxx b/STEER/AliDataLoader.cxx
index cf59dd8b91c33febf66e0013814a044bceed42bd..3d918d79d3aba57a2156bf2082ae325c90f5fadb 100644 (file)
--- a/STEER/AliDataLoader.cxx
+++ b/STEER/AliDataLoader.cxx
@@ -382,7 +382,7 @@ AliRunLoader* AliDataLoader::GetRunLoader()
      Error("GetRunLoader","Can not get event folder.");
      return 0;
    }
-  rg = dynamic_cast<AliRunLoader*>(ef->FindObject(AliRunLoader::fgkRunLoaderName));
+  rg = dynamic_cast<AliRunLoader*>(ef->FindObject(AliRunLoader::GetRunLoaderName()));
   return rg;
 }
 

diff --git a/STEER/AliLoader.cxx b/STEER/AliLoader.cxx
index b48d7d991afd1b244e3e54814fc0680d79093f2d..5f1b3a5165e92136461fb1fa83fccf0c9e622db4 100644 (file)
--- a/STEER/AliLoader.cxx
+++ b/STEER/AliLoader.cxx
@@ -807,7 +807,7 @@ AliRunLoader* AliLoader::GetRunLoader()
 {
 //gets the run-loader from event folder
   AliRunLoader* rg = 0x0;
-  TObject * obj = GetEventFolder()->FindObject(AliRunLoader::fgkRunLoaderName);
+  TObject * obj = GetEventFolder()->FindObject(AliRunLoader::GetRunLoaderName());
   if (obj) rg = dynamic_cast<AliRunLoader*>(obj);
   return rg;
 }

diff --git a/STEER/AliMC.h b/STEER/AliMC.h
index 48735035abc30e5a8ef79ca3dabe92877f8ea80e..b6ee0015bd71646ed3b21b4031359af3097575a3 100644 (file)
--- a/STEER/AliMC.h
+++ b/STEER/AliMC.h
@@ -7,6 +7,7 @@
 
 #include <TArrayF.h>
 #include <TArrayI.h>
+#include <TMCProcess.h>
 #include <TVirtualMCApplication.h>
 
 class AliGenerator;

diff --git a/STEER/AliReconstruction.cxx b/STEER/AliReconstruction.cxx
index 23683df8231a4abcce551af76abef4cece07e620..4ee8f29404e81ec5ec5cd47cea682064f609e5d3 100644 (file)
--- a/STEER/AliReconstruction.cxx
+++ b/STEER/AliReconstruction.cxx
@@ -68,6 +68,11 @@
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
+#include <TArrayF.h>
+#include <TFile.h>
+#include <TSystem.h>
+#include <TROOT.h>
+#include <TPluginManager.h>
 
 #include "AliReconstruction.h"
 #include "AliRunLoader.h"
@@ -83,11 +88,6 @@
 #include "AliGenEventHeader.h"
 #include "AliESDpid.h"
 #include "AliMagF.h"
-#include <TArrayF.h>
-#include <TSystem.h>
-#include <TROOT.h>
-#include <TPluginManager.h>
-
 
 ClassImp(AliReconstruction)
 

diff --git a/STEER/AliRunLoader.cxx b/STEER/AliRunLoader.cxx
index ff0bcba6b16db5f7eeeace49ee04c7e8f3d58ff3..ad99c3a5b4e72c6f085a158eb6de689b32a78d6f 100644 (file)
--- a/STEER/AliRunLoader.cxx
+++ b/STEER/AliRunLoader.cxx
@@ -1,4 +1,3 @@
-#include "AliRunLoader.h"
 //____________________________________________________________________
 //////////////////////////////////////////////////////////////////////
 //                                                                  //
@@ -30,14 +29,12 @@
 //////////////////////////////////////////////////////////////////////
 
 #include <TBranch.h>
-#include <TError.h>
 #include <TFile.h>
 #include <TFolder.h>
 #include <TGeometry.h>
 #include <TObjArray.h>
-#include <TROOT.h>
 #include <TString.h>
-#include <TTask.h>
+class TTask;
 #include <TTree.h>
 
 #include "AliRun.h"
@@ -46,7 +43,7 @@
 #include "AliHeader.h"
 #include "AliStack.h"
 #include "AliDetector.h"
-#include "AliRunDigitizer.h"
+#include "AliRunLoader.h"
 
 ClassImp(AliRunLoader)
 
@@ -100,6 +97,26 @@ AliRunLoader::AliRunLoader(const char* eventfoldername):
 }
 /**************************************************************************/
 
+AliRunLoader::AliRunLoader(const AliRunLoader &rl):
+ TNamed(rl),
+ fLoaders(0x0),
+ fEventFolder(0x0),
+ fCurrentEvent(0),
+ fGAFile(0x0),
+ fHeader(0x0),
+ fStack(0x0),
+ fKineDataLoader(0x0),
+ fTrackRefsDataLoader(0x0),
+ fNEventsPerFile(0),
+ fUnixDirName(".")
+{
+  //
+  // Copy ctor
+  //
+  rl.Copy(*this);
+}
+/**************************************************************************/
+
 AliRunLoader::~AliRunLoader()
 {
 //dtor
@@ -167,6 +184,12 @@ AliRunLoader::AliRunLoader(TFolder* topfolder):
 }
 /**************************************************************************/
 
+void AliRunLoader::Copy(TObject &) const 
+{
+  Fatal("Copy","Not implemented");
+}
+/**************************************************************************/
+
 Int_t AliRunLoader::GetEvent(Int_t evno)
 {
 //Gets event number evno
@@ -318,10 +341,10 @@ AliRunLoader* AliRunLoader::Open
 //returns the pointer to run Loader which can be further used for accessing data 
 //in case of error returns NULL
  
- static const TString webaddress("http://alisoft.cern.ch/people/skowron/codedoc/split/index.html");
+ static const TString kwebaddress("http://alisoft.cern.ch/people/skowron/codedoc/split/index.html");
  if (AliLoader::GetDebug()) 
   ::Info("AliRunLoader::Open",
-         "\n\n\nNew I/O strcture: See more info:\n %s\n\n\n",webaddress.Data());
+         "\n\n\nNew I/O strcture: See more info:\n %s\n\n\n",kwebaddress.Data());
  
  AliRunLoader* result = 0x0;
  

diff --git a/STEER/AliRunLoader.h b/STEER/AliRunLoader.h
index 2989830104c2b987553126b63456ad0bda721570..55ea4da83323e67b636e491805be7fd2599fa1b6 100644 (file)
--- a/STEER/AliRunLoader.h
+++ b/STEER/AliRunLoader.h
@@ -23,11 +23,12 @@
 /////////////////////////////////////////////////////////////////////
 
 #include <TNamed.h>
-#include <TFile.h>
+
 #include "AliConfig.h"
 #include "AliLoader.h"
 #include "AliDataLoader.h"
 
+class TFile;
 class TString;
 class TFolder;
 class TObjArray;
@@ -50,6 +51,9 @@ class AliRunLoader: public TNamed
     AliRunLoader();
     AliRunLoader(const char* topfoldername);
     AliRunLoader(TFolder* topfolder);
+    AliRunLoader(const AliRunLoader &rl);
+    AliRunLoader & operator = (const AliRunLoader &rl) 
+      {rl.Copy(*this); return *this;}
     
     virtual ~AliRunLoader();
     
@@ -150,7 +154,7 @@ class AliRunLoader: public TNamed
     TString     GetFileName() const;//returns name of galice file
     const TObjArray* GetArrayOfLoaders() const {return fLoaders;}
     Int_t GetDebug() const {return AliLoader::GetDebug();}
-    void cd(){fgRunLoader = this;}
+    void Cd(){fgRunLoader = this;}
     void Synchronize();
     
     AliLoader*    GetDetectorLoader(const char* detname);
@@ -182,15 +186,16 @@ class AliRunLoader: public TNamed
     static TTask*           GetRunTracker();          //
     static TTask*           GetRunPIDTask();          // 
     static TTask*           GetRunQATask();           //
+
+    static TString GetRunLoaderName () {return fgkRunLoaderName;}
+    static TString GetHeaderContainerName () {return fgkHeaderContainerName;}
+    static TString GetKineContainerName () {return fgkKineContainerName;}
+    static TString GetTrackRefsContainerName () {return fgkTrackRefsContainerName;}
+    static TString GetHeaderBranchName () {return fgkHeaderBranchName;}
+    static TString GetKineBranchName () {return fgkKineBranchName;}
+    static TString GetGAliceName () {return fgkGAliceName;}
      
-    static const TString   fgkRunLoaderName;          //default name of the run loader
-    static const TString   fgkHeaderContainerName;    //default name of the kinematics container (TREE) name - TreeE
-    static const TString   fgkKineContainerName;      //default name of the kinematics container (TREE) name - TreeK
-    static const TString   fgkTrackRefsContainerName; //default name of the track references container (TREE) name - TreeTR
-    static const TString   fgkHeaderBranchName;       //default name of the branch containing the header
-    static const TString   fgkKineBranchName;         //default name of the branch with kinematics
-    static const TString   fgkGAliceName;             //default name for gAlice file    
-  protected:
+protected:
     /**********************************************/
     /************    PROTECTED      ***************/
     /*********        D A T A          ************/
@@ -238,6 +243,16 @@ class AliRunLoader: public TNamed
    
     static AliRunLoader* fgRunLoader; //pointer to the AliRunLoader instance
 
+private:
+    void Copy(TObject &arun) const;
+
+    static const TString   fgkRunLoaderName;          //default name of the run loader
+    static const TString   fgkHeaderContainerName;    //default name of the kinematics container (TREE) name - TreeE
+    static const TString   fgkKineContainerName;      //default name of the kinematics container (TREE) name - TreeK
+    static const TString   fgkTrackRefsContainerName; //default name of the track references container (TREE) name - TreeTR
+    static const TString   fgkHeaderBranchName;       //default name of the branch containing the header
+    static const TString   fgkKineBranchName;         //default name of the branch with kinematics
+    static const TString   fgkGAliceName;             //default name for gAlice file    
     
     ClassDef(AliRunLoader,1)
 };

diff --git a/STEER/AliStack.cxx b/STEER/AliStack.cxx
index 03bfdf84e4d5497446de648222bae9c2f082007f..a73c5a6c4698e65353dd8bd36744f37af68aac25 100644 (file)
--- a/STEER/AliStack.cxx
+++ b/STEER/AliStack.cxx
@@ -846,10 +846,10 @@ void AliStack::ConnectTree()
   else
     Warning("ConnectTree","DIR IS NOT SET !!!");
   
-  TBranch *branch=fTreeK->GetBranch(AliRunLoader::fgkKineBranchName);
+  TBranch *branch=fTreeK->GetBranch(AliRunLoader::GetKineBranchName());
   if(branch == 0x0)
    {
-    branch = fTreeK->Branch(AliRunLoader::fgkKineBranchName, "TParticle", &fParticleBuffer, 4000);
+    branch = fTreeK->Branch(AliRunLoader::GetKineBranchName(), "TParticle", &fParticleBuffer, 4000);
     if (AliLoader::GetDebug()) Info("ConnectTree","Creating Branch in Tree");
    }  
   else

diff --git a/STEER/AliStream.cxx b/STEER/AliStream.cxx
index c635d232a8d3f3a57a03243ec3e8dd891c05f0cf..58990f2053f04c90695f17f57217470aff69bfc2 100644 (file)
--- a/STEER/AliStream.cxx
+++ b/STEER/AliStream.cxx
@@ -15,6 +15,13 @@
 
 /* $Id$ */
 
+#include <TFile.h>
+#include <TObjString.h>
+
+#include "AliLoader.h"
+#include "AliRun.h"
+#include "AliStream.h"
+
 ////////////////////////////////////////////////////////////////////////
 //
 // AliStream.cxx
@@ -26,20 +33,6 @@
 //
 ////////////////////////////////////////////////////////////////////////
 
-#include <Riostream.h>
-
-#include "TTree.h"
-#include "TROOT.h"
-
-#include "AliStream.h"
-#include "AliRun.h"
-
-#include "TObjString.h"
-#include "TArrayI.h"
-#include "TClonesArray.h"
-#include "TFile.h"
-#include "AliLoader.h"
-
 ClassImp(AliStream)
 
 AliStream::AliStream():
@@ -51,8 +44,8 @@ AliStream::AliStream():
   fFileNames(0x0),
   fEventFolderName(0)
 {
-// root requires default ctor, where no new objects can be created
-// do not use this ctor, it is supplied only for root needs
+  // root requires default ctor, where no new objects can be created
+  // do not use this ctor, it is supplied only for root needs
 }
 //_______________________________________________________________________
 
@@ -69,6 +62,23 @@ AliStream::AliStream(const char* foldername,Option_t *option):
 }
 //_______________________________________________________________________
 
+AliStream::AliStream(const AliStream &as):
+  TNamed(as),
+  fLastEventSerialNr(-1),
+  fLastEventNr(0),
+  fCurrentFileIndex(-1),
+  fEvents(0),
+  fMode(0),
+  fFileNames(0x0),
+  fEventFolderName(" ")
+{
+  //
+  // Copy ctor
+  //
+  as.Copy(*this);
+}
+//_______________________________________________________________________
+
 AliStream::~AliStream()
 {
 // default dtor
@@ -77,6 +87,15 @@ AliStream::~AliStream()
 }
 //_______________________________________________________________________
 
+void AliStream::Copy(TObject &) const
+{
+  //
+  // Copy function
+  //
+  Fatal("Copy","Not implemented!");
+}
+//_______________________________________________________________________
+
 void AliStream::AddFile(const char *fileName)
 {
 // stores the name of the file
@@ -116,10 +135,10 @@ Bool_t AliStream::NextEventInStream()
 //_______________________________________________________________________
 
 void AliStream::ChangeMode(Option_t* option)
-// set the mode to READ or UPDATE, reopen file with the new mode
-// only change from UPDATE to READ have sense in the current scheme,
-// other changes are possible but not usefull
 {
+  // set the mode to READ or UPDATE, reopen file with the new mode
+  // only change from UPDATE to READ have sense in the current scheme,
+  // other changes are possible but not usefull
 
   fMode = option;
   AliRunLoader* currentloader = AliRunLoader::GetRunLoader(fEventFolderName);
@@ -133,6 +152,9 @@ void AliStream::ChangeMode(Option_t* option)
 
 Bool_t AliStream::OpenNextFile()
 {
+  //
+  // Opens next file in the list
+  //
   if (++fCurrentFileIndex > fFileNames->GetLast()) {
     Error("OpenNextFile", "No more files in the stream") ;
     return kFALSE;
@@ -186,6 +208,9 @@ Bool_t AliStream::OpenNextFile()
 
 Bool_t AliStream::ImportgAlice()
 {
+  //
+  // Imports gAlice object from file
+  //
   if (fFileNames->GetLast() < 0) return kFALSE;
   
   AliRunLoader* currentloader = AliRunLoader::GetRunLoader(fEventFolderName);
@@ -202,10 +227,10 @@ Bool_t AliStream::ImportgAlice()
 
 //_______________________________________________________________________
 TString AliStream::GetFileName(Int_t order) const
-// returns name of the order-th file
-// returns empty string if such file does not exist
-// first file in the input stream is 0
 {
+  // returns name of the order-th file
+  // returns empty string if such file does not exist
+  // first file in the input stream is 0
   TString fileName("");
   if (order > fFileNames->GetLast()) return fileName;
   TObjString *fileNameStored = dynamic_cast<TObjString*>(fFileNames->At(order));

diff --git a/STEER/AliStream.h b/STEER/AliStream.h
index 8b9b560d4378147cc293edb0e0331f4ee1955ae4..e39634899ed78a48c5a7139a1ecbd2f79e6c88a2 100644 (file)
--- a/STEER/AliStream.h
+++ b/STEER/AliStream.h
@@ -14,12 +14,10 @@
 ////////////////////////////////////////////////////////////////////////
 
 // --- ROOT system ---
-#include "TNamed.h"
+#include <TNamed.h>
 
 // --- AliRoot header files ---
-//#include <TString.h>
-
-#include "TObjArray.h"
+class TObjArray;
 class TFile;
 
 class TString;
@@ -29,6 +27,9 @@ class AliStream: public TNamed {
 public:
   AliStream();
   AliStream(const char* foldername, Option_t *optioneventfoldername);
+  AliStream(const AliStream &as);
+  AliStream & operator = (const AliStream & as) 
+    {as.Copy(*this); return *this;}
   virtual ~AliStream();
 
   void       AddFile(const char *fileName);
@@ -44,12 +45,15 @@ public:
   Int_t GetCurrentEventNumber() const { return fLastEventSerialNr ; }
     
 private:  
-  Int_t      fLastEventSerialNr;
-  Int_t      fLastEventNr;
-  Int_t      fCurrentFileIndex;
+
+  void Copy(TObject & as) const;
+
+  Int_t      fLastEventSerialNr;     // Serial number of last event
+  Int_t      fLastEventNr;           // Number of last event
+  Int_t      fCurrentFileIndex;      // Index of current file
   Int_t      fEvents;                //! nr. of events in the current file
   TString    fMode;                  // = 0 for READONLY, = 1 for READWRITE
-  TObjArray* fFileNames;
+  TObjArray* fFileNames;             // List of file names
   
   TString fEventFolderName; //Name of the folder where data for this stram will be mounted
   

diff --git a/TPC/AliTPC.cxx b/TPC/AliTPC.cxx
index 0215f0cca7ae0ad238f020001c630491818017be..bda9cdd77f0ebc7ca4c7a0c66eeab31f09f74bb1 100644 (file)
--- a/TPC/AliTPC.cxx
+++ b/TPC/AliTPC.cxx
@@ -931,7 +931,7 @@ void AliTPC::Hits2Clusters(Int_t /*eventn*/)
   
   cout<<"fTPCParam->GetTitle() = "<<fTPCParam->GetTitle()<<endl;
   
-  AliRunLoader* rl = (AliRunLoader*)fLoader->GetEventFolder()->FindObject(AliRunLoader::fgkRunLoaderName);
+  AliRunLoader* rl = (AliRunLoader*)fLoader->GetEventFolder()->FindObject(AliRunLoader::GetRunLoaderName());
   rl->CdGAFile();
   //fTPCParam->Write(fTPCParam->GetTitle());
 
@@ -1381,7 +1381,7 @@ void AliTPC::SetDefaults(){
   // Set response functions
 
   //
-  AliRunLoader* rl = (AliRunLoader*)fLoader->GetEventFolder()->FindObject(AliRunLoader::fgkRunLoaderName);
+  AliRunLoader* rl = (AliRunLoader*)fLoader->GetEventFolder()->FindObject(AliRunLoader::GetRunLoaderName());
   rl->CdGAFile();
   AliTPCParamSR *param=(AliTPCParamSR*)gDirectory->Get("75x40_100x60");
   if(param){
@@ -1472,7 +1472,7 @@ void AliTPC::Hits2Digits(Int_t eventnumber)
  //----------------------------------------------------
  // Loop over all sectors for a single event
  //----------------------------------------------------
-  AliRunLoader* rl = (AliRunLoader*)fLoader->GetEventFolder()->FindObject(AliRunLoader::fgkRunLoaderName);
+  AliRunLoader* rl = (AliRunLoader*)fLoader->GetEventFolder()->FindObject(AliRunLoader::GetRunLoaderName());
   rl->GetEvent(eventnumber);
   if (fLoader->TreeH() == 0x0)
    {