More coding convention violations removed

diff --git a/VZERO/AliVZERO.cxx b/VZERO/AliVZERO.cxx
index 21c53d2dd35435bd1cdb2dc94c23650f725f3302..29d56728b74b743f68fd0a6d236b1f9435d223f0 100755 (executable)
--- a/VZERO/AliVZERO.cxx
+++ b/VZERO/AliVZERO.cxx
@@ -26,13 +26,21 @@
 ///////////////////////////////////////////////////////////////////////////
 
 
 ///////////////////////////////////////////////////////////////////////////
 
 

+// --- Standard libraries ---

 #include <Riostream.h>
 
 #include <Riostream.h>
 

+// --- ROOT libraries ---
+#include <TNamed.h>
+#include <TTree.h>
+
+// --- AliRoot header files ---
+#include "AliRun.h"
+#include "AliMC.h"

 #include "AliVZERO.h"
 #include "AliVZERO.h"

+#include "AliVZEROLoader.h"

 
 ClassImp(AliVZERO)
  
 
 ClassImp(AliVZERO)
  

-

 //_____________________________________________________________________________
 AliVZERO::AliVZERO(const char *name, const char *title)
        : AliDetector(name,title)
 //_____________________________________________________________________________
 AliVZERO::AliVZERO(const char *name, const char *title)
        : AliDetector(name,title)


@@ -63,9 +71,20 @@ AliVZERO::AliVZERO(const char *name, const char *title)
 //_____________________________________________________________________________
 AliVZERO::~AliVZERO()
 {
 //_____________________________________________________________________________
 AliVZERO::~AliVZERO()
 {

+  //
+  // Default destructor for VZERO Detector
+  //
+  

     if (fHits) {
         fHits->Delete();
         delete fHits;
     if (fHits) {
         fHits->Delete();
         delete fHits;

+       fHits=0;
+    }
+    
+    if (fDigits) {
+        fDigits->Delete();
+        delete fDigits;
+        fDigits=0;

     }
 }
 
     }
 }
 


@@ -73,7 +92,7 @@ AliVZERO::~AliVZERO()
 void AliVZERO::BuildGeometry()
 {
   //
 void AliVZERO::BuildGeometry()
 {
   //

-  // Build simple ROOT TNode geometry for event display
+  // Builds simple ROOT TNode geometry for event display

   //
 }
  
   //
 }
  


@@ -81,78 +100,94 @@ void AliVZERO::BuildGeometry()
 void AliVZERO::CreateGeometry()
 {
   //
 void AliVZERO::CreateGeometry()
 {
   //

-  // Build simple ROOT TNode geometry for event display
+  // Builds simple Geant3 geometry 

   //
 }
 //_____________________________________________________________________________
 void AliVZERO::CreateMaterials()
 {
   //
   //
 }
 //_____________________________________________________________________________
 void AliVZERO::CreateMaterials()
 {
   //

-  // Build simple ROOT TNode geometry for event display
+  // Creates materials used for Geant3 geometry 

   //
 }
 
   //
 }
 

-
-

 //_____________________________________________________________________________
 Int_t AliVZERO::DistanceToPrimitive(Int_t /*px*/, Int_t /*py*/)
 {
   //
 //_____________________________________________________________________________
 Int_t AliVZERO::DistanceToPrimitive(Int_t /*px*/, Int_t /*py*/)
 {
   //

-  // Calculate the distance from the mouse to the VZERO on the screen
+  // Calculates the distance from the mouse to the VZERO on the screen

   // Dummy routine
   //
   
   return 9999;
 }
  
   // Dummy routine
   //
   
   return 9999;
 }
  

-//-------------------------------------------------------------------------
+//_____________________________________________________________________________

 void AliVZERO::Init()
 {
   //
 void AliVZERO::Init()
 {
   //

-  // Initialise the VZERO after it has been built
+  // Initialises the VZERO  class after it has been built

   //
 }
 
 
   //
 }
 
 

-//-------------------------------------------------------------------------
-
+//_____________________________________________________________________________

 void AliVZERO::SetMaxStepQua(Float_t p1)
 {
 void AliVZERO::SetMaxStepQua(Float_t p1)
 {

+  //
+  // Possible parametrisation of steps in active materials
+  //

      fMaxStepQua = p1;
 }
 
      fMaxStepQua = p1;
 }
 

-//___________________________________________
+//_____________________________________________________________________________

 void AliVZERO::SetMaxStepAlu(Float_t p1)
 {
 void AliVZERO::SetMaxStepAlu(Float_t p1)
 {

+  //
+  // Possible parametrisation of steps in Aluminum foils (not used in 
+  // version v2)
+  //

     fMaxStepAlu = p1;
 }
 
     fMaxStepAlu = p1;
 }
 

