Coding Convention Violation Corrections

diff --git a/STEER/AliDigitizer.h b/STEER/AliDigitizer.h
index bd5c41582a69a8021f24eb588f6dc93b31cb3c55..0eaadb37bd570361730bb18a35887b4b5be64d3b 100644 (file)
--- a/STEER/AliDigitizer.h
+++ b/STEER/AliDigitizer.h
@@ -8,7 +8,7 @@
 ////////////////////////////////////////////////////////////////////////
 //
 //  Base Class for Detector specific Merging/Digitization   
-//                  
+//  Detector specific digitization classes derive from this
 //  Author: Jiri Chudoba (CERN)
 //
 ////////////////////////////////////////////////////////////////////////
@@ -29,7 +29,7 @@ class AliDigitizer: public TTask {
                  const Text_t* title="AliDigitizer");
 // Copy ctor needed because there is a pointer
     AliDigitizer(const AliDigitizer &dig);
-    AliDigitizer& operator=(AliDigitizer &dig)
+    AliDigitizer& operator=(const AliDigitizer &dig)
       {dig.Copy(*this);return *this;}
       
     virtual ~AliDigitizer();

diff --git a/STEER/AliDisplay.cxx b/STEER/AliDisplay.cxx
index e9de668804c5d5fce6ecd2c29faf7181bc0744e2..fc09dc438381ed303b12458f81a765710be49768 100644 (file)
--- a/STEER/AliDisplay.cxx
+++ b/STEER/AliDisplay.cxx
@@ -33,7 +33,7 @@
 #include <TPaveText.h>
 #include <TSlider.h>
 #include <TSliderBox.h>
-#include <TTree.h>
+//#include <TTree.h>
 #include <TView.h>
 #include <TVirtualX.h>
 
@@ -47,8 +47,10 @@
 #include "TParticle.h"
 #include "AliMC.h"
 
-static const Float_t kptcutmax  = 2;
-static const Float_t ketacutmax = 1.5;
+const Float_t AliDisplay::fgkPtCutMax  = 2;
+const Float_t AliDisplay::fgkEtaCutMax = 1.5;
+const Int_t   AliDisplay::fgkMaxZooms = 20;
+
 
 ClassImp(AliDisplay)
 
@@ -247,13 +249,13 @@ AliDisplay::AliDisplay(Int_t size):
   fCutPad->SetFillColor(22);
   fCutPad->SetBorderSize(2);
   fCutSlider = new TSlider("pcut","Momentum cut",0,0,1,1);
-  fCutSlider->SetRange(fPTcut/kptcutmax,1);
+  fCutSlider->SetRange(fPTcut/fgkPtCutMax,1);
   fCutSlider->SetObject(this);
   fCutSlider->SetFillColor(45);
   TSliderBox *sbox = dynamic_cast<TSliderBox*>(fCutSlider->GetListOfPrimitives()->First());
   sbox->SetFillColor(46);
   fCutSlider->cd();
-  TGaxis *cutaxis = new TGaxis(0.02,0.8,0.98,0.8,0,kptcutmax,510,"");
+  TGaxis *cutaxis = new TGaxis(0.02,0.8,0.98,0.8,0,fgkPtCutMax,510,"");
   cutaxis->SetLabelSize(0.5);
   cutaxis->SetTitleSize(0.6);
   cutaxis->SetTitleOffset(0.5);
@@ -272,7 +274,7 @@ AliDisplay::AliDisplay(Int_t size):
   TSliderBox *sbox2 = dynamic_cast<TSliderBox*>(fEtaSlider->GetListOfPrimitives()->First());
   sbox2->SetFillColor(46);
   fEtaSlider->cd();
-  TGaxis *etaaxis = new TGaxis(0.9,0.02,0.9,0.98,-ketacutmax,ketacutmax,510,"");
+  TGaxis *etaaxis = new TGaxis(0.9,0.02,0.9,0.98,-fgkEtaCutMax,fgkEtaCutMax,510,"");
   etaaxis->SetLabelSize(0.5);
   etaaxis->SetTitleSize(0.6);
   etaaxis->SetTitleOffset(0.2);
