Correcting coding convention violations

diff --git a/EVGEN/AliGenHijing.h b/EVGEN/AliGenHijing.h
index e6512bf..1852377 100644 (file)
--- a/EVGEN/AliGenHijing.h
+++ b/EVGEN/AliGenHijing.h
@@ -14,6 +14,7 @@
 class THijing;
 class TArrayI;
 class TParticle;
+class TClonesArray;
 
 class AliGenHijing : public AliGenerator
 {

diff --git a/STEER/AliDisplay.cxx b/STEER/AliDisplay.cxx
index 55c53da..411c518 100644 (file)
--- a/STEER/AliDisplay.cxx
+++ b/STEER/AliDisplay.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.12  2000/12/12 13:18:59  hristov
+Protection against FPE
+
 Revision 1.11  2000/11/30 07:12:48  alibrary
 Introducing new Rndm and QA classes
 
@@ -302,7 +305,11 @@ void AliDisplay::Copy(AliDisplay &disp) const
 }
 
 //----------------------------------------------------------------------------
-void AliDisplay::ShowTrack(Int_t idx) {
+void AliDisplay::ShowTrack(Int_t idx) 
+{
+  //
+  // Display track idx
+  //
    AliDetector *mTPC=(AliDetector*)gAlice->GetModule("TPC");
    TObjArray *points=mTPC->Points();
    int ntracks=points->GetEntriesFast();

diff --git a/STEER/AliGenerator.cxx b/STEER/AliGenerator.cxx
index e7f0c81..250d3d0 100644 (file)
--- a/STEER/AliGenerator.cxx
+++ b/STEER/AliGenerator.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.9  2000/10/04 10:08:01  fca
+Correction of minor typing mistakes
+
 Revision 1.8  2000/10/02 21:28:14  fca
 Removal of useless dependecies via forward declarations
 
@@ -53,6 +56,7 @@ Introduction of the Copyright and cvs Log
 ///////////////////////////////////////////////////////////////////
 
 #include "AliGenerator.h"
+#include "TGenerator.h"
 #include "AliRun.h"
 
 ClassImp(AliGenerator)

diff --git a/STEER/AliGenerator.h b/STEER/AliGenerator.h
index 70c04e3..4b866b3 100644 (file)
--- a/STEER/AliGenerator.h
+++ b/STEER/AliGenerator.h
@@ -12,9 +12,10 @@
 //                                                       //
 ///////////////////////////////////////////////////////////
 
+class TGenerator;
+
 #include "TLorentzVector.h"
 #include "TArrayF.h"
-#include "TGenerator.h"
 #include "AliRndm.h"
 
 typedef enum { kNoSmear, kPerEvent, kPerTrack } VertexSmear_t;

diff --git a/STEER/AliHit.h b/STEER/AliHit.h
index 720f07b..3985ab4 100644 (file)
--- a/STEER/AliHit.h
+++ b/STEER/AliHit.h
@@ -8,12 +8,6 @@
 #include "TObject.h"
 
 class AliHit : public TObject {
-protected:
-  Int_t     fTrack;  // Track number
-  Float_t   fX;      // X position of the hit
-  Float_t   fY;      // Y position of the hit
-  Float_t   fZ;      // Z position of the hit
-
 public:
   AliHit();
   AliHit(Int_t shunt, Int_t track);
@@ -25,6 +19,12 @@ public:
   virtual Float_t Z() const {return fZ;}
   virtual Int_t Track() const {return fTrack;}
   
+protected:
+  Int_t     fTrack;  // Track number
+  Float_t   fX;      // X position of the hit
+  Float_t   fY;      // Y position of the hit
+  Float_t   fZ;      // Z position of the hit
+
   ClassDef(AliHit,1)  //Base class for all Alice hits
 };
 #endif

diff --git a/STEER/AliKalmanTrack.h b/STEER/AliKalmanTrack.h
index e001d4a..04e038a 100644 (file)
--- a/STEER/AliKalmanTrack.h
+++ b/STEER/AliKalmanTrack.h
@@ -18,6 +18,7 @@ class AliKalmanTrack : public TObject {
 public:
   AliKalmanTrack() {fN=0; fChi2=0; fLab=-3141593;}
   AliKalmanTrack(const AliKalmanTrack& t);
+  virtual ~AliKalmanTrack() {}
   Int_t Compare(TObject *o);
   void SetLabel(Int_t lab) {fLab=lab;} 
 
@@ -37,11 +38,11 @@ public:
 protected: 
   Int_t fLab;             // track label
 
-  Double_t fP0;           // 
-  Double_t fP1;           // 
-  Double_t fP2;           // track parameters
-  Double_t fP3;           // 
-  Double_t fP4;           // 
+  Double_t fP0;           // track parameter
+  Double_t fP1;           // track parameter
+  Double_t fP2;           // track parameter
+  Double_t fP3;           // track parameter
+  Double_t fP4;           // track parameter
 
   Double_t fC00;                         // covariance
   Double_t fC10, fC11;                   // matrix

diff --git a/STEER/AliLegoGenerator.h b/STEER/AliLegoGenerator.h
index 507f830..62a1a6d 100644 (file)
--- a/STEER/AliLegoGenerator.h
+++ b/STEER/AliLegoGenerator.h
@@ -25,6 +25,7 @@ public:
     AliLegoGenerator(Int_t nc1, Float_t c1min, Float_t c1max,
                     Int_t nc2, Float_t c2min, Float_t c2max,
                     Float_t rmin, Float_t rmax, Float_t zmax);
+    virtual ~AliLegoGenerator() {}
     virtual void    Generate();
     virtual void    SetCoor1Range(Int_t nbin, Float_t c1min, Float_t c1max)
        {fNCoor1=nbin; fCoor1Min=c1min; fCoor1Max=c1max;}

diff --git a/STEER/AliLegoGeneratorXYZ.h b/STEER/AliLegoGeneratorXYZ.h
index a9ff1f0..cb9e248 100644 (file)
--- a/STEER/AliLegoGeneratorXYZ.h
+++ b/STEER/AliLegoGeneratorXYZ.h
@@ -24,6 +24,7 @@ class AliLegoGeneratorXYZ : public AliLegoGenerator
     AliLegoGeneratorXYZ(Int_t nc1, Float_t c1min, Float_t c1max,
                        Int_t nc2, Float_t c2min, Float_t c2max,
                        Float_t rmin, Float_t rmax, Float_t zmax);
+    virtual ~AliLegoGeneratorXYZ() {}
     virtual void    Generate();
  protected:
     Float_t fDir1[3];  // 1st unit vector spanning the scanning plane

diff --git a/STEER/AliRndm.cxx b/STEER/AliRndm.cxx
index 40881eb..63a535f 100644 (file)
--- a/STEER/AliRndm.cxx
+++ b/STEER/AliRndm.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.2  2000/12/01 08:40:48  alibrary
+Correction of a small bug - sRandom can be used now
+
 Revision 1.1  2000/11/30 07:12:48  alibrary
 Introducing new Rndm and QA classes
 
@@ -52,6 +55,9 @@ void AliRndm::Rndm(Float_t* array, const Int_t size) const
 //_____________________________________________________________________________
 void AliRndm::ReadRandom(const char *filename)
 {
+  //
+  // Reads saved random generator status from filename
+  //
   char *fntmp = gSystem->ExpandPathName(filename);
   TFile *file = new TFile(fntmp,"r");
   delete [] fntmp;
@@ -68,6 +74,9 @@ void AliRndm::ReadRandom(const char *filename)
 //_____________________________________________________________________________
 void AliRndm::WriteRandom(const char *filename) const
 {
+  //
+  // Writes random generator status to filename
+  //
   char *fntmp = gSystem->ExpandPathName(filename);
   TFile *file = new TFile(fntmp,"new");
   delete [] fntmp;