-//___________________________________________
+//_____________________________________________________________________________

 void AliVZERO::SetMaxDestepQua(Float_t p1)
 {
 void AliVZERO::SetMaxDestepQua(Float_t p1)
 {

+  //
+  // Possible parametrisation of steps in active materials (quartz)
+  //

     fMaxDestepQua = p1;
 }
 
     fMaxDestepQua = p1;
 }
 

-//___________________________________________
+//_____________________________________________________________________________

 void AliVZERO::SetMaxDestepAlu(Float_t p1)
 {
 void AliVZERO::SetMaxDestepAlu(Float_t p1)
 {

+  //
+  // Possible parametrisation of steps in Aluminum (not used in 
+  // version v2)
+  //

     fMaxDestepAlu = p1;
 }
 
     fMaxDestepAlu = p1;
 }
 

-//___________________________________________
+//_____________________________________________________________________________

 AliLoader* AliVZERO::MakeLoader(const char* topfoldername)
 { 
 AliLoader* AliVZERO::MakeLoader(const char* topfoldername)
 { 

-  // builds VZEROgetter (AliLoader type)
+  //
+  // Builds VZEROgetter (AliLoader type)

   // if detector wants to use customized getter, it must overload this method
   // if detector wants to use customized getter, it must overload this method

+  //

 
   Info("MakeLoader","Creating AliVZEROLoader. Top folder is %s.",topfoldername);
   fLoader = new AliVZEROLoader(GetName(),topfoldername);
   return fLoader;
 }
 
 
   Info("MakeLoader","Creating AliVZEROLoader. Top folder is %s.",topfoldername);
   fLoader = new AliVZEROLoader(GetName(),topfoldername);
   return fLoader;
 }
 

-//___________________________________________
-void AliVZERO::SetTreeAddress(){
+//_____________________________________________________________________________
+void AliVZERO::SetTreeAddress()
+{
+  // 

   // Sets tree address for hits.
   // Sets tree address for hits.

+  //

 
   if (fLoader->TreeH() && (fHits == 0x0))
     fHits = new  TClonesArray("AliVZEROhit", 400);
 
   if (fLoader->TreeH() && (fHits == 0x0))
     fHits = new  TClonesArray("AliVZEROhit", 400);

diff --git a/VZERO/AliVZERO.h b/VZERO/AliVZERO.h
index ecfd717963d5c17413c34fae7873c99a3c7915a4..49f9f1a5fc1c4639a53f83422922df1c7e139bf7 100755 (executable)
--- a/VZERO/AliVZERO.h
+++ b/VZERO/AliVZERO.h
@@ -8,6 +8,7 @@
 //  Manager and hits classes for set : VZERO    //
 //////////////////////////////////////////////////
 
 //  Manager and hits classes for set : VZERO    //
 //////////////////////////////////////////////////
 

+/*

 #include "AliRun.h"
 #include "AliMC.h"
 #include "AliDetector.h"
 #include "AliRun.h"
 #include "AliMC.h"
 #include "AliDetector.h"


@@ -15,7 +16,13 @@
  
 #include <TNamed.h>
 #include <TTree.h>
  
 #include <TNamed.h>
 #include <TTree.h>

+*/
+#include "AliDetector.h"
+
+class TNamed;
+class TTree;

 
 

+class AliVZEROLoader;

 class AliVZEROhit; 
 class AliVZEROdigit;
   
 class AliVZEROhit; 
 class AliVZEROdigit;
   


@@ -39,26 +46,25 @@ public:
   virtual void   MakeBranch(Option_t *option) =0;
   virtual void   DrawModule() {};
   virtual void   StepManager() {};
   virtual void   MakeBranch(Option_t *option) =0;
   virtual void   DrawModule() {};
   virtual void   StepManager() {};

-  virtual inline  void   SetThickness(Float_t thick)  {fThickness = thick;};
-  virtual inline  void   SetThickness1(Float_t thick) {fThickness1 = thick;};
+  virtual void   SetThickness(Float_t thick)  {fThickness = thick;};
+  virtual void   SetThickness1(Float_t thick) {fThickness1 = thick;};

 // Set Stepping Parameters
   virtual void   SetMaxStepQua(Float_t p1);
   virtual void   SetMaxStepAlu(Float_t p1);
   virtual void   SetMaxDestepQua(Float_t p1);
   virtual void   SetMaxDestepAlu(Float_t p1);
 
 // Set Stepping Parameters
   virtual void   SetMaxStepQua(Float_t p1);
   virtual void   SetMaxStepAlu(Float_t p1);
   virtual void   SetMaxDestepQua(Float_t p1);
   virtual void   SetMaxDestepAlu(Float_t p1);
 

-   Float_t      fThickness;
-   Float_t      fThickness1;
-

 protected:
 
 protected:
 

-   Int_t fIdSens1;           // Sensitive volume  in VZERO
+   Int_t   fIdSens1;      // Sensitive volume  in VZERO
+   Float_t fThickness;    // Total thickness of box holding Right detector V0R i.e. 4.1 cm
+   Float_t fThickness1;   // Thickness of elementary cells i.e. 0.7 cm

   
 // Stepping Parameters
   
 // Stepping Parameters

-   Float_t fMaxStepQua;      // Maximum step size inside the quartz volumes
-   Float_t fMaxStepAlu;      // Maximum step size inside the  aluminum volumes
-   Float_t fMaxDestepQua;    // Maximum relative energy loss in quartz
-   Float_t fMaxDestepAlu;    // Maximum relative energy loss in aluminum
+   Float_t fMaxStepQua;   // Maximum step size inside the quartz volumes
+   Float_t fMaxStepAlu;   // Maximum step size inside the  aluminum volumes
+   Float_t fMaxDestepQua; // Maximum relative energy loss in quartz
+   Float_t fMaxDestepAlu; // Maximum relative energy loss in aluminum

   
   ClassDef(AliVZERO,1)  //Class for the VZERO detector
 };
   
   ClassDef(AliVZERO,1)  //Class for the VZERO detector
 };