@@ -586,15 +588,15 @@ void AliDisplay::DrawHits()
    //Get cut slider
    smax   = fCutSlider->GetMaximum();
    smin   = fCutSlider->GetMinimum();
-   cutmin = kptcutmax*smin;
-   if (smax < 0.98) cutmax = kptcutmax*smax;
+   cutmin = fgkPtCutMax*smin;
+   if (smax < 0.98) cutmax = fgkPtCutMax*smax;
    else             cutmax = 100000;
    
    //Get eta slider
    smax   = fEtaSlider->GetMaximum();
    smin   = fEtaSlider->GetMinimum();
-   etamin = ketacutmax*(2*smin-1);
-   etamax = ketacutmax*(2*smax-1);
+   etamin = fgkEtaCutMax*(2*smin-1);
+   etamax = fgkEtaCutMax*(2*smax-1);
    if (smin < 0.02) etamin = -1000;
    if (smax > 0.98) etamax =  1000;
       
@@ -781,7 +783,7 @@ void AliDisplay::ExecuteEvent(Int_t event, Int_t px, Int_t py)
       if (x1 < x0) {temp = x0; x0 = x1; x1 = temp;}
       if (y1 < y0) {temp = y0; y0 = y1; y1 = temp;}
       gPad->Range(x0,y0,x1,y1);