diff --git a/VZERO/AliVZEROLoader.cxx b/VZERO/AliVZEROLoader.cxx
index 74487e72d1ea494001aaa851171a822554d8dcec..4ef71a6ca1586258f6549aa4858bd6d45c3a2b6f 100644 (file)
--- a/VZERO/AliVZEROLoader.cxx
+++ b/VZERO/AliVZEROLoader.cxx
@@ -1,23 +1,43 @@
+/////////////////////////////////////////////////////////////////////
+//                                                                 //
+//  Class AliVZEROLoader                                           //
+//                                                                 //
+//  Base class for VZEROLoaders.                                   //
+//  Loader provides base I/O facilities for standard data.         //
+//  Each detector has a loader data member.                        //
+//  Loader is accessible via folder structure as well.             //
+//                                                                 //
+/////////////////////////////////////////////////////////////////////
+

 #include "AliVZEROLoader.h"
 
 const TString AliVZEROLoader::fgkDefaultHitsFileName      = "VZERO.Hits.root";
 const TString AliVZEROLoader::fgkDefaultDigitsFileName    = "VZERO.Digits.root";
 
 ClassImp(AliVZEROLoader)
 #include "AliVZEROLoader.h"
 
 const TString AliVZEROLoader::fgkDefaultHitsFileName      = "VZERO.Hits.root";
 const TString AliVZEROLoader::fgkDefaultDigitsFileName    = "VZERO.Digits.root";
 
 ClassImp(AliVZEROLoader)

+
+//_____________________________________________________________________________

 AliVZEROLoader::AliVZEROLoader()
 AliVZEROLoader::AliVZEROLoader()

- {
+ { 
+ // Default constructor

  }
  }

-/*****************************************************************************/ 
+
+//_____________________________________________________________________________

 AliVZEROLoader::AliVZEROLoader(const Char_t *name,const Char_t *topfoldername)
  :AliLoader(name,topfoldername)
 {
   if (GetDebug()) 
    Info("AliVZEROLoader"," name = %s; topfolder = %s",name,topfoldername);
 }
 AliVZEROLoader::AliVZEROLoader(const Char_t *name,const Char_t *topfoldername)
  :AliLoader(name,topfoldername)
 {
   if (GetDebug()) 
    Info("AliVZEROLoader"," name = %s; topfolder = %s",name,topfoldername);
 }

-/*****************************************************************************/ 

 
 

+//_____________________________________________________________________________

 AliVZEROLoader::AliVZEROLoader(const Char_t *name,TFolder *topfolder)
  :AliLoader(name,topfolder)
  {
  }
 
 AliVZEROLoader::AliVZEROLoader(const Char_t *name,TFolder *topfolder)
  :AliLoader(name,topfolder)
  {
  }
 

+//_______________________________________________________________________________
+AliVZEROLoader::~AliVZEROLoader()
+{
+ // Destructor 
+}

diff --git a/VZERO/AliVZEROLoader.h b/VZERO/AliVZEROLoader.h
index 0ce3f793d2a6cd48ba8ca2e21d895d92c054268f..54a83a05dbcbeedb53c93084dc6ad1cacac1c08a 100644 (file)
--- a/VZERO/AliVZEROLoader.h
+++ b/VZERO/AliVZEROLoader.h
@@ -1,10 +1,14 @@
 #ifndef ALIVZEROLOADER_H
 #define ALIVZEROLOADER_H
 
 #ifndef ALIVZEROLOADER_H
 #define ALIVZEROLOADER_H
 

-//base class for loaders 
-//loader is common for reading data for all detectors
-//Each detector has a loader data member
-//loader is accessible via folder structure as well
+/////////////////////////////////////////////////////////////////////
+//                                                                 //
+// Base class for VZEROloaders.                                    //                                          
+// Loader provides base I/O facilities for standard data.          //
+// Each detector has a loader data member.                         //
+// Loader is always accessible via folder structure as well.       // 
+//                                                                 //
+/////////////////////////////////////////////////////////////////////

 
 #include <AliLoader.h>
 
 
 #include <AliLoader.h>
 


@@ -13,19 +17,14 @@ class AliVZEROLoader: public AliLoader
    public:
     AliVZEROLoader();
     AliVZEROLoader(const Char_t *name,const Char_t *topfoldername);
    public:
     AliVZEROLoader();
     AliVZEROLoader(const Char_t *name,const Char_t *topfoldername);

-    AliVZEROLoader(const Char_t *name,TFolder *topfolder);
-    
-    virtual ~AliVZEROLoader(){};//-----------------
-
-   protected:
-
+    AliVZEROLoader(const Char_t *name,TFolder *topfolder);    
+    virtual ~AliVZEROLoader();

 
    private:
 
    private:

-    static const TString fgkDefaultHitsFileName;
-    static const TString fgkDefaultDigitsFileName;
+    static const TString fgkDefaultHitsFileName;  // Default Name for hit file
+    static const TString fgkDefaultDigitsFileName;// Default Name for digit file

 
 

-   public:
-     ClassDef(AliVZEROLoader,1)
+   ClassDef(AliVZEROLoader,1)

  };
  
 #endif
  };
  
 #endif

diff --git a/VZERO/AliVZEROdigit.cxx b/VZERO/AliVZEROdigit.cxx
index 550eea4c64b38354125dc9c7291782dd7b5a1435..8f90f2c844e7389a5df69c944601364aed8b9daa 100644 (file)
--- a/VZERO/AliVZEROdigit.cxx
+++ b/VZERO/AliVZEROdigit.cxx
@@ -13,24 +13,21 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 

-
-#include "AliVZERO.h"

 #include "AliVZEROdigit.h"
 #include "AliVZEROdigit.h"

-#include "AliRun.h"
+

 ClassImp(AliVZEROdigit)
 
 AliVZEROdigit::AliVZEROdigit(Int_t* tracks, Int_t *digits):
   AliDigit(tracks){
   
   //
 ClassImp(AliVZEROdigit)
 
 AliVZEROdigit::AliVZEROdigit(Int_t* tracks, Int_t *digits):
   AliDigit(tracks){
   
   //

-  // Creates VZERO digit
-  // The creator for the AliVZEROdigit class. This routine fills the
-  // AliVZEROdigit data members from the array digits. 
+  // Creates VZERO digits
+  //
+  // Fills the AliVZEROdigit data members from the array digits. 

   //
   
   fTrack      = tracks[0];
   fEvent      = digits[0];
   //
   
   fTrack      = tracks[0];
   fEvent      = digits[0];

-

   
 }
 
   
 }
 

diff --git a/VZERO/AliVZEROdigit.h b/VZERO/AliVZEROdigit.h
index 08454eb1253be82b1640281f3fcbca2e0e470ab7..861fe7b6b436bb56d3937bc4094a44b59586cabb 100644 (file)
--- a/VZERO/AliVZEROdigit.h
+++ b/VZERO/AliVZEROdigit.h
@@ -7,13 +7,13 @@
 
 #include "AliDigit.h"
 
 
 #include "AliDigit.h"
 

-//___________________________________________
+//_____________________________________________________________________________

 class AliVZEROdigit: public AliDigit  {
 
  public:
 class AliVZEROdigit: public AliDigit  {
 
  public:

-    AliVZEROdigit() {}
+    AliVZEROdigit() {};

     AliVZEROdigit(Int_t* tracks, Int_t* digits);
     AliVZEROdigit(Int_t* tracks, Int_t* digits);

-    virtual ~AliVZEROdigit() {}
+    virtual ~AliVZEROdigit() {};

     
   private:
     Int_t fEvent;         // Event number
     
   private:
     Int_t fEvent;         // Event number

diff --git a/VZERO/AliVZEROhit.cxx b/VZERO/AliVZEROhit.cxx
index f5f264b12a267ac95e029763121ac96ea66e75bb..2dd307158f24b7bdc2b2f01244de8f8b4b2a5363 100644 (file)
--- a/VZERO/AliVZEROhit.cxx
+++ b/VZERO/AliVZEROhit.cxx
@@ -15,6 +15,12 @@
 
 /* $Id$ */
 
 
 /* $Id$ */
 

+//_________________________________________________________________________
+//
+//      Hit class for VZERO detector   
+//  
+//_________________________________________________________________________
+

 
 #include "AliVZEROhit.h"
 
 
 #include "AliVZEROhit.h"
 


@@ -25,32 +31,32 @@ AliVZEROhit::AliVZEROhit(Int_t shunt, Int_t track, Int_t* vol, Float_t* hits):
   AliHit(shunt, track)
 {
   //
   AliHit(shunt, track)
 {
   //

-  // Add a VZERO hit
+  // Adds a VZERO hit

   //
   
   //
   

-  fVolume          = vol[0];
-  fCopy            = vol[1];
-  fX              = hits[0];
-  fY               = hits[1];
-  fZ               = hits[2];
-  fTrackPiD        = hits[3];
-  fTof             = hits[4];
-  fCharge          = hits[5];
-  fTheta           = hits[6];
-  fPhi             = hits[7];
-  fRingNumber      = hits[8];
+  fVolume          = vol[0];     // Volume ID
+  fCopy            = vol[1];     // Copy number
+  fX              = hits[0];    // X position of hit
+  fY               = hits[1];    // Y position of hit
+  fZ               = hits[2];    // Z position of hit
+  fTrackPiD        = hits[3];    // Track PiD
+  fTof             = hits[4];    // Particle time of flight
+  fCharge          = hits[5];    // Particle charge
+  fTheta           = hits[6];    // Incident theta angle in degrees 
+  fPhi             = hits[7];    // Incident phi angle in degrees
+  fRingNumber      = hits[8];    // Ring number 

   
   

-  fPt              = hits[9];
-  fPmom            = hits[10];
-  fPx              = hits[11];
-  fPy              = hits[12];
-  fPz              = hits[13];
+  fPt              = hits[9];    // Local transverse momentum of the particle
+  fPmom            = hits[10];   // Local P momentum of the particle
+  fPx              = hits[11];   // Local Px momentum of the particle
+  fPy              = hits[12];   // Local Py momentum of the particle
+  fPz              = hits[13];   // Local Pz momentum of the particle

   
   

-  fVx              = hits[14];
-  fVy              = hits[15];
-  fVz              = hits[16];
+  fVx              = hits[14];   // Vertex x coordinate
+  fVy              = hits[15];   // Vertex y coordinate
+  fVz              = hits[16];   // Vertex z coordinate

   
   

-  fEloss           = hits[17];
-  fTleng           = hits[18];
+  fEloss           = hits[17];   // Energy deposited inside volume
+  fTleng           = hits[18];   // Track length inside volume

   
 }
   
 }

diff --git a/VZERO/AliVZEROhit.h b/VZERO/AliVZEROhit.h
index 11a92169d713c232bf78fd93c21a75e01591dddc..d1efcbd48d5022d794b96ccaa9702e61d3ab783e 100644 (file)
--- a/VZERO/AliVZEROhit.h
+++ b/VZERO/AliVZEROhit.h
@@ -6,7 +6,9 @@
 /* $Id$ */
 
 ////////////////////////////////////////////////
 /* $Id$ */
 
 ////////////////////////////////////////////////

+//                                            //

 //  Manager and hits classes for set : VZERO  //
 //  Manager and hits classes for set : VZERO  //

+//                                            //

 ////////////////////////////////////////////////
  
 #include "AliHit.h"
 ////////////////////////////////////////////////
  
 #include "AliHit.h"


@@ -20,45 +22,45 @@ public:
   AliVZEROhit(Int_t shunt, Int_t track, Int_t *vol, Float_t *hits);
   virtual ~AliVZEROhit() {};
   
   AliVZEROhit(Int_t shunt, Int_t track, Int_t *vol, Float_t *hits);
   virtual ~AliVZEROhit() {};
   

-  Int_t Volume()  {return fVolume;};
-  Int_t Copy()    {return fCopy;};
-  Float_t TrackPiD() {return fTrackPiD;};
-  Float_t Tof()   {return fTof;};
-  Float_t Charge() {return fCharge;};
-  Float_t RingNumber() {return fRingNumber;};
-  Float_t Pt()    {return fPt;};
-  Float_t Pmom()  {return fPmom;};
-  Float_t Px()    {return fPx;};
-  Float_t Py()    {return fPy;};
-  Float_t Pz()    {return fPz;};
-  Float_t Vx()    {return fVx;};
-  Float_t Vy()    {return fVy;};
-  Float_t Vz()    {return fVz;};
-  Float_t Eloss() {return fEloss;}
-  Float_t Tleng() {return fTleng;}
+  Int_t   Volume()  const {return fVolume;};
+  Int_t   Copy()    const {return fCopy;};
+  Float_t TrackPiD() const {return fTrackPiD;};
+  Float_t Tof()   const {return fTof;};
+  Float_t Charge() const {return fCharge;};
+  Float_t RingNumber() const {return fRingNumber;};
+  Float_t Pt()    const {return fPt;};
+  Float_t Pmom()  const {return fPmom;};
+  Float_t Px()    const {return fPx;};
+  Float_t Py()    const {return fPy;};
+  Float_t Pz()    const {return fPz;};
+  Float_t Vx()    const {return fVx;};
+  Float_t Vy()    const {return fVy;};
+  Float_t Vz()    const {return fVz;};
+  Float_t Eloss() const {return fEloss;}
+  Float_t Tleng() const {return fTleng;}

  
 private:
  
 private:

-  Int_t   fVolume;                // Current volume ID
-  Int_t   fCopy;                  // Copy number
-  Float_t fTrackPiD;              // Root particle ID 
-  Float_t fTof;                   // Time of flight wrt vertex
-  Float_t fCharge;                // Charge of particle
-  Float_t fTheta; 
-  Float_t fPhi;
-  Float_t fRingNumber;            // RingNumber
+  Int_t   fVolume;        // Current volume ID
+  Int_t   fCopy;          // Current copy number
+  Float_t fTrackPiD;      // Track PiD 
+  Float_t fTof;           // Particle time of flight wrt vertex
+  Float_t fCharge;        // Particle charge
+  Float_t fTheta;         // Incident theta angle in degrees 
+  Float_t fPhi;           // Incident phi angle in degrees
+  Float_t fRingNumber;    // RingNumber

   
   

-  Float_t fPt;
-  Float_t fPmom;
-  Float_t fPx;
-  Float_t fPy;
-  Float_t fPz;
-  Float_t fVx;            //  Vertex x coordinate  
-  Float_t fVy;            //  Vertex y coordinate  
-  Float_t fVz;            //  Vertex z coordinate    
-  Float_t fEloss;         //  energy loss  in VZERO detector
-  Float_t fTleng;         //  track length in VZERO detector
+  Float_t fPt;            // Local transverse momentum of the particle
+  Float_t fPmom;          // Local P momentum of the particle
+  Float_t fPx;            // Local Px momentum of the particle
+  Float_t fPy;            // Local Py momentum of the particle
+  Float_t fPz;            // Local Pz momentum of the particle
+  Float_t fVx;            // Vertex x coordinate  
+  Float_t fVy;            // Vertex y coordinate  
+  Float_t fVz;            // Vertex z coordinate    
+  Float_t fEloss;         // Energy loss  in VZERO detector
+  Float_t fTleng;         // Track length in VZERO detector

   
     
   
     

-  ClassDef(AliVZEROhit,2)  //Hits for detector VZERO
+  ClassDef(AliVZEROhit,2) //  Hits for detector VZERO

 };
 #endif
 };
 #endif