-      if (fZooms < kMAXZOOMS-1) {
+      if (fZooms < fgkMaxZooms-1) {
          fZooms++;
          fZoomX0[fZooms] = x0;
          fZoomY0[fZooms] = y0;

diff --git a/STEER/AliDisplay.h b/STEER/AliDisplay.h
index 575d8996c09e1987242f25c60cda5cd8f86d3107..8b5ce5c9fca1ab0eed4e74c72da0c44234c9bf14 100644 (file)
--- a/STEER/AliDisplay.h
+++ b/STEER/AliDisplay.h
@@ -22,8 +22,6 @@ class TSlider;
 class TButton;
 class TArc;
 
-static const Int_t kMAXZOOMS = 20;
-
 class AliDisplay : public TObject {
    
 public:
@@ -68,6 +66,9 @@ public:
    
    void              SetTracksToDisplay(Int_t *tracks, Int_t n);  // set tracks to display
 protected:
+   static const Float_t  fgkPtCutMax;       //Max Pt cut for the slider
+   static const Float_t  fgkEtaCutMax;      //Max eta cut for the slider
+   static const Int_t    fgkMaxZooms;       //Max number of zooms
    Int_t             fZoomMode;             //=1 if in zoom mode
    Bool_t            fDrawAllViews;         //Flag True if AllViews selected
    Bool_t            fDrawParticles;        //Flag True if particles to be drawn

diff --git a/STEER/AliESD.cxx b/STEER/AliESD.cxx
index 40a3a6e8a970d008bc6f50146b3f02e1f3cbe5d5..310edb534af46d1a9aca3b209616f51e34ca87dd 100644 (file)
--- a/STEER/AliESD.cxx
+++ b/STEER/AliESD.cxx
@@ -18,7 +18,7 @@
 //-----------------------------------------------------------------
 //           Implementation of the ESD class
 //   This is the class to deal with during the phisical analysis of data
-//
+//   This class is generated directly by the reconstruction methods
 //      Origin: Iouri Belikov, CERN, Jouri.Belikov@cern.ch
 //-----------------------------------------------------------------
 
@@ -26,7 +26,7 @@
 
 ClassImp(AliESD)
 
-//_______________________________________________________________________
+//______________________________________________________________________________
 AliESD::AliESD():
   fEventNumber(0),
   fRunNumber(0),
@@ -44,8 +44,27 @@ AliESD::AliESD():
 {
 }
 
-void AliESD::Print(Option_t *) const {
-  //Print header information of the event
+//______________________________________________________________________________
+AliESD::~AliESD()
+{
+  //
+  // Standard destructor
+  //
+  fTracks.Delete();
+  fCaloTracks.Delete();
+  fMuonTracks.Delete();
+  fPmdTracks.Delete();
+  fV0s.Delete();
+  fCascades.Delete();
+}
+
+
+//______________________________________________________________________________
+void AliESD::Print(Option_t *) const 
+{
+  //
+  // Print header information of the event
+  //
   Info("Print","ESD run information");
   printf("Event # %d Run # %d Trigger %ld Magnetic field %f \n",
         GetEventNumber(),

diff --git a/STEER/AliESD.h b/STEER/AliESD.h
index 08f4e1fba2c294bdd8e6a5e5f0627e62164073b6..f22f761eb65aedda7adaea2cf94ddb6d7b4b63c9 100644 (file)
--- a/STEER/AliESD.h
+++ b/STEER/AliESD.h
@@ -1,5 +1,5 @@
-#ifndef ALIESDEVENT_H
-#define ALIESDEVENT_H
+#ifndef ALIESD_H
+#define ALIESD_H
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
@@ -13,27 +13,21 @@
 //         Origin: Iouri Belikov, CERN, Jouri.Belikov@cern.ch 
 //-------------------------------------------------------------------------
 
-#include "TObject.h"
-#include "TClonesArray.h"
-#include  "AliESDVertex.h"
-#include  "AliESDtrack.h"
-#include  "AliESDCaloTrack.h"
-#include  "AliESDMuonTrack.h"
-#include  "AliESDPmdTrack.h"
-#include  "AliESDv0.h"
-#include  "AliESDcascade.h"
+#include <TClonesArray.h>
+#include <TObject.h>
+
+#include "AliESDCaloTrack.h"
+#include "AliESDMuonTrack.h"
+#include "AliESDPmdTrack.h"
+#include "AliESDVertex.h"
+#include "AliESDcascade.h"
+#include "AliESDtrack.h"
+#include "AliESDv0.h"
 
 class AliESD : public TObject {
 public:
   AliESD();
-  virtual ~AliESD() {
-    fTracks.Delete();
-    fCaloTracks.Delete();
-    fMuonTracks.Delete();
-    fPmdTracks.Delete();
-    fV0s.Delete();
-    fCascades.Delete();
-  }
+  virtual ~AliESD(); 
 
   void SetEventNumber(Int_t n) {fEventNumber=n;}
   void SetRunNumber(Int_t n) {fRunNumber=n;}

diff --git a/STEER/AliESDMuonTrack.cxx b/STEER/AliESDMuonTrack.cxx
index 176c4900a9cc57e512f84e306ebadc02d1671f1a..5cc5064f739c9aae318fd80927e7fb16876ef7d6 100644 (file)
--- a/STEER/AliESDMuonTrack.cxx
+++ b/STEER/AliESDMuonTrack.cxx
@@ -1,7 +1,43 @@
+/**************************************************************************
+ * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+ *                                                                        *
+ * Author: The ALICE Off-line Project.                                    *
+ * Contributors are mentioned in the code where appropriate.              *
+ *                                                                        *
+ * Permission to use, copy, modify and distribute this software and its   *
+ * documentation strictly for non-commercial purposes is hereby granted   *
+ * without fee, provided that the above copyright notice appears in all   *
+ * copies and that both the copyright notice and this permission notice   *
+ * appear in the supporting documentation. The authors make no claims     *
+ * about the suitability of this software for any purpose. It is          *
+ * provided "as is" without express or implied warranty.                  *
+ **************************************************************************/
+
+/* $Id$ */
+
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Class to describe the MUON tracks
+//  in the Event Summary Data class
+//  This is where the results of reconstruction
+//  are stored for the muons
+//  Author: G.Martinez
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
 #include "AliESDMuonTrack.h"
 
-AliESDMuonTrack::AliESDMuonTrack (const AliESDMuonTrack& MUONTrack):TObject(MUONTrack)
+ClassImp(AliESDMuonTrack)
+
+//_____________________________________________________________________________
+AliESDMuonTrack::AliESDMuonTrack (const AliESDMuonTrack& MUONTrack):
+  TObject(MUONTrack)
 {
+  //
+  // Copy constructor
+  // Deep copy implemented
+  //
   fInverseBendingMomentum = MUONTrack.fInverseBendingMomentum; 
   fThetaX                 = MUONTrack.fThetaX;           
   fThetaY                 = MUONTrack.fThetaY ;           
@@ -15,8 +51,12 @@ AliESDMuonTrack::AliESDMuonTrack (const AliESDMuonTrack& MUONTrack):TObject(MUON
   fChi2MatchTrigger       = MUONTrack.fChi2MatchTrigger; 
 }
 
+//_____________________________________________________________________________
 AliESDMuonTrack& AliESDMuonTrack::operator=(const AliESDMuonTrack& MUONTrack)
 {
+  // 
+  // Equal operator for a deep copy
+  //
   if (this == &MUONTrack)
     return *this;
 
@@ -35,5 +75,4 @@ AliESDMuonTrack& AliESDMuonTrack::operator=(const AliESDMuonTrack& MUONTrack)
   return *this;
 }
 
-ClassImp(AliESDMuonTrack)
 

diff --git a/STEER/AliESDMuonTrack.h b/STEER/AliESDMuonTrack.h
index 3677dc51679fd52fb42892384df3d6937d3589c9..0df4264336c7775c3d09333dd38dfa5ae8e6460c 100644 (file)
--- a/STEER/AliESDMuonTrack.h
+++ b/STEER/AliESDMuonTrack.h
@@ -1,18 +1,24 @@
 #ifndef ALIESDMUONTRACK_H
 #define ALIESDMUONTRACK_H
 
+/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+ * See cxx source for full Copyright notice                               */
+
+/* $Id$ */
+
+//  Class to describe the MUON tracks
+//  in the Event Summary Data class
+//  Author: G.Martinez
+
+
 #include "TObject.h"
 
 class AliESDMuonTrack : public TObject {
 public:
- AliESDMuonTrack(){
-    // Constructor;
- } // Constructor
- virtual ~AliESDMuonTrack(){
-    // Destructor;
- } // Destructor
- AliESDMuonTrack(const AliESDMuonTrack& );
- AliESDMuonTrack& operator=(const AliESDMuonTrack& );
+  AliESDMuonTrack(){} //Constructor
+  virtual ~AliESDMuonTrack(){} // Destructor
+  AliESDMuonTrack(const AliESDMuonTrack& esdm);
+  AliESDMuonTrack& operator=(const AliESDMuonTrack& esdm);
 
 
  // Get and Set methods for data

diff --git a/STEER/AliESDVertex.cxx b/STEER/AliESDVertex.cxx
index 89b6921a8b63bb0fe91320a2d839eef016472f80..25c993954edad973ee6df066bcc59eea87c3ac77 100644 (file)
--- a/STEER/AliESDVertex.cxx
+++ b/STEER/AliESDVertex.cxx
@@ -15,7 +15,9 @@
 
 //-----------------------------------------------------------------
 //           Implementation of the Primary Vertex class
-//
+//           for the Event Data Summary class
+//           This class contains the Primary Vertex
+//           of the event coming from reconstruction
 // Origin: A.Dainese, Padova, andrea.dainese@pd.infn.it
 //-----------------------------------------------------------------
 
@@ -24,7 +26,6 @@
 //---- Root headers --------
 #include <TMath.h>
 #include <TROOT.h>
-#include <TNamed.h>
 //---- AliRoot headers -----
 #include "AliESDVertex.h"
 

diff --git a/STEER/AliESDVertex.h b/STEER/AliESDVertex.h
index 7af82640ee59d3c3c4ac3d5a4a5b4a36c476e882..be4dfbdbd5da9f020d50db62e2ab7297da6824bf 100644 (file)
--- a/STEER/AliESDVertex.h
+++ b/STEER/AliESDVertex.h
@@ -7,7 +7,7 @@
 
 //-------------------------------------------------------
 //                    Primary Vertex Class
-//
+//          for the Event Data Summary Class
 //   Origin: A.Dainese, Padova, andrea.dainese@pd.infn.it
 //-------------------------------------------------------
 
@@ -73,10 +73,6 @@ class AliESDVertex : public TNamed {
   void GetTruePos(Double_t &x,Double_t &y,Double_t &z) const 
        {x=fTruePos[0]; y=fTruePos[1]; z=fTruePos[2];}
         
- private:
-
-  void SetToZero();
-
  protected:
 
   Double_t fPosition[3];  // vertex position
@@ -86,8 +82,13 @@ class AliESDVertex : public TNamed {
   Int_t    fNContributors;  // # of tracklets/tracks used for the estimate 
   Int_t    fDebug;  //! for debugging
   Double_t fTruePos[3];   //true vertex position (for comparison purposes)
+
+ private:
+
+  void SetToZero();
+
   ClassDef(AliESDVertex,4)  // Class for Primary Vertex
-    };
+};
 
 #endif
 

diff --git a/STEER/AliFieldMap.cxx b/STEER/AliFieldMap.cxx
index aad8fbc04b07c5b71927b0c40f6796614ece7851..78c839ae2bbdc396a53b5eed13e7b1b9a564bf14 100644 (file)
--- a/STEER/AliFieldMap.cxx
+++ b/STEER/AliFieldMap.cxx
@@ -17,12 +17,15 @@
 
 //-----------------------------------------------------------------------
 //
+// Class to handle the field
+// I/O and interpolation
+// of the field map to return the value
+// of the magnetic field in an arbitrary position
 // Author: Andreas Morsch <andreas.morsch@cern.ch>
 //
 //-----------------------------------------------------------------------
 
 #include <TSystem.h>
-#include <TVector.h>
 
 #include "AliFieldMap.h"
 
@@ -205,7 +208,7 @@ void AliFieldMap::ReadField()
 }
 
 //_______________________________________________________________________
-void AliFieldMap::Field(Float_t *x, Float_t *b)
+void AliFieldMap::Field(Float_t *x, Float_t *b) const
 {
   //
   // Use simple interpolation to obtain field at point x

diff --git a/STEER/AliFieldMap.h b/STEER/AliFieldMap.h
index d42ab3ebdd9bf4d86e86928a97b965daef6eaa47..18a4f7b86eb6b079e10cd72f42ce48e76339e517 100644 (file)
--- a/STEER/AliFieldMap.h
+++ b/STEER/AliFieldMap.h
@@ -6,8 +6,11 @@
 /* $Id$ */
 
 //
+// Class to handle the field map of ALICE
+// I/O and interpolation
 // Author: Andreas Morsch <andreas.morsch@cern.ch>
 //
+
 #include <TNamed.h>
 #include <TVector.h>
 
@@ -23,7 +26,7 @@ public:
     void Copy(TObject &map) const;
     virtual AliFieldMap & operator=(const AliFieldMap &map);
 
-    virtual void Field(Float_t *x, Float_t *b);
+    virtual void Field(Float_t *x, Float_t *b) const;
     Float_t Bx(Int_t ix, Int_t iy, Int_t iz) const{
        return (*fB)(3*((ix*fYn+iy)*fZn+iz));
     }

diff --git a/STEER/AliGenerator.cxx b/STEER/AliGenerator.cxx
index cb28af264ce9d583c369c91e15c70fe8570a5647..8fb713f66a3efdb3e6f8874dfdc5b1f47420f5aa 100644 (file)
--- a/STEER/AliGenerator.cxx
+++ b/STEER/AliGenerator.cxx
@@ -35,6 +35,7 @@
 //                                                               //
 ///////////////////////////////////////////////////////////////////
 #include <TGenerator.h>
+#include <TMCProcess.h>
 
 #include "AliCollisionGeometry.h"
 #include "AliConfig.h"

diff --git a/STEER/AliReconstruction.h b/STEER/AliReconstruction.h
index cf6e6a961f3e585d7a2f397e498209873ae2770f..98b6aabb20a0946ee2d3fe2d1998d14dc08b61dc 100644 (file)
--- a/STEER/AliReconstruction.h
+++ b/STEER/AliReconstruction.h
@@ -5,6 +5,18 @@
 
 /* $Id$ */
 
+///////////////////////////////////////////////////////////////////////////////
+//                                                                           //
+// class for running the reconstruction                                      //
+// Clusters and tracks are created for all detectors and all events by       //
+// typing:                                                                   //
+//                                                                           //
+//   AliReconstruction rec;                                                  //
+//   rec.Run();                                                              //
+//                                                                           //
+///////////////////////////////////////////////////////////////////////////////
+
+
 #include <TNamed.h>
 #include <TString.h>
 #include <TObjArray.h>
@@ -61,6 +73,11 @@ private:
     virtual const char*  GetDetectorName() const
       {return fDetector->GetName();};
   private:
+    AliDummyReconstructor(const AliDummyReconstructor &drc):
+      AliReconstructor(drc)
+      {Fatal("copy ctor","Not implemented\n");}
+    AliDummyReconstructor & operator=(const AliDummyReconstructor &)
+      {Fatal("= operator","Not implemented\n"); return *this;}
     AliDetector*         fDetector;   // detector object
   };
 

diff --git a/STEER/AliRndm.cxx b/STEER/AliRndm.cxx
index 53247ce8c95c08a5137a778592140cf26ac66993..302d644a1fcc4de17ea9250b78cbefa308e1fb69 100644 (file)
--- a/STEER/AliRndm.cxx
+++ b/STEER/AliRndm.cxx
@@ -16,8 +16,11 @@
 /* $Id$ */
 
 ///////////////////////////////////////////////////////////////////////////////
-//                                                                           //
-//                                                                           //
+// Random number class for AliRoot
+// This class allows to have different 
+// random number generator for different
+// elements of AliRoot                                                                          //
+// It also allows saving and retrieving of the random number seeds
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "TFile.h"

diff --git a/STEER/AliRndm.h b/STEER/AliRndm.h
index 459896ec7248571df53993958e2992c5e345b080..75cbfb42e9a13521ffad29e8a1aca2d13e963093 100644 (file)
--- a/STEER/AliRndm.h
+++ b/STEER/AliRndm.h
@@ -17,7 +17,7 @@ class AliRndm
 {
 public:
   AliRndm();
-  AliRndm(const AliRndm &);
+  AliRndm(const AliRndm &rn);
   virtual ~AliRndm() {fRandom=0;}
   AliRndm & operator=(const AliRndm& rn) 
     {rn.Copy(*this); return (*this);}

diff --git a/STEER/AliRunDigitizer.cxx b/STEER/AliRunDigitizer.cxx
index 0ffabca9a743e5f1c1195191d6aae047103ed11a..10d2f557cbf9352f7940ca7dfe710c15ee15a8ac 100644 (file)
--- a/STEER/AliRunDigitizer.cxx
+++ b/STEER/AliRunDigitizer.cxx
@@ -48,7 +48,7 @@
 // The default output is to the signal file (stream 0). This can be 
 // changed with the SetOutputFile(TString fn)  method.
 //
-// Single input file is permitted. Maximum kMaxStreamsToMerge can be merged.
+// Single input file is permitted. Maximum MAXSTREAMSTOMERGE can be merged.
 // Input from the memory (on-the-fly merging) is not yet 
 // supported, as well as access to the input data by invoking methods
 // on the output data.
@@ -151,7 +151,7 @@ AliRunDigitizer::AliRunDigitizer(Int_t nInputStreams, Int_t sperb):
  fOutRunLoader(0x0),
  fOutputInitialized(kFALSE),
  fCombi(new AliMergeCombi(nInputStreams,sperb)),
- fCombination(kMaxStreamsToMerge),
+ fCombination(MAXSTREAMSTOMERGE),
  fCombinationFileName(0),
  fDebug(0)
 
@@ -169,7 +169,7 @@ AliRunDigitizer::AliRunDigitizer(Int_t nInputStreams, Int_t sperb):
   
   fkMASK[0] = 0;
   
-  for (i=1;i<kMaxStreamsToMerge;i++) 
+  for (i=1;i<MAXSTREAMSTOMERGE;i++) 
    {
     fkMASK[i] = fkMASK[i-1] + fkMASKSTEP;
    }
@@ -301,7 +301,7 @@ Bool_t AliRunDigitizer::ConnectInputTrees()
   //
   // loads events 
   //
-  Int_t eventNr[kMaxStreamsToMerge], delta[kMaxStreamsToMerge];
+  Int_t eventNr[MAXSTREAMSTOMERGE], delta[MAXSTREAMSTOMERGE];
   fCombi->Combination(eventNr, delta);
   for (Int_t i=0;i<fNinputs;i++) 
    {
@@ -531,7 +531,7 @@ Int_t* AliRunDigitizer::GetInputEventNumbers(Int_t event) const
 // merged in the output event event
 
 // simplified for now, implement later
-  Int_t * a = new Int_t[kMaxStreamsToMerge];
+  Int_t * a = new Int_t[MAXSTREAMSTOMERGE];
   for (Int_t i = 0; i < fNinputs; i++) {
     a[i] = event;
   }

diff --git a/STEER/AliRunDigitizer.h b/STEER/AliRunDigitizer.h
index f0f915348e5965c9e566a5c3807aa4e7d4960481..49235596e2f989f4c9b5c95ef830101d1035c790 100644 (file)
--- a/STEER/AliRunDigitizer.h
+++ b/STEER/AliRunDigitizer.h
@@ -29,7 +29,7 @@ class AliDigitizer;
 class AliMergeCombi;
 class AliRunLoader;
 
-static const Int_t kMaxStreamsToMerge = 4;
+#define MAXSTREAMSTOMERGE 4
 
 class AliRunDigitizer: public TTask {
 
@@ -109,7 +109,7 @@ private:
   void              FinishEvent();
   void              FinishGlobal();
 
-  Int_t             fkMASK[kMaxStreamsToMerge];  //! masks for track ids from
+  Int_t             fkMASK[MAXSTREAMSTOMERGE];  //! masks for track ids from
                                               //  different source files
   Int_t             fkMASKSTEP;           // step to increase MASK for
                                           // each input file

diff --git a/STEER/AliSimulation.cxx b/STEER/AliSimulation.cxx
index 957780ecf507f3f9917837e83e0068b765372713..0aca64ef70308fd8ebdda8afb6a2068a5b9f9299 100644 (file)
--- a/STEER/AliSimulation.cxx
+++ b/STEER/AliSimulation.cxx
@@ -82,19 +82,18 @@
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
-
-#include "AliSimulation.h"
-#include "AliRunLoader.h"
-#include "AliRun.h"
-#include "AliModule.h"
-#include "AliGenerator.h"
-#include "AliVertexGenFile.h"
-#include "AliRunDigitizer.h"
-#include "AliDigitizer.h"
 #include <TObjString.h>
-#include <TSystem.h>
 #include <TStopwatch.h>
+#include <TSystem.h>
 
+#include "AliDigitizer.h"
+#include "AliGenerator.h"
+#include "AliModule.h"
+#include "AliRun.h"
+#include "AliRunDigitizer.h"
+#include "AliRunLoader.h"
+#include "AliSimulation.h"
+#include "AliVertexGenFile.h"
 
 ClassImp(AliSimulation)
 

diff --git a/STEER/AliSimulation.h b/STEER/AliSimulation.h
index f125fcb3151e9b1ece9caedf97e6ad497204b5ae..c148edc6f33bc246925abdbf5028c02d7c1271ea 100644 (file)
--- a/STEER/AliSimulation.h
+++ b/STEER/AliSimulation.h
@@ -5,6 +5,14 @@
 
 /* $Id$ */
 
+//
+// class for running generation, simulation and digitization
+// Hits, sdigits and digits are created for all detectors by typing:
+//
+//   AliSimulation sim;
+//   sim.Run();
+//
+
 #include <TNamed.h>
 #include <TString.h>
 

diff --git a/STEER/AliStack.cxx b/STEER/AliStack.cxx
index a73c5a6c4698e65353dd8bd36744f37af68aac25..8b5128b5d64dfe961b25bbbe509905817bf4f85c 100644 (file)
--- a/STEER/AliStack.cxx
+++ b/STEER/AliStack.cxx
@@ -17,13 +17,15 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 //                                                                           //
-//  Particles stack class
+//  Particles stack class                                                    //
+//  Implements the TMCVirtualStack of the Virtual Monte Carlo                //
+//  Holds the particles transported during simulation                        //
+//  Is used to compare results of reconstruction with simulation             //
+//  Author A.Morsch                                                          //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
  
-#include <TFile.h>
-#include <TFolder.h>
 #include <TObjArray.h>
 #include <TParticle.h>
 #include <TParticlePDG.h>

diff --git a/STEER/AliStack.h b/STEER/AliStack.h
index 961af6ded84f064747c5b695fc675f437de53e8d..8c43d126a17ac7b0ccfff072bb472f2e6f32af88 100644 (file)
--- a/STEER/AliStack.h
+++ b/STEER/AliStack.h
@@ -5,18 +5,22 @@
 
 /* $Id$ */
 
-#include <TArrayI.h>
-#include <TVirtualMCStack.h>
-
-#include "AliConfig.h"
+//  Particles stack class
+//  Implements the TMCVirtualStack of the Virtual Monte Carlo
+//  Author A.Morsch
 
-class AliHeader;
 class TClonesArray;
 class TFile;
 class TObjArray;
 class TParticle;
-class TTree;
 class TString;
+class TTree;
+#include <TArrayI.h>
+#include <TVirtualMCStack.h>
+
+class AliHeader;
+#include "AliConfig.h"
+
 
 class AliStack : public TVirtualMCStack
 {

diff --git a/STEER/AliStream.cxx b/STEER/AliStream.cxx
index 323fed2059072deb6103ef89cbc6a7c96aee57ef..2d78b1661a5af985b24fbfebe2533b9748078c62 100644 (file)
--- a/STEER/AliStream.cxx
+++ b/STEER/AliStream.cxx
@@ -31,6 +31,7 @@
 // - open and close files
 // - return serial event number of the next event in the stream
 // and the TFile pointer for a proper file
+//  Author: Jiri Chudoba (CERN), 2001
 //
 ////////////////////////////////////////////////////////////////////////
 

diff --git a/STEER/AliStream.h b/STEER/AliStream.h
index e39634899ed78a48c5a7139a1ecbd2f79e6c88a2..f67d1c88962e2cdebee15198ca68be755269b73f 100644 (file)
--- a/STEER/AliStream.h
+++ b/STEER/AliStream.h
@@ -8,7 +8,7 @@
 ////////////////////////////////////////////////////////////////////////
 //
 //  Class to handle files on IO
-//                  
+//  Handles files and returns serial event number                  
 //  Author: Jiri Chudoba (CERN), 2001
 //
 ////////////////////////////////////////////////////////////////////////

diff --git a/STEER/AliVertexGenFile.cxx b/STEER/AliVertexGenFile.cxx
index f44023083f373542f6c6df428b7ef1b1be0f68ea..d274a56cea85ae294f41ca4d0a395c179d53a611 100644 (file)
--- a/STEER/AliVertexGenFile.cxx
+++ b/STEER/AliVertexGenFile.cxx
@@ -26,12 +26,13 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 
-#include "AliVertexGenFile.h"
-#include "AliHeader.h"
-#include "AliGenEventHeader.h"
+#include <TArrayF.h>
 #include <TFile.h>
 #include <TTree.h>
-#include <TArrayF.h>
+
+#include "AliGenEventHeader.h"
+#include "AliHeader.h"
+#include "AliVertexGenFile.h"
 
 
 ClassImp(AliVertexGenFile)

diff --git a/STEER/AliVertexGenFile.h b/STEER/AliVertexGenFile.h
index 85b46ee29a63f33c78ce3d15d64a2b2e31f60e7f..aaa0e6476fb7a7ba8fd8bd4eacb374b0a260db84 100644 (file)
--- a/STEER/AliVertexGenFile.h
+++ b/STEER/AliVertexGenFile.h
@@ -5,6 +5,10 @@
 
 /* $Id$ */
 
+// Generator for vertices taken from a file
+// The file name of the galice file is passed as argument
+// to the constructor.
+
 #include "AliVertexGenerator.h"
 
 class TFile;
@@ -21,6 +25,11 @@ class AliVertexGenFile: public AliVertexGenerator {
   virtual TVector3 GetVertex();
 
  private:
+  AliVertexGenFile(const AliVertexGenFile &vgf):    
+    AliVertexGenerator(vgf)
+    {Fatal("copy ctor","Not implemented\n");}
+  AliVertexGenFile & operator-(const AliVertexGenFile &)
+    {Fatal("= operator","Not implemented\n"); return *this;}
   TFile*           fFile;           //! galice file with vertices
   TTree*           fTree;           //! tree with headers
   AliHeader*       fHeader;         //! event header