diff --git a/VZERO/AliVZEROv2.cxx b/VZERO/AliVZEROv2.cxx
index 2708e2d8e3ee431966ac1676d6e450f712d16da4..1de907a15e6bb63f219469469d9845286e86cec9 100755 (executable)
--- a/VZERO/AliVZEROv2.cxx
+++ b/VZERO/AliVZEROv2.cxx
@@ -46,22 +46,24 @@
 #include <TParticle.h>
 
 // --- AliRoot header files ---
 #include <TParticle.h>
 
 // --- AliRoot header files ---

+#include "AliRun.h"
+#include "AliMC.h"

 #include "AliConst.h"
 #include "AliMagF.h"
 #include "AliVZEROLoader.h"
 #include "AliVZEROdigit.h"
 #include "AliVZEROhit.h"
 #include "AliVZEROv2.h"
 #include "AliConst.h"
 #include "AliMagF.h"
 #include "AliVZEROLoader.h"
 #include "AliVZEROdigit.h"
 #include "AliVZEROhit.h"
 #include "AliVZEROv2.h"

-#include "AliMC.h"

 
 ClassImp(AliVZEROv2)
 
 
 ClassImp(AliVZEROv2)
 

-//--------------------------------------------------------------------
+//_____________________________________________________________________________

 AliVZEROv2:: AliVZEROv2():AliVZERO()
 {
 // Standard default constructor 
 }
 AliVZEROv2:: AliVZEROv2():AliVZERO()
 {
 // Standard default constructor 
 }

-//--------------------------------------------------------------------
+
+//_____________________________________________________________________________

 AliVZEROv2::AliVZEROv2(const char *name, const char *title):
  AliVZERO(name,title)
 {
 AliVZEROv2::AliVZEROv2(const char *name, const char *title):
  AliVZERO(name,title)
 {


@@ -78,7 +80,7 @@ AliVZEROv2::AliVZEROv2(const char *name, const char *title):
   
 }
 
   
 }
 

-//-------------------------------------------------------------------------
+//_____________________________________________________________________________

 void AliVZEROv2::CreateGeometry()
 {
 
 void AliVZEROv2::CreateGeometry()
 {
 


@@ -112,20 +114,20 @@ void AliVZEROv2::CreateGeometry()
   Float_t  r0, r5;
   Float_t  pi = TMath::Pi();
     
   Float_t  r0, r5;
   Float_t  pi = TMath::Pi();
     

-  height1           =     1.82;           // height of cell 1, in cm
-  height2           =     3.81;           // height of cell 2, in cm
-  height3           =     4.72;           // height of cell 3, in cm
-  height4           =     7.12;           // height of cell 4, in cm
-  height5           =    10.83;           // height of cell 5, in cm
+  height1     =     1.82;         // height of cell 1, in cm
+  height2     =     3.81;         // height of cell 2, in cm
+  height3     =     4.72;         // height of cell 3, in cm
+  height4     =     7.12;         // height of cell 4, in cm
+  height5     =    10.83;         // height of cell 5, in cm

   
   

-  theta             = pi/6.0/2.0;       // half angular opening = 15 degrees
+  theta       = pi/6.0/2.0;       // half angular opening = 15 degrees

     
     

-  halfThickQua    = fThickness1/2.0;   // half thickness of elementary cell (inner ring)
+  halfThickQua= fThickness1/2.0;  // half thickness of elementary cell (inner ring)

     
     

-  zdet              =    90.0 - 0.6 -fThickness/2.0;  // distance to vertex (along Z axis)
-  r0                =    4.05;            // closest distance to center of the beam pipe
-  height            =    height1 + height2 + height3 + height4 + height5;
-  r5                =    r0 + height;
+  zdet        =    90.0 - 0.6 -fThickness/2.0;  // distance to vertex (along Z axis)
+  r0          =    4.05;          // closest distance to center of the beam pipe
+  height      =    height1 + height2 + height3 + height4 + height5;
+  r5          =    r0 + height;

 
 // Creation of mother volume v0LE - left part - :
 // Entrance face at  +350.0 cm  (new coordinate system) ...
 
 // Creation of mother volume v0LE - left part - :
 // Entrance face at  +350.0 cm  (new coordinate system) ...


@@ -636,8 +638,8 @@ void AliVZEROv2::BuildGeometry()
   v0L0->SetNumberOfDivisions(ndiv); 
   v0L0->SetLineColor(7);
   
   v0L0->SetNumberOfDivisions(ndiv); 
   v0L0->SetLineColor(7);
   

-  Float_t   offset_left;
-  offset_left    = - fThickness1/2.0; 
+  Float_t   offsetLeft;
+  offsetLeft    = - fThickness1/2.0; 

 
   Float_t   r1Left =  r0Left + height1Left;        
       
 
   Float_t   r1Left =  r0Left + height1Left;        
       


@@ -709,7 +711,7 @@ void AliVZEROv2::BuildGeometry()
     sprintf(nameNode,"SUBDEL%d",ndetL);
     
     v0Lnode->cd();
     sprintf(nameNode,"SUBDEL%d",ndetL);
     
     v0Lnode->cd();

-    v0Lnode0 = new TNode(nameNode,nameNode,v0L0,0.0,0.0, offset_left + halfThickQua,mat920);    
+    v0Lnode0 = new TNode(nameNode,nameNode,v0L0,0.0,0.0, offsetLeft + halfThickQua,mat920);     

     v0Lnode0->SetLineColor(kColorVZERO);
     fNodes->Add(v0Lnode0);
     ndetL++;
     v0Lnode0->SetLineColor(kColorVZERO);
     fNodes->Add(v0Lnode0);
     ndetL++;


@@ -763,7 +765,7 @@ void AliVZEROv2::BuildGeometry()
      
 }  
     
      
 }  
     

-//------------------------------------------------------------------------
+//_____________________________________________________________________________

 void AliVZEROv2::CreateMaterials()
 {
 
 void AliVZEROv2::CreateMaterials()
 {
 


@@ -925,10 +927,10 @@ void AliVZEROv2::CreateMaterials()
 
 //    gMC->SetCerenkov(idtmed[3002], 14, ppckov, absco_quarz, effic_all,rindex_quarz);    
 //    gMC->SetCerenkov(idtmed[3004], 14, ppckov_alu, absco_alu, effic_alu, rindex_alu);
 
 //    gMC->SetCerenkov(idtmed[3002], 14, ppckov, absco_quarz, effic_all,rindex_quarz);    
 //    gMC->SetCerenkov(idtmed[3004], 14, ppckov_alu, absco_alu, effic_alu, rindex_alu);

-                                   
-    
+                                       

 }
 }

-//---------------------------------------------------------------------
+
+//_____________________________________________________________________________

 void AliVZEROv2::DrawModule()
 {
 
 void AliVZEROv2::DrawModule()
 {
 


@@ -945,10 +947,10 @@ void AliVZEROv2::DrawModule()
 
 }
 
 
 }
 

-//-------------------------------------------------------------------
+//_____________________________________________________________________________

 void AliVZEROv2::Init()
 {
 void AliVZEROv2::Init()
 {

-// Initialises version 1 of the VZERO Detector
+// Initialises version 2 of the VZERO Detector

 // Just prints an information message
   
    printf(" VZERO version %d initialized \n",IsVersion());
 // Just prints an information message
   
    printf(" VZERO version %d initialized \n",IsVersion());


@@ -960,8 +962,8 @@ void AliVZEROv2::Init()
   
 }
 
   
 }
 

-//-------------------------------------------------------------------

 
 

+//_____________________________________________________________________________

 void AliVZEROv2::StepManager()
 {
  
 void AliVZEROv2::StepManager()
 {
  


@@ -977,7 +979,7 @@ void AliVZEROv2::StepManager()
      
      Float_t        theta;
      Float_t        phi;
      
      Float_t        theta;
      Float_t        phi;

-     Float_t        kRaddeg = 180/TMath::Pi();
+     Float_t        kRaddeg = 180.0/TMath::Pi();

      Float_t        ringNumber;
 
      Int_t          ipart;
      Float_t        ringNumber;
 
      Int_t          ipart;


@@ -1071,7 +1073,6 @@ void AliVZEROv2::StepManager()
                 
         tlength  = 0.0;
         eloss    = 0.0; 
                 
         tlength  = 0.0;
         eloss    = 0.0; 

-

          
         } 
     }
          
         } 
     }


@@ -1088,7 +1089,7 @@ void AliVZEROv2::AddHit(Int_t track, Int_t *vol, Float_t *hits)
   new(lhits[fNhits++]) AliVZEROhit(fIshunt,track,vol,hits);
 }
 
   new(lhits[fNhits++]) AliVZEROhit(fIshunt,track,vol,hits);
 }
 

-//---------------------------------------------------------------------
+//_____________________________________________________________________________

 void AliVZEROv2::AddDigits(Int_t *tracks, Int_t* digits) 
 {
 
 void AliVZEROv2::AddDigits(Int_t *tracks, Int_t* digits) 
 {
 


@@ -1098,7 +1099,7 @@ void AliVZEROv2::AddDigits(Int_t *tracks, Int_t* digits)
    new(ldigits[fNdigits++]) AliVZEROdigit(tracks, digits);
 }
 
    new(ldigits[fNdigits++]) AliVZEROdigit(tracks, digits);
 }
 

-//---------------------------------------------------------------------
+//_____________________________________________________________________________

 void AliVZEROv2::MakeBranch(Option_t *option)
 {
   
 void AliVZEROv2::MakeBranch(Option_t *option)
 {
   


@@ -1116,7 +1117,7 @@ void AliVZEROv2::MakeBranch(Option_t *option)
   }     
 
   const char *cD = strstr(option,"D");
   }     
 
   const char *cD = strstr(option,"D");

-  //
+  

   if (fDigits   && fLoader->TreeD() && cD) {
     fLoader->TreeD()->Branch(branchname,&fDigits, fBufferSize);
     printf("* AliDetector::MakeBranch * Making Branch %s for digits\n",branchname);
   if (fDigits   && fLoader->TreeD() && cD) {
     fLoader->TreeD()->Branch(branchname,&fDigits, fBufferSize);
     printf("* AliDetector::MakeBranch * Making Branch %s for digits\n",branchname);

diff --git a/VZERO/AliVZEROv2.h b/VZERO/AliVZEROv2.h
index d9b49e135005d9133417a344d7be1c37e32ddf60..9efb0b70830d2b2bbc83ac3f84269887b17639dd 100755 (executable)
--- a/VZERO/AliVZEROv2.h
+++ b/VZERO/AliVZEROv2.h
@@ -5,7 +5,9 @@
 
 
 ///////////////////////////////////////////////////
 
 
 ///////////////////////////////////////////////////

+//                                               //

 //  Manager and hits classes for set : VZERO     //
 //  Manager and hits classes for set : VZERO     //

+//                                               //

 ///////////////////////////////////////////////////
  
 #include "AliVZERO.h"
 ///////////////////////////////////////////////////
  
 #include "AliVZERO.h"