Removal of obsolete code
authorcvetan <cvetan@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 20 Apr 2010 17:41:38 +0000 (17:41 +0000)
committercvetan <cvetan@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 20 Apr 2010 17:41:38 +0000 (17:41 +0000)
VZERO/AliVZEROv2.cxx [deleted file]
VZERO/AliVZEROv2.h [deleted file]
VZERO/AliVZEROv3.cxx [deleted file]
VZERO/AliVZEROv3.h [deleted file]
VZERO/AliVZEROv4.cxx [deleted file]
VZERO/AliVZEROv4.h [deleted file]
VZERO/AliVZEROv5.cxx [deleted file]
VZERO/AliVZEROv5.h [deleted file]
VZERO/VZEROsimLinkDef.h
VZERO/libVZEROsim.pkg

diff --git a/VZERO/AliVZEROv2.cxx b/VZERO/AliVZEROv2.cxx
deleted file mode 100755 (executable)
index ec6242e..0000000
+++ /dev/null
@@ -1,715 +0,0 @@
-/**************************************************************************
- * 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$ */
-
-//////////////////////////////////////////////////////////////////////
-//                                                                  //
-//  (V-zero) detector  version 2  as designed by the Lyon group     //
-//   All comments should be sent to Brigitte CHEYNIS :              //
-//                                  b.cheynis@ipnl.in2p3.fr         // 
-//   Geometry of the  26th of november 2003                         //
-//  (circular instead of trapezoidal shapes as in previous versions //
-//   plus changes in cell dimensions and offsets) :                 // 
-//   Scintillating cells are now 2 cm thick instead of 0.7 cm       //
-//   V0R sits between Z values  -89.4 and  -85.0 cm                 //
-//   V0L sits between Z values +350.0 and +352.0 cm                 //
-//   New coordinate system has been implemented in october 2003     //
-//                                                                  //
-//////////////////////////////////////////////////////////////////////
-
-// --- Standard libraries ---
-#include <Riostream.h>
-#include <stdlib.h>
-#include <string.h>
-
-// --- ROOT libraries ---
-#include <TClonesArray.h>
-#include <TGeoGlobalMagField.h>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjectTable.h>
-#include <TParticle.h>
-#include <TVirtualMC.h>
-
-// --- AliRoot header files ---
-#include "AliRun.h"
-#include "AliMC.h"
-#include "AliConst.h"
-#include "AliLog.h"
-#include "AliMagF.h"
-#include "AliVZEROLoader.h"
-#include "AliVZEROdigit.h"
-#include "AliVZEROhit.h"
-#include "AliVZEROv2.h"
-
-ClassImp(AliVZEROv2)
-
-//_____________________________________________________________________________
-AliVZEROv2:: AliVZEROv2():AliVZERO()
-{
-// Standard default constructor 
-}
-
-//_____________________________________________________________________________
-AliVZEROv2::AliVZEROv2(const char *name, const char *title):
- AliVZERO(name,title)
-{
-
-// Standard constructor for V-zero Detector  version 2
-
-  AliDebug(2,"Create VZERO object");
-  
-}
-
-//_____________________________________________________________________________
-void AliVZEROv2::CreateGeometry()
-{
-
-// Creates the GEANT geometry of the V-zero Detector  version 2
-  
-  AliDebug(2,"Create VZERO Geometry");
-      
-  Int_t    *idtmed = fIdtmed->GetArray()-2999;
-
-  Int_t    ndetR = 1;
-  Int_t    ndetL = 1;
-  Int_t    ncellsR = 1;
-  Int_t    ncellsL = 1;
-  
-  Int_t    idrotm[999];
-  Float_t  height1, height2, height3, height4, height5; 
-  Float_t  height;
-  Float_t  theta;  
-  
-  Float_t  halfThickQua;
-  
-  Float_t  zdet;
-  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
-  
-  theta       = pi/6.0/2.0;       // half angular opening = 15 degrees
-    
-  halfThickQua= fThickness1/2.0;  // half thickness of elementary cell (inner ring)
-  
-// distance 0.6 cm in zdet accounts for the fact V0R box back lid sits 0.6 away from 
-// absorber nose sitting at 90 cm. Will use -zdet later...
-   
-  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) ...
-
-   Float_t   partube[3];
-   
-   partube[0] =  4.3;
-   partube[1] = 45.0;
-   partube[2] = fThickness1/2.0;   
-    
-   gMC->Gsvolu("V0LE","TUBE",idtmed[3005],partube,3);
-     
-// Creation of five rings - left part - :
-// Entrance face at +350.0 cm  (new coordinate system) ... 
-
-// Mother volume v0L0 in which will be set 5 scintillator cells 
-
-  Float_t   partubs[5];  
-    
-  Float_t   r0Left      =   4.3;   
-  Float_t   height1Left =   2.6; 
-  Float_t   height2Left =   4.1;
-  Float_t   height3Left =   6.4;
-  Float_t   height4Left =  10.2;
-  Float_t   height5Left =  16.9;
-  Float_t   heightLeft  = height1Left + height2Left + height3Left 
-                                      + height4Left + height5Left;
-  Float_t   r5Left      = r0Left  + heightLeft; 
-  
-  partubs[0]      =  r0Left;
-  partubs[1]      =  r5Left;
-  partubs[2]      =  fThickness1/2.0;
-  partubs[3]      =  90.0-15.0;
-  partubs[4]      = 120.0-15.0;
-
-  gMC->Gsvolu("V0L0","TUBS",idtmed[3010],partubs,5);  // air volume
-  
-  Float_t  r1Left =  r0Left + height1Left;        
-     
-  partubs[0]     =  r0Left;
-  partubs[1]     =  r1Left;
-
-  gMC->Gsvolu("V0L1","TUBS",idtmed[3005],partubs,5);  // quartz volume
-  gMC->Gspos("V0L1",1,"V0L0", 0.0, 0.0 , 0.0, 0,"ONLY"); 
-
-  Float_t   r2Left  =   r1Left + height2Left;       
-  
-  partubs[0]     =  r1Left;
-  partubs[1]     =  r2Left;
-
-  gMC->Gsvolu("V0L2","TUBS",idtmed[3005],partubs,5);  // quartz volume
-  gMC->Gspos("V0L2",1,"V0L0", 0.0, 0.0 , 0.0, 0,"ONLY"); 
-  
-  Float_t   r3Left =   r2Left + height3Left;
-   
-  partubs[0]     =  r2Left;
-  partubs[1]     =  r3Left;
-
-  gMC->Gsvolu("V0L3","TUBS",idtmed[3005],partubs,5);  // quartz volume
-  gMC->Gspos("V0L3",1,"V0L0", 0.0, 0.0 , 0.0, 0,"ONLY");
-  
-  Float_t   r4Left =  r3Left + height4Left;
-   
-  partubs[0]     =  r3Left;
-  partubs[1]     =  r4Left;
-
-  gMC->Gsvolu("V0L4","TUBS",idtmed[3005],partubs,5);  // quartz volume
-  gMC->Gspos("V0L4",1,"V0L0", 0.0, 0.0 , 0.0, 0,"ONLY");
-
-  partubs[0]     =  r4Left;
-  partubs[1]     =  r5Left;
-  partubs[3]     =  90.0-15.0;
-  partubs[4]     = 120.0-30.0;
-  
-  gMC->Gsvolu("V0L5","TUBS",idtmed[3005],partubs,5);  // quartz volume
-  gMC->Gspos("V0L5",1,"V0L0", 0.0, 0.0 , 0.0, 0,"ONLY");
-  
-  partubs[3]     = 120.0-30.0;
-  partubs[4]     = 120.0-15.0;
-  
-  gMC->Gsvolu("V0L6","TUBS",idtmed[3005],partubs,5);  // quartz volume
-  gMC->Gspos("V0L6",1,"V0L0", 0.0, 0.0 , 0.0, 0,"ONLY");
-  
-
-// Creation of mother volume v0RI - right part - :
-  
-  partube[0] = r0 - 0.2;
-  partube[1] = r5 + 1.0;
-  partube[2] = fThickness/2.0; 
-      
-  gMC->Gsvolu("V0RI","TUBE",idtmed[3010],partube,3);
-  
-// Creation of  carbon lids (2 mm thick) to keep v0RI box shut...
-
-  Float_t  lidThickness = 0.2;
-  partube[0] =   r0;
-  partube[1] =   r5;
-  partube[2] =   +lidThickness/2.0;
-    
-  gMC->Gsvolu("V0CA","TUBE",idtmed[3001],partube,3); 
-  gMC->Gspos("V0CA",1,"V0RI",0.0,0.0, fThickness/2.0-partube[2],0,"ONLY");
-  gMC->Gspos("V0CA",2,"V0RI",0.0,0.0,-fThickness/2.0+partube[2],0,"ONLY");
-  
-// Creation of aluminum rings to maintain the v0RI pieces ...
-
-  partube[0] =   r0 - 0.2;
-  partube[1] =   r0;
-  partube[2] =   +fThickness/2.0;
-   
-  gMC->Gsvolu("V0IR","TUBE",idtmed[3003],partube,3);    
-  gMC->Gspos("V0IR",1,"V0RI",0.0,0.0,0.0,0,"ONLY");
-
-  partube[0] =   r5;
-  partube[1] =   r5 + 1.0;
-  partube[2] =   +fThickness/2.0;
-  gMC->Gsvolu("V0ER","TUBE",idtmed[3003],partube,3);    
-  gMC->Gspos("V0ER",1,"V0RI",0.0,0.0,0.0,0,"ONLY");
-  
-// Mother volume v0R0 in which will be set 5  scintillator cells 
-  
-  partubs[0]      =  r0;
-  partubs[1]      =  r5;
-  partubs[2]      =  fThickness/2.0;
-  partubs[3]      =  90.0-15.0;
-  partubs[4]      = 120.0-15.0;
-
-  gMC->Gsvolu("V0R0","TUBS",idtmed[3010],partubs,5);  // air volume 
-
-// Elementary cell of ring 1 :
-// (cells 2 and 3  will be shifted by 1 cm to output fibers) 
-   
-  Float_t   offsetFibers  =  1.0;
-  Float_t   offset        =  fThickness/2.0 - lidThickness - fThickness1/2.0; 
-  Float_t   r1            =  r0 + height1;
-      
-  partubs[0]     =  r0;
-  partubs[1]     =  r1;
-  partubs[2]     =  fThickness1/2.0;
-  
-  gMC->Gsvolu("V0R1","TUBS",idtmed[3005],partubs,5);  // scintillator volume
-  gMC->Gspos("V0R1",1,"V0R0", 0.0, 0.0 , -offset, 0,"ONLY"); 
-
-// Elementary cell of ring 2 :
-
-  Float_t   r2   =  r1 + height2;       
-  
-  partubs[0]     =  r1;
-  partubs[1]     =  r2;
-
-  gMC->Gsvolu("V0R2","TUBS",idtmed[3005],partubs,5);  // scintillator volume
-  gMC->Gspos("V0R2",1,"V0R0", 0.0, 0.0 , -offset + offsetFibers, 0,"ONLY"); 
-
-
-// Elementary cell of ring 3 :
-  
-  Float_t   r3   =  r2 + height3;
-   
-  partubs[0]     =  r2;
-  partubs[1]     =  r3;
-
-  gMC->Gsvolu("V0R3","TUBS",idtmed[3005],partubs,5);  // scintillator volume
-  gMC->Gspos("V0R3",1,"V0R0", 0.0, 0.0 , -offset + 2.0 * offsetFibers, 0,"ONLY");
-
-// Elementary cell of ring 4 :
-  
-  Float_t   r4   =  r3 + height4 ;
-  
-  partubs[0]     =  r3;
-  partubs[1]     =  r4;
-
-  gMC->Gsvolu("V0R4","TUBS",idtmed[3005],partubs,5);  // scintillator volume
-  gMC->Gspos("V0R4",1,"V0R0", 0.0, 0.0 ,  -offset + 2.0 * offsetFibers, 0,"ONLY");
-
-// Elementary cells of ring 5 :
-
-  partubs[0]     =  r4;
-  partubs[1]     =  r5;
-  partubs[3]     =  90.0-15.0;
-  partubs[4]     = 120.0-30.0;
-  
-  gMC->Gsvolu("V0R5","TUBS",idtmed[3005],partubs,5);  // scintillator volume
-  gMC->Gspos("V0R5",1,"V0R0", 0.0, 0.0 , -offset + 2.0 * offsetFibers, 0,"ONLY");  
-
-  partubs[3]     = 120.0-30.0;
-  partubs[4]     = 120.0-15.0;
-  
-  gMC->Gsvolu("V0R6","TUBS",idtmed[3005],partubs,5);  // scintillator volume
-  gMC->Gspos("V0R6",1,"V0R0", 0.0, 0.0 ,  -offset + 2.0 * offsetFibers, 0,"ONLY");
-   
-  Float_t  phiDeg = 180./6.; 
-
-// Right part : 
-  for(Float_t  phi = 15.0; phi < 360.0; phi = phi + phiDeg)
-      {        
-       AliMatrix(idrotm[902], 90.0, phi, 90.0, 90.0 +phi, 0.0 , 0.0);
-        gMC->Gspos("V0R0",ndetR,"V0RI",0.0,
-                         0.0,0.0,idrotm[902],"ONLY");
-       ndetR++;
-       }
-
-  gMC->Gspos("V0RI",1,"ALIC",0.0,0.0,-zdet,0,"ONLY");
-  ncellsR = (ndetR - 1) * 6;  
-  AliInfo(Form("Number of cells on Right side =   %d",  ncellsR));    
-
-// Left part :
-
-  for(Float_t  phi = 15.0; phi < 360.0; phi = phi + phiDeg)
-      {       
-       AliMatrix(idrotm[902], 90.0, phi, 90.0, 90.0 +phi, 0.0 , 0.0);
-        gMC->Gspos("V0L0",ndetL,"V0LE",0.0,
-                         0.0,0.0,idrotm[902],"ONLY");
-        ndetL++;
-       }
-
-  gMC->Gspos("V0LE",1,"ALIC",0.0,0.0,350.0+fThickness1/2.0,0,"ONLY");
-  ncellsL = (ndetL - 1) * 6;
-  AliInfo(Form("Number of cells on Left side  =   %d",  ncellsL));    
-           
-}            
-    
-//_____________________________________________________________________________
-void AliVZEROv2::CreateMaterials()
-{
-
-// Creates materials used for geometry 
-
-    AliDebug(2,"VZERO create materials");
-    
-/*
-    Float_t ppckov[14] = { 5.5e-9, 5.7e-9, 5.9e-9, 6.1e-9, 6.3e-9, 6.5e-9, 6.7e-9, 
-                           6.9e-9, 7.1e-9, 7.3e-9, 7.5e-9, 7.7e-9, 7.9e-9, 8.1e-9 };
-
-           
-    Float_t ppckov_alu[14] = { 5.5e-9, 5.7e-9, 5.9e-9, 6.1e-9, 6.3e-9, 6.5e-9, 6.7e-9, 
-                               6.9e-9, 7.1e-9, 7.3e-9, 7.5e-9, 7.7e-9, 7.9e-9, 8.1e-9 };
-                          
-    Float_t rindex_quarz[14] = { 1.52398,  1.53090, 1.53835, 1.54641, 1.55513, 1.56458, 
-                                 1.57488,  1.58611, 1.59842, 1.61197, 1.62696, 1.64362, 
-                                 1.662295, 1.68337 };
-                                
-    Float_t absco_quarz[14] = { 105.8,  45.656, 35.665, 28.598, 25.007, 21.04, 17.525, 
-                                14.177, 9.282, 4.0925, 1.149, 0.3627, 0.1497, 0.05 };  
-                                                                                       
-    Float_t effic_all[14]   = { 1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1. };
-    
-        
-    Float_t rindex_alu[14] = { 1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1. }; 
-    
-    
-    Float_t absco_alu[14]  = { 1e-4,1e-4,1e-4,1e-4,1e-4,1e-4,1e-4,1e-4,1e-4,1e-4,
-                              1e-4,1e-4,1e-4,1e-4 };
-    Float_t effic_alu[14]  = { 1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1. };
-
-*/       
-
-    Int_t *idtmed = fIdtmed->GetArray()-2999;
-    
-    
-//  Parameters related to Quarz (SiO2) :
-    Float_t aqua[2], zqua[2], densqua, wmatqua[2];
-    Int_t nlmatqua;
-    
-    aqua[0]    = 28.09;
-    aqua[1]    = 16.;
-    zqua[0]    = 14.;
-    zqua[1]    = 8.;
-    densqua    = 2.64;
-    nlmatqua   = -2;
-    wmatqua[0] = 1.;
-    wmatqua[1] = 2.;
-
-// Parameters  related to aluminum sheets :
-    
-    Float_t  aal   = 26.98;
-    Float_t  zal   = 13.00; 
-    Float_t  densal=   2.7; 
-    Float_t  radlal=   8.9;
-       
-// Parameters  related to scintillator CH :
-    
-    Float_t ascin[2] = {1.00794,12.011};
-    Float_t zscin[2] = {1.,6.};
-    Float_t wscin[2] = {1.,1.};
-    Float_t denscin  = 1.032;
-
-// AIR
-
-    Float_t aAir[4]={12.,14.,16.,36.};
-    Float_t zAir[4]={6.,7.,8.,18.};
-    Float_t wAir[4]={0.000124,0.755267,0.231781,0.012827};
-    Float_t dAir = 1.20479E-3;
-        
-//  Definition of materials :
-       
-    AliMixture( 1, "AIR A$", aAir,zAir,dAir,4,wAir);
-    AliMixture(11, "AIR I$", aAir,zAir,dAir,4,wAir);
-    AliMaterial( 2, "CARBON$"  , 12.01, 6.0, 2.265, 18.8, 49.9, 0, 0);
-    AliMixture(  3, "QUA", aqua, zqua, densqua, nlmatqua, wmatqua);
-    AliMaterial( 4, "ALUMINIUM1$", 26.98, 13., 2.7, 8.9, 37.2, 0, 0);
-    AliMaterial( 5, "ALUMINIUM2$", aal, zal, densal, radlal, 0, 0, 0);
-    AliMixture( 6, "Scintillator$",ascin,zscin,denscin,-2,wscin);
-    
-     
-    Int_t   iSXFLD = ((AliMagF*)TGeoGlobalMagField::Instance()->GetField())->Integ();     // Field type  
-    Float_t sXMGMX = ((AliMagF*)TGeoGlobalMagField::Instance()->GetField())->Max();       // Field max.
-    
-    Float_t tmaxfd, stemax, deemax, epsil, stmin;
-        
-    tmaxfd = 10.;
-    stemax = 0.1;
-    deemax = 0.1;     
-    epsil  = 0.001;
-    stmin  = 0.001;
-  
-//  Active Air :    
-    AliMedium(1, "ACTIVE AIR$", 1, 1, iSXFLD, sXMGMX,
-              10.0, 1.0, 0.1, 0.1, 10.0, 0, 0) ;
-
-//  Inactive air : 
-  
-    AliMedium(11, "INACTIVE AIR$", 11, 0, iSXFLD, sXMGMX,
-              10.0, 1.0, 0.1, 0.1, 10.0, 0, 0) ;
-    
-    AliMedium(2, "CARBON$ ", 2,  1, iSXFLD, sXMGMX,
-              tmaxfd, stemax, deemax, epsil, stmin, 0, 0);   
-
-    AliMedium(3, "QUARZ$", 3, 1, iSXFLD, sXMGMX,
-              tmaxfd, fMaxStepQua, fMaxDestepQua, epsil, stmin, 0, 0);
-    
-    AliMedium(4,"ALUMINUM1$",4, 1, iSXFLD, sXMGMX,
-              tmaxfd, fMaxStepAlu, fMaxDestepAlu, epsil, stmin, 0, 0);
-             
-
-    AliMedium(5,"ALUMINUM2$",5, 1, iSXFLD, sXMGMX,
-              tmaxfd, fMaxStepAlu, fMaxDestepAlu, epsil, stmin, 0, 0);    
-
-    AliMedium(6,"SCINTILLATOR$",6, 1, iSXFLD, sXMGMX, 10.0, 0.1, 0.1, 0.003, 0.003, 0, 0);
-
-    gMC->Gstpar(idtmed[3000], "LOSS", 1.);  //  [3000] = air ACTIF  [3010] = air INACTIF
-    gMC->Gstpar(idtmed[3000], "HADR", 1.);
-    gMC->Gstpar(idtmed[3000], "DCAY", 1.);
-    gMC->Gstpar(idtmed[3000], "DRAY", 1.);
-    
-    gMC->Gstpar(idtmed[3001], "LOSS", 1.);  //  [3001] = carbon
-    gMC->Gstpar(idtmed[3001], "HADR", 1.);
-    gMC->Gstpar(idtmed[3001], "DCAY", 1.);
-    gMC->Gstpar(idtmed[3001], "DRAY", 1.);
-
-    gMC->Gstpar(idtmed[3002], "LOSS", 1.);  //  [3002] = quartz
-    gMC->Gstpar(idtmed[3002], "HADR", 1.);
-    gMC->Gstpar(idtmed[3002], "DCAY", 1.);
-    gMC->Gstpar(idtmed[3002], "DRAY", 1.);  
-    gMC->Gstpar(idtmed[3002], "CUTGAM",0.5E-4) ; 
-    gMC->Gstpar(idtmed[3002], "CUTELE",1.0E-4) ;
-    
-    gMC->Gstpar(idtmed[3003], "LOSS", 1.);  //  [3003] = normal aluminum
-    gMC->Gstpar(idtmed[3003], "HADR", 1.);
-    gMC->Gstpar(idtmed[3003], "DCAY", 1.);
-    gMC->Gstpar(idtmed[3003], "DRAY", 1.);
-    
-    gMC->Gstpar(idtmed[3004], "LOSS", 1.);  //  [3004] = reflecting aluminum
-    gMC->Gstpar(idtmed[3004], "HADR", 1.);
-    gMC->Gstpar(idtmed[3004], "DCAY", 1.);
-    gMC->Gstpar(idtmed[3004], "DRAY", 1.);
-    gMC->Gstpar(idtmed[3004], "CUTGAM",0.5E-4) ; 
-    gMC->Gstpar(idtmed[3004], "CUTELE",1.0E-4) ;
-    
-    gMC->Gstpar(idtmed[3005], "LOSS", 1.);  //  [3005] = scintillator
-    gMC->Gstpar(idtmed[3005], "HADR", 1.);
-    gMC->Gstpar(idtmed[3005], "DCAY", 1.);
-    gMC->Gstpar(idtmed[3005], "DRAY", 1.); 
-    gMC->Gstpar(idtmed[3005], "CUTGAM",0.5E-4) ; 
-    gMC->Gstpar(idtmed[3005], "CUTELE",1.0E-4) ;
-      
-    
-//    geant3->Gsckov(idtmed[3002], 14, ppckov, absco_quarz, effic_all,rindex_quarz);    
-//    geant3->Gsckov(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() const
-{
-
-//  Drawing is done in DrawVZERO.C
-
-   AliDebug(2,"VZERO DrawModule");
-
-}
-
-//_____________________________________________________________________________
-void AliVZEROv2::Init()
-{
-// Initialises version 2 of the VZERO Detector
-// Just prints an information message
-  
-   AliInfo(Form("VZERO version %d initialized",IsVersion()));
-   
-//   gMC->SetMaxStep(fMaxStepAlu);
-//   gMC->SetMaxStep(fMaxStepQua);
-   
-    AliVZERO::Init();
-  
-}
-
-
-//_____________________________________________________________________________
-void AliVZEROv2::StepManager()
-{
-// Step Manager, called at each step 
-   
-     Int_t     copy;
-     static    Int_t   vol[4];
-     static    Float_t hits[19];
-     static    Float_t eloss, tlength;
-     
-     TLorentzVector pos;     
-     TLorentzVector mom;
-     
-     Float_t        theta;
-     Float_t        phi;
-     Float_t        ringNumber;
-
-     Int_t          ipart;
-     Float_t        destep, step;
-          
-
-//   We keep only charged tracks :
-     
-     if ( !gMC->TrackCharge() || !gMC->IsTrackAlive() ) return; 
-
-
-     vol[0]    = gMC->CurrentVolOffID(1, vol[1]);
-     vol[2]    = gMC->CurrentVolID(copy);
-     vol[3]    = copy;
-     
-     static Int_t idV0R1 = gMC->VolId("V0R1");
-     static Int_t idV0L1 = gMC->VolId("V0L1");
-     static Int_t idV0R2 = gMC->VolId("V0R2");
-     static Int_t idV0L2 = gMC->VolId("V0L2");
-     static Int_t idV0R3 = gMC->VolId("V0R3");
-     static Int_t idV0L3 = gMC->VolId("V0L3");
-     static Int_t idV0R4 = gMC->VolId("V0R4");
-     static Int_t idV0L4 = gMC->VolId("V0L4");
-     static Int_t idV0R5 = gMC->VolId("V0R5");
-     static Int_t idV0L5 = gMC->VolId("V0L5");
-     static Int_t idV0R6 = gMC->VolId("V0R6");
-     static Int_t idV0L6 = gMC->VolId("V0L6");
-
-     if      ( gMC->CurrentVolID(copy) == idV0R1 ||
-               gMC->CurrentVolID(copy) == idV0L1 )
-              ringNumber = 1.0;
-     else if ( gMC->CurrentVolID(copy) == idV0R2 ||
-               gMC->CurrentVolID(copy) == idV0L2 ) 
-              ringNumber = 2.0;  
-     else if ( gMC->CurrentVolID(copy) == idV0R3 ||
-               gMC->CurrentVolID(copy) == idV0L3 )
-              ringNumber = 3.0;
-     else if ( gMC->CurrentVolID(copy) == idV0R4 ||
-               gMC->CurrentVolID(copy) == idV0L4 )      
-              ringNumber = 4.0; 
-     else if ( gMC->CurrentVolID(copy) == idV0R5 ||
-               gMC->CurrentVolID(copy) == idV0L5 ||
-              gMC->CurrentVolID(copy) == idV0R6 ||
-              gMC->CurrentVolID(copy) == idV0L6 )        
-               ringNumber = 5.0; 
-     else
-              ringNumber = 0.0;
-
-     if  (  ringNumber > 0.5  ) { 
-     
-        destep    = gMC->Edep();
-       step      = gMC->TrackStep();
-        eloss    += destep;
-       tlength  += step; 
-
-        if  ( gMC->IsTrackEntering()  )  {  
-       
-            gMC->TrackPosition(pos);
-     
-            gMC->TrackMomentum(mom);      
-            Double_t tc   = mom[0]*mom[0]+mom[1]*mom[1];
-            Double_t pt   = TMath::Sqrt(tc);
-           Double_t pmom = TMath::Sqrt(tc+mom[2]*mom[2]);
-            theta   = Float_t(TMath::ATan2(pt,Double_t(mom[2])))*kRaddeg;
-            phi     = Float_t(TMath::ATan2(Double_t(pos[1]),Double_t(pos[0])))*kRaddeg;
-
-////////////////////////////////////////////////////////////////////////////         
-     Float_t angle1 = Float_t(TMath::ATan2(Double_t(pos[1]),Double_t(pos[0])))*kRaddeg;
-     if(angle1 < 0.0) angle1 = angle1 + 360.0;
-     //PH     AliDebug(2,Form("RingNumber, copy, phi1  = %f %d %f \n", ringNumber,vol[1],angle1)); 
-////////////////////////////////////////////////////////////////////////////   
-                
-     
-            ipart  = gMC->TrackPid();
-
-            hits[0]  = pos[0];
-            hits[1]  = pos[1];
-            hits[2]  = pos[2];          
-           hits[3]  =  Float_t (ipart); 
-
-           hits[4]  = gMC->TrackTime();
-            hits[5]  = gMC->TrackCharge();
-           hits[6]  = theta;
-           hits[7]  = phi;
-           hits[8]  = ringNumber;
-        
-           hits[9]  = pt;
-           hits[10] = pmom;
-           hits[11] = mom[0];
-           hits[12] = mom[1];
-           hits[13] = mom[2];
-           
-           TParticle *par = gAlice->GetMCApp()->Particle(gAlice->GetMCApp()->GetCurrentTrackNumber());
-            hits[14] = par->Vx();
-            hits[15] = par->Vy();
-            hits[16] = par->Vz();
-            
-           tlength  = 0.0;
-           eloss    = 0.0;
-           
-         }
-        
-        if( gMC->IsTrackExiting() || gMC->IsTrackStop() || gMC->IsTrackDisappeared()){
-        
-        hits[17] =   eloss;
-        hits[18] = tlength;
-        
-         AddHit(gAlice->GetMCApp()->GetCurrentTrackNumber(), vol, hits);
-                
-        tlength  = 0.0;
-        eloss    = 0.0; 
-         
-        } 
-    }
-      
-}
-
-//_____________________________________________________________________________
-void AliVZEROv2::AddHit(Int_t track, Int_t *vol, Float_t *hits)
-{
-  
-//  Adds a VZERO hit
-  
-  TClonesArray &lhits = *fHits;
-  new(lhits[fNhits++]) AliVZEROhit(fIshunt,track,vol,hits);
-}
-
-//_____________________________________________________________________________
-void AliVZEROv2::AddDigits(Int_t *tracks, Int_t* digits) 
-{
-
-//  Adds a VZERO digit
-
-   TClonesArray  &ldigits = *fDigits;
-   new(ldigits[fNdigits++]) AliVZEROdigit(tracks, digits);
-}
-
-//_____________________________________________________________________________
-void AliVZEROv2::MakeBranch(Option_t *option)
-{
-  
-// Creates new branches in the current Root Tree
-    
-  char branchname[10];
-  sprintf(branchname,"%s",GetName());
-  AliDebug(2,Form("fBufferSize = %d",fBufferSize));
-  
-  const char *cH = strstr(option,"H");
-  
-  if (fHits   && fLoader->TreeH() && cH) {
-    fLoader->TreeH()->Branch(branchname,&fHits, fBufferSize);
-    AliDebug(2,Form("Making Branch %s for hits",branchname));
-  }     
-
-  const char *cD = strstr(option,"D");
-  
-  if (fDigits   && fLoader->TreeD() && cD) {
-    fLoader->TreeD()->Branch(branchname,&fDigits, fBufferSize);
-    AliDebug(2,Form("Making Branch %s for digits",branchname));
-  }  
-   
-}
diff --git a/VZERO/AliVZEROv2.h b/VZERO/AliVZEROv2.h
deleted file mode 100755 (executable)
index dc6bb61..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef ALIVZEROV2_H
-#define ALIVZEROV2_H
-/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
- * See cxx source for full Copyright notice                               */
-
-
-///////////////////////////////////////////////////
-//                                               //
-//  Manager and hits classes for set : VZERO     //
-//                                               //
-///////////////////////////////////////////////////
-#include "AliVZERO.h"
-
-class AliVZEROv2 : public AliVZERO {
-  
-public:
-  AliVZEROv2();
-  AliVZEROv2(const char *name, const char *title);
-  virtual       ~AliVZEROv2() {}
-  virtual void   AddHit(Int_t track, Int_t *vol, Float_t *hits); 
-  virtual void   AddDigits(Int_t *tracks, Int_t *digits);
-  virtual void   CreateGeometry();
-  virtual void   CreateMaterials();
-  virtual void   DrawModule() const;
-  virtual void   Init();
-  virtual void   MakeBranch(Option_t *option);
-  virtual Int_t  IsVersion() const {return 2;}
-  virtual void   StepManager();
-   
-  ClassDef(AliVZEROv2,1)  //Class for VZERO version 2
-};
-
-#endif
-
-
diff --git a/VZERO/AliVZEROv3.cxx b/VZERO/AliVZEROv3.cxx
deleted file mode 100755 (executable)
index 7330fa1..0000000
+++ /dev/null
@@ -1,693 +0,0 @@
-/**************************************************************************
- * 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$ */
-
-//////////////////////////////////////////////////////////////////////
-//                                                                  //
-//  (V-zero) detector  version 3  as designed by the Lyon group     //
-//   All comments should be sent to Brigitte CHEYNIS :              //
-//                                  b.cheynis@ipnl.in2p3.fr         // 
-//   Geometry of the   4th of december 2003                         //
-//  (now 3 rings instead of 5 rings as in previous versions -budget //
-//   cuts !! - therefore changes in cell dimensions and offsets)    //
-//   previous ring 1 and ring 2 become now ring 1                   //
-//   previous ring 3 and ring 4 become now ring 2                   //
-//   previous ring 5 becomes now ring 3  - both for Left and Right  //    
-//   V0R (now V0C) sits between Z values  -89.4 and  -84.9 cm       //
-//   V0L (now V0A) sits between Z values +350.0 and +352.0 cm       //
-//   New coordinate system has been implemented in october 2003     //
-//                                                                  //
-//////////////////////////////////////////////////////////////////////
-
-// --- Standard libraries ---
-#include <Riostream.h>
-#include <stdlib.h>
-#include <string.h>
-
-// --- ROOT libraries ---
-#include <TClonesArray.h>
-#include <TGeoGlobalMagField.h>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjectTable.h>
-#include <TParticle.h>
-#include <TVirtualMC.h>
-
-// --- AliRoot header files ---
-#include "AliConst.h"
-#include "AliLog.h"
-#include "AliMC.h"
-#include "AliMagF.h"
-#include "AliRun.h"
-#include "AliVZEROLoader.h"
-#include "AliVZEROdigit.h"
-#include "AliVZEROhit.h"
-#include "AliVZEROv3.h"
-ClassImp(AliVZEROv3)
-
-//_____________________________________________________________________________
-AliVZEROv3:: AliVZEROv3():AliVZERO(),
-   fCellId(0),
-   fTrackPosition(),
-   fTrackMomentum(), 
-   fLightYield(93.75),
-   fLightAttenuation(0.05),
-   fnMeters(15.0),
-   fFibToPhot(0.3)
-{
-// Standard default constructor 
-}
-
-//_____________________________________________________________________________
-AliVZEROv3::AliVZEROv3(const char *name, const char *title):
-   AliVZERO(name,title),
-   fCellId(0),
-   fTrackPosition(),
-   fTrackMomentum(),
-   fLightYield(93.75),
-   fLightAttenuation(0.05),
-   fnMeters(15.0),
-   fFibToPhot(0.3)
-{
-
-// Standard constructor for V-zero Detector  version 2
-
-  AliDebug(2,"Create VZERO object");
-      
-//   fLightYield              =  93.75;
-//   fLightAttenuation        =   0.05; 
-//   fnMeters                 =   15.0;  
-//   fFibToPhot               =    0.3;
-}
-
-//_____________________________________________________________________________
-void AliVZEROv3::CreateGeometry()
-{
-
-// Creates the GEANT geometry of the V-zero Detector  version 3
-  
-  AliDebug(2,"Create VZERO Geometry");
-      
-  Int_t    *idtmed = fIdtmed->GetArray()-2999;
-
-  Int_t    ndetR = 1;
-  Int_t    ndetL = 1;
-  Int_t    ncellsR = 1;
-  Int_t    ncellsL = 1;
-  
-  Int_t    idrotm[999];
-  Float_t  height1Right, height2Right, height3Right; 
-  Float_t  heightRight;
-  Float_t  theta;  
-  
-  Float_t  halfThickQua;
-  
-  Float_t  zdet;
-  Float_t  r0Right, r3Right;
-  Float_t  pi = TMath::Pi();
-    
-  height1Right    =     1.82 + 3.81;  // height of cell 1, in cm
-  height2Right    =     4.72 + 7.12;  // height of cell 2, in cm
-  height3Right    =           10.83;  // height of cell 3, in cm
-  
-  theta       = pi/6.0/2.0;       // half angular opening = 15 degrees
-    
-  halfThickQua= fThickness1/2.0;  // half thickness of elementary cell (inner ring)
-  
-// distance 0.6 cm in zdet accounts for the fact V0R box back lid sits 0.6 away from 
-// absorber nose sitting at 90 cm. Will use -zdet later...
-// size of V0R box  (fThickness) is increased by 1 mm as compared to version v2 
-
-  fThickness  =    fThickness + 0.1;  
-  zdet        =    90.0 - 0.6 - fThickness/2.0;  // distance to vertex (along Z axis)   
-  r0Right     =    4.05;          // closest distance to center of the beam pipe
-  heightRight =    height1Right + height2Right + height3Right;
-  r3Right     =    r0Right + heightRight;
-
-// Creation of mother volume v0LE - left part - :
-// Entrance face at  +350.0 cm  (new coordinate system) ...
-
-   Float_t   partube[3];
-   
-   partube[0] =  4.3;
-   partube[1] = 45.0;
-   partube[2] = fThickness1/2.0;   
-    
-   gMC->Gsvolu("V0LE","TUBE",idtmed[3005],partube,3);
-     
-// Creation of five rings - left part - :
-// Entrance face at +350.0 cm  (new coordinate system) ... 
-
-// Mother volume v0L0 in which will be set 5 scintillator cells 
-
-  Float_t   partubs[5];  
-    
-  Float_t   r0Left      =   4.3;   
-  Float_t   height1Left =   2.6 +  4.1;  // previous ring 1 + ring 2
-  Float_t   height2Left =   6.4 + 10.2;  // previous ring 3 + ring 4
-  Float_t   height3Left =  16.9;  
-  Float_t   heightLeft  =   height1Left + height2Left + height3Left; 
-                                      
-  Float_t   r3Left      =   r0Left  + heightLeft; 
-  
-  partubs[0]     =  r0Left;
-  partubs[1]     =  r3Left;
-  partubs[2]     =  fThickness1/2.0;
-  partubs[3]     =  90.0-15.0;
-  partubs[4]     = 120.0-15.0;
-
-  gMC->Gsvolu("V0L0","TUBS",idtmed[3010],partubs,5);  // air volume
-  
-  Float_t  r1Left =  r0Left + height1Left;        
-     
-  partubs[0]     =  r0Left;
-  partubs[1]     =  r1Left;
-
-  gMC->Gsvolu("V0L1","TUBS",idtmed[3005],partubs,5);  // quartz volume
-  gMC->Gspos("V0L1",1,"V0L0", 0.0, 0.0 , 0.0, 0,"ONLY"); 
-
-  Float_t  r2Left  =  r1Left + height2Left;       
-  
-  partubs[0]     =  r1Left;
-  partubs[1]     =  r2Left;
-
-  gMC->Gsvolu("V0L2","TUBS",idtmed[3005],partubs,5);  // quartz volume
-  gMC->Gspos("V0L2",1,"V0L0", 0.0, 0.0 , 0.0, 0,"ONLY"); 
-    
-  partubs[0]     =  r2Left;
-  partubs[1]     =  r3Left;
-
-  gMC->Gsvolu("V0L3","TUBS",idtmed[3005],partubs,5);  // quartz volume
-  gMC->Gspos("V0L3",1,"V0L0", 0.0, 0.0 , 0.0, 0,"ONLY");
-  
-
-// Creation of mother volume v0RI - right part - :
-  
-  partube[0] = r0Right - 0.2;
-  partube[1] = r3Right + 1.0;
-  partube[2] = fThickness/2.0; 
-      
-  gMC->Gsvolu("V0RI","TUBE",idtmed[3010],partube,3);
-  
-// Creation of  carbon lids (3.5 mm thick) to keep v0RI box shut...
-
-  Float_t  lidThickness = 0.35;
-  partube[0] =   r0Right;
-  partube[1] =   r3Right;
-  partube[2] =   +lidThickness/2.0;
-    
-  gMC->Gsvolu("V0CA","TUBE",idtmed[3001],partube,3); 
-  gMC->Gspos("V0CA",1,"V0RI",0.0,0.0, fThickness/2.0-partube[2],0,"ONLY");
-  gMC->Gspos("V0CA",2,"V0RI",0.0,0.0,-fThickness/2.0+partube[2],0,"ONLY");
-  
-// Creation of aluminum rings to maintain the v0RI pieces ...
-
-  partube[0] =   r0Right - 0.2;
-  partube[1] =   r0Right;
-  partube[2] =   +fThickness/2.0;
-   
-  gMC->Gsvolu("V0IR","TUBE",idtmed[3003],partube,3);    
-  gMC->Gspos("V0IR",1,"V0RI",0.0,0.0,0.0,0,"ONLY");
-
-  partube[0] =   r3Right;
-  partube[1] =   r3Right + 1.0;
-  partube[2] =   +fThickness/2.0;
-  gMC->Gsvolu("V0ER","TUBE",idtmed[3003],partube,3);    
-  gMC->Gspos("V0ER",1,"V0RI",0.0,0.0,0.0,0,"ONLY");
-  
-// Mother volume v0R0 in which will be set 3  scintillator cells 
-  
-  partubs[0]      =  r0Right;
-  partubs[1]      =  r3Right;
-  partubs[2]      =  fThickness/2.0;
-  partubs[3]      =  90.0-15.0;
-  partubs[4]      = 120.0-15.0;
-
-  gMC->Gsvolu("V0R0","TUBS",idtmed[3010],partubs,5);  // air volume 
-
-// Elementary cell of ring 1 :
-// (cells of ring 1  will be shifted by 1.7 cm towards vertex to output fibers) 
-   
-  Float_t   offsetFibers  =  1.7;
-  Float_t   offset        =  fThickness/2.0 - lidThickness - fThickness1/2.0; 
-  Float_t   r1Right       =  r0Right + height1Right;
-      
-  partubs[0]     =  r0Right;
-  partubs[1]     =  r1Right;
-  partubs[2]     =  fThickness1/2.0;
-  
-  gMC->Gsvolu("V0R1","TUBS",idtmed[3005],partubs,5);  // scintillator volume
-  gMC->Gspos("V0R1",1,"V0R0", 0.0, 0.0 , -offset + offsetFibers, 0,"ONLY"); 
-
-// Elementary cell of ring 2 :
-
-  Float_t   r2Right   =  r1Right + height2Right;       
-  
-  partubs[0]     =  r1Right;
-  partubs[1]     =  r2Right;
-
-  gMC->Gsvolu("V0R2","TUBS",idtmed[3005],partubs,5);  // scintillator volume
-  gMC->Gspos("V0R2",1,"V0R0", 0.0, 0.0 , -offset, 0,"ONLY"); 
-
-
-// Elementary cell of ring 3 :
-   
-  partubs[0]     =  r2Right;
-  partubs[1]     =  r3Right;
-
-  gMC->Gsvolu("V0R3","TUBS",idtmed[3005],partubs,5);  // scintillator volume
-  gMC->Gspos("V0R3",1,"V0R0", 0.0, 0.0 , -offset, 0,"ONLY");
-
-
-  Float_t  phiDeg = 180./6.; 
-
-// Right part : 
-  for(Float_t  phi = 15.0 ; phi < 360.0; phi = phi + phiDeg)
-      {        
-       AliMatrix(idrotm[902], 90.0, phi, 90.0, 90.0 +phi, 0.0 , 0.0);
-        gMC->Gspos("V0R0",ndetR,"V0RI",0.0,
-                         0.0,0.0,idrotm[902],"ONLY");
-       ndetR++;
-       }
-
-  gMC->Gspos("V0RI",1,"ALIC",0.0,0.0,-zdet,0,"ONLY");
-  ncellsR = (ndetR - 1) * 3;  
-  AliInfo(Form("Number of cells on Right side =   %d",ncellsR));    
-
-// Left part :
-  
-  for(Float_t  phi = 15.0 ; phi < 360.0; phi = phi + phiDeg)
-      {       
-       AliMatrix(idrotm[902], 90.0, phi, 90.0, 90.0 +phi, 0.0 , 0.0);
-        gMC->Gspos("V0L0",ndetL,"V0LE",0.0,
-                         0.0,0.0,idrotm[902],"ONLY");
-        ndetL++;
-       }
-
-  gMC->Gspos("V0LE",1,"ALIC",0.0,0.0,350.0+fThickness1/2.0,0,"ONLY");
-  ncellsL = (ndetL - 1) * 3;
-  AliInfo(Form("Number of cells on Left side  =   %d",  ncellsL));    
-           
-}
-            
-//_____________________________________________________________________________
-void AliVZEROv3::CreateMaterials()
-{
-
-// Creates materials used for geometry 
-
-    AliDebug(2,"VZERO create materials");
-    
-/*
-    Float_t ppckov[14] = { 5.5e-9, 5.7e-9, 5.9e-9, 6.1e-9, 6.3e-9, 6.5e-9, 6.7e-9, 
-                           6.9e-9, 7.1e-9, 7.3e-9, 7.5e-9, 7.7e-9, 7.9e-9, 8.1e-9 };
-
-           
-    Float_t ppckov_alu[14] = { 5.5e-9, 5.7e-9, 5.9e-9, 6.1e-9, 6.3e-9, 6.5e-9, 6.7e-9, 
-                               6.9e-9, 7.1e-9, 7.3e-9, 7.5e-9, 7.7e-9, 7.9e-9, 8.1e-9 };
-                          
-    Float_t rindex_quarz[14] = { 1.52398,  1.53090, 1.53835, 1.54641, 1.55513, 1.56458, 
-                                 1.57488,  1.58611, 1.59842, 1.61197, 1.62696, 1.64362, 
-                                 1.662295, 1.68337 };
-                                
-    Float_t absco_quarz[14] = { 105.8,  45.656, 35.665, 28.598, 25.007, 21.04, 17.525, 
-                                14.177, 9.282, 4.0925, 1.149, 0.3627, 0.1497, 0.05 };  
-                                                                                       
-    Float_t effic_all[14]   = { 1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1. };
-    
-        
-    Float_t rindex_alu[14] = { 1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1. }; 
-    
-    
-    Float_t absco_alu[14]  = { 1e-4,1e-4,1e-4,1e-4,1e-4,1e-4,1e-4,1e-4,1e-4,1e-4,
-                              1e-4,1e-4,1e-4,1e-4 };
-    Float_t effic_alu[14]  = { 1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1. };
-
-*/       
-
-    Int_t *idtmed = fIdtmed->GetArray()-2999;
-    
-    
-//  Parameters related to Quarz (SiO2) :
-    Float_t aqua[2], zqua[2], densqua, wmatqua[2];
-    Int_t nlmatqua;
-    
-    aqua[0]    = 28.09;
-    aqua[1]    = 16.;
-    zqua[0]    = 14.;
-    zqua[1]    = 8.;
-    densqua    = 2.64;
-    nlmatqua   = -2;
-    wmatqua[0] = 1.;
-    wmatqua[1] = 2.;
-
-// Parameters  related to aluminum sheets :
-    
-    Float_t  aal   = 26.98;
-    Float_t  zal   = 13.00; 
-    Float_t  densal=   2.7; 
-    Float_t  radlal=   8.9;
-       
-// Parameters  related to scintillator CH :
-    
-    Float_t ascin[2] = {1.00794,12.011};
-    Float_t zscin[2] = {1.,6.};
-    Float_t wscin[2] = {1.,1.};
-    Float_t denscin  = 1.032;
-    
-// AIR
-
-    Float_t aAir[4]={12.,14.,16.,36.};
-    Float_t zAir[4]={6.,7.,8.,18.};
-    Float_t wAir[4]={0.000124,0.755267,0.231781,0.012827};
-    Float_t dAir = 1.20479E-3;
-    
-//  Definition of materials :
-
-// AIR
-
-    AliMixture( 1, "AIR A$", aAir,zAir,dAir,4,wAir);
-    AliMixture(11, "AIR I$", aAir,zAir,dAir,4,wAir);
-    AliMaterial( 2, "CARBON$"  , 12.01, 6.0, 2.265, 18.8, 49.9, 0, 0);
-    AliMixture(  3, "QUA", aqua, zqua, densqua, nlmatqua, wmatqua);
-    AliMaterial( 4, "ALUMINIUM1$", 26.98, 13., 2.7, 8.9, 37.2, 0, 0);
-    AliMaterial( 5, "ALUMINIUM2$", aal, zal, densal, radlal, 0, 0, 0);
-    AliMixture( 6, "Scintillator$",ascin,zscin,denscin,-2,wscin);
-         
-    Int_t   iSXFLD = ((AliMagF*)TGeoGlobalMagField::Instance()->GetField())->Integ();     // Field type  
-    Float_t sXMGMX = ((AliMagF*)TGeoGlobalMagField::Instance()->GetField())->Max();       // Field max.
-    
-    Float_t tmaxfd, stemax, deemax, epsil, stmin;
-        
-    tmaxfd = 10.;
-    stemax = 0.1;
-    deemax = 0.1;     
-    epsil  = 0.001;
-    stmin  = 0.001;
-  
-//  Active Air :    
-    AliMedium(1, "ACTIVE AIR$", 1, 1, iSXFLD, sXMGMX,
-              10.0, 1.0, 0.1, 0.1, 10.0, 0, 0) ;
-
-//  Inactive air : 
-  
-    AliMedium(11, "INACTIVE AIR$", 11, 0, iSXFLD, sXMGMX,
-              10.0, 1.0, 0.1, 0.1, 10.0, 0, 0) ;
-    
-    AliMedium(2, "CARBON$ ", 2,  1, iSXFLD, sXMGMX,
-              tmaxfd, stemax, deemax, epsil, stmin, 0, 0);   
-
-    AliMedium(3, "QUARZ$", 3, 1, iSXFLD, sXMGMX,
-              tmaxfd, fMaxStepQua, fMaxDestepQua, epsil, stmin, 0, 0);
-    
-    AliMedium(4,"ALUMINUM1$",4, 1, iSXFLD, sXMGMX,
-              tmaxfd, fMaxStepAlu, fMaxDestepAlu, epsil, stmin, 0, 0);
-             
-
-    AliMedium(5,"ALUMINUM2$",5, 1, iSXFLD, sXMGMX,
-              tmaxfd, fMaxStepAlu, fMaxDestepAlu, epsil, stmin, 0, 0);    
-
-    AliMedium(6,"SCINTILLATOR$",6, 1, iSXFLD, sXMGMX, 10.0, 0.1, 0.1, 0.003, 0.003, 0, 0);
-
-    gMC->Gstpar(idtmed[3000], "LOSS", 1.);  //  [3000] = air ACTIF  [3010] = air INACTIF
-    gMC->Gstpar(idtmed[3000], "HADR", 1.);
-    gMC->Gstpar(idtmed[3000], "DCAY", 1.);
-    gMC->Gstpar(idtmed[3000], "DRAY", 1.);
-    
-    gMC->Gstpar(idtmed[3001], "LOSS", 1.);  //  [3001] = carbon
-    gMC->Gstpar(idtmed[3001], "HADR", 1.);
-    gMC->Gstpar(idtmed[3001], "DCAY", 1.);
-    gMC->Gstpar(idtmed[3001], "DRAY", 1.);
-
-    gMC->Gstpar(idtmed[3002], "LOSS", 1.);  //  [3002] = quartz
-    gMC->Gstpar(idtmed[3002], "HADR", 1.);
-    gMC->Gstpar(idtmed[3002], "DCAY", 1.);
-    gMC->Gstpar(idtmed[3002], "DRAY", 1.);  
-    gMC->Gstpar(idtmed[3002], "CUTGAM",0.5E-4) ; 
-    gMC->Gstpar(idtmed[3002], "CUTELE",1.0E-4) ;
-    
-    gMC->Gstpar(idtmed[3003], "LOSS", 1.);  //  [3003] = normal aluminum
-    gMC->Gstpar(idtmed[3003], "HADR", 1.);
-    gMC->Gstpar(idtmed[3003], "DCAY", 1.);
-    gMC->Gstpar(idtmed[3003], "DRAY", 1.);
-    
-    gMC->Gstpar(idtmed[3004], "LOSS", 1.);  //  [3004] = reflecting aluminum
-    gMC->Gstpar(idtmed[3004], "HADR", 1.);
-    gMC->Gstpar(idtmed[3004], "DCAY", 1.);
-    gMC->Gstpar(idtmed[3004], "DRAY", 1.);
-    gMC->Gstpar(idtmed[3004], "CUTGAM",0.5E-4) ; 
-    gMC->Gstpar(idtmed[3004], "CUTELE",1.0E-4) ;
-    
-    gMC->Gstpar(idtmed[3005], "LOSS", 1.);  //  [3005] = scintillator
-    gMC->Gstpar(idtmed[3005], "HADR", 1.);
-    gMC->Gstpar(idtmed[3005], "DCAY", 1.);
-    gMC->Gstpar(idtmed[3005], "DRAY", 1.); 
-    gMC->Gstpar(idtmed[3005], "CUTGAM",0.5E-4) ; 
-    gMC->Gstpar(idtmed[3005], "CUTELE",1.0E-4) ;
-      
-    
-//    geant3->Gsckov(idtmed[3002], 14, ppckov, absco_quarz, effic_all,rindex_quarz);    
-//    geant3->Gsckov(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 AliVZEROv3::DrawModule() const
-{
-
-//  Drawing is done in DrawVZERO.C
-
-   AliDebug(2,"VZERO DrawModule");
-
-}
-
-//_____________________________________________________________________________
-void AliVZEROv3::Init()
-{
-// Initialises version 2 of the VZERO Detector
-// Just prints an information message
-  
-  AliInfo(Form("VZERO version %d initialized",IsVersion()));
-   
-//   gMC->SetMaxStep(fMaxStepAlu);
-//   gMC->SetMaxStep(fMaxStepQua);
-   
-    AliVZERO::Init();
-  
-}
-
-
-//_____________________________________________________________________________
-void AliVZEROv3::StepManager()
-{
-// Step Manager, called at each step 
-     Int_t     copy;
-     static    Int_t   vol[4];
-     static    Float_t hits[21];
-     static    Float_t eloss, tlength;
-     static    Int_t   nPhotonsInStep;
-     static    Int_t   nPhotons; 
-     static    Int_t   numStep;
-     Float_t   ringNumber;
-     Float_t   destep, step;
-     
-     numStep += 1; 
-          
-//   We keep only charged tracks :
-     
-     if ( !gMC->TrackCharge() || !gMC->IsTrackAlive() ) return; 
-
-     static Int_t idV0R1 = gMC->VolId("V0R1");
-     static Int_t idV0L1 = gMC->VolId("V0L1");
-     static Int_t idV0R2 = gMC->VolId("V0R2");
-     static Int_t idV0L2 = gMC->VolId("V0L2");
-     static Int_t idV0R3 = gMC->VolId("V0R3");
-     static Int_t idV0L3 = gMC->VolId("V0L3");
-
-     vol[0]    = gMC->CurrentVolOffID(1, vol[1]);
-     vol[2]    = gMC->CurrentVolID(copy);
-     vol[3]    = copy;
-     
-     if      ( gMC->CurrentVolID(copy) == idV0R1 ||
-               gMC->CurrentVolID(copy) == idV0L1 )
-              ringNumber = 1.0;
-     else if ( gMC->CurrentVolID(copy) == idV0R2 ||
-               gMC->CurrentVolID(copy) == idV0L2 ) 
-              ringNumber = 2.0;  
-     else if ( gMC->CurrentVolID(copy) == idV0R3 ||
-               gMC->CurrentVolID(copy) == idV0L3 )
-              ringNumber = 3.0;
-     else
-              ringNumber = 0.0;
-
-     if  (  ringNumber > 0.5  ) { 
-     
-        destep    = gMC->Edep();
-       step      = gMC->TrackStep();
-        
-       nPhotonsInStep  = Int_t(destep / (fLightYield *1e-9) ); 
-       nPhotonsInStep  = gRandom->Poisson(nPhotonsInStep);
-       
-       eloss    += destep;
-       tlength  += step;        
-       
-        if  ( gMC->IsTrackEntering()  )  { 
-        
-            nPhotons  =  nPhotonsInStep;       
-           gMC->TrackPosition(fTrackPosition);
-           gMC->TrackMomentum(fTrackMomentum);
-           
-            Float_t pt  = TMath::Sqrt( fTrackMomentum.Px() * fTrackMomentum.Px() +
-                                      fTrackMomentum.Py() * fTrackMomentum.Py() );
-               
-            hits[0]  = fTrackPosition.X();
-            hits[1]  = fTrackPosition.Y();
-            hits[2]  = fTrackPosition.Z();              
-           hits[3]  = Float_t (gMC->TrackPid()); 
-
-           hits[4]  = gMC->TrackTime();
-            hits[5]  = gMC->TrackCharge();
-           hits[6]  = fTrackMomentum.Theta()*TMath::RadToDeg();
-           hits[7]  = fTrackMomentum.Phi()*TMath::RadToDeg();
-           hits[8]  = ringNumber;
-        
-           hits[9]  = pt;
-           hits[10] = fTrackMomentum.P();
-           hits[11] = fTrackMomentum.Px();
-           hits[12] = fTrackMomentum.Py();
-           hits[13] = fTrackMomentum.Pz();
-           
-           TParticle *par = gAlice->GetMCApp()->Particle(gAlice->GetMCApp()->GetCurrentTrackNumber());
-            hits[14] = par->Vx();
-            hits[15] = par->Vy();
-            hits[16] = par->Vz();
-            
-           tlength  = 0.0;
-           eloss    = 0.0;
-           
-         }
-        
-        nPhotons  = nPhotons + nPhotonsInStep;
-        
-        if( gMC->IsTrackExiting() || gMC->IsTrackStop() || gMC->IsTrackDisappeared()){
-        
-        nPhotons  = nPhotons - Int_t( (Float_t(nPhotons) * fLightAttenuation * fnMeters) );     
-        nPhotons  = nPhotons - Int_t(  Float_t(nPhotons) * fFibToPhot );        
-        
-        hits[17] =   eloss;
-        hits[18] = tlength;
-        hits[19] = nPhotons;
-        hits[20] = GetCellId (vol, hits); 
-                
-         AddHit(gAlice->GetMCApp()->GetCurrentTrackNumber(), vol, hits);
-                
-        tlength         = 0.0;
-        eloss           = 0.0; 
-        nPhotons        =   0;
-        nPhotonsInStep  =   0;
-        
-        numStep         =   0;  
-        } 
-    }
-      
-}
-
-//_____________________________________________________________________________
-void AliVZEROv3::AddHit(Int_t track, Int_t *vol, Float_t *hits)
-{
-  
-//  Adds a VZERO hit
-  
-  TClonesArray &lhits = *fHits;
-  new(lhits[fNhits++]) AliVZEROhit(fIshunt,track,vol,hits);
-}
-
-//_____________________________________________________________________________
-void AliVZEROv3::AddDigits(Int_t *tracks, Int_t* digits) 
-{
-
-//  Adds a VZERO digit
-
-   TClonesArray  &ldigits = *fDigits;
-   new(ldigits[fNdigits++]) AliVZEROdigit(tracks, digits);
-}
-
-//_____________________________________________________________________________
-void AliVZEROv3::MakeBranch(Option_t *option)
-{
-  
-// Creates new branches in the current Root Tree
-    
-  char branchname[10];
-  sprintf(branchname,"%s",GetName());
-  AliDebug(2,Form("fBufferSize = %d",fBufferSize));
-  
-  const char *cH = strstr(option,"H");
-  
-  if (fHits   && fLoader->TreeH() && cH) {
-    fLoader->TreeH()->Branch(branchname,&fHits, fBufferSize);
-    AliDebug(2,Form("Making Branch %s for hits",branchname));
-  }     
-
-  const char *cD = strstr(option,"D");
-  
-  if (fDigits   && fLoader->TreeD() && cD) {
-    fLoader->TreeD()->Branch(branchname,&fDigits, fBufferSize);
-    AliDebug(2,Form("Making Branch %s for digits",branchname));
-  }  
-   
-}
-
-//_____________________________________________________________________________
-Int_t AliVZEROv3::GetCellId(Int_t *vol, Float_t *hits) 
-{
-
-  //   Returns Id of scintillator cell
-  //   Right side from  0 to 35
-  //   Left  side from 36 to 71
-
-   Int_t index = vol[1];
-   fCellId     = 0;
-   
-   if (index < 10) index = index + 12; 
-   
-   if (hits[2] < 0.0) { 
-      index = (index - 10) + ( ( Int_t(hits[8]) - 1 ) * 12);
-      fCellId   = index;
-   }
-   else if (hits[2] > 0.0)
-   {
-      index = (index  + 26) + ( ( Int_t(hits[8]) - 1 ) * 12);
-      fCellId   = index;}
-          
-   return fCellId;
-}
diff --git a/VZERO/AliVZEROv3.h b/VZERO/AliVZEROv3.h
deleted file mode 100755 (executable)
index cbfc68a..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-#ifndef ALIVZEROV3_H
-#define ALIVZEROV3_H
-/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
- * See cxx source for full Copyright notice                               */
-
-
-///////////////////////////////////////////////////
-//                                               //
-//  Manager and hits classes for set : VZERO     //
-//                                   version 3   //
-//                                               //
-///////////////////////////////////////////////////
-
-#include "TLorentzVector.h" 
-#include "AliVZERO.h"
-
-class AliVZEROv3 : public AliVZERO {
-  
-public:
-  AliVZEROv3();
-  AliVZEROv3(const char *name, const char *title);
-  virtual       ~AliVZEROv3() {}
-  virtual void   AddHit(Int_t track, Int_t *vol, Float_t *hits); 
-  virtual void   AddDigits(Int_t *tracks, Int_t *digits);
-  virtual void   CreateGeometry();
-  virtual void   CreateMaterials();
-  virtual void   DrawModule() const;
-  virtual void   Init();
-  virtual void   MakeBranch(Option_t *option);
-  virtual Int_t  IsVersion() const {return 3;}
-  virtual void   StepManager();
-  Int_t          GetCellId(Int_t *vol, Float_t *hits);
-  
-protected:
-  Int_t          fCellId;        // Scintillator cell number from 0 to 71 
-  TLorentzVector fTrackPosition; // Position of particle entering cell
-  TLorentzVector fTrackMomentum; // Momentum of particle entering cell
-  
-private:  
-  Float_t fLightYield;       // Lightyield in BC408   (93.75 eV per photon)
-  Float_t fLightAttenuation; // LightAttenuation in fibers (0.05 per meter)
-  Float_t fnMeters;          // Number of meters of fibers to PM
-  Float_t fFibToPhot;        // Loss in Fibers - Photocathode Connection 
-  
-  ClassDef(AliVZEROv3,1)  //Class for VZERO version 3
-};
-
-#endif
-
-
diff --git a/VZERO/AliVZEROv4.cxx b/VZERO/AliVZEROv4.cxx
deleted file mode 100755 (executable)
index aadc937..0000000
+++ /dev/null
@@ -1,710 +0,0 @@
-/**************************************************************************
- * 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$ */
-
-//////////////////////////////////////////////////////////////////////
-//                                                                  //
-//  (V-zero) detector  version 4  as designed by the Lyon group     //
-//   All comments should be sent to Brigitte CHEYNIS :              //
-//                                  b.cheynis@ipnl.in2p3.fr         // 
-//   Geometry of the   24th of february 2004                        //
-//  (now 4 rings instead of 3 rings as in previous version)         // 
-//   V0R (now V0C) sits between Z values  -89.4 and  -84.9 cm       //
-//   V0L (now V0A) sits between Z values +350.0 and +352.0 cm       //
-//   New coordinate system has been implemented in october 2003     //
-//                                                                  //
-//////////////////////////////////////////////////////////////////////
-
-// --- Standard libraries ---
-#include <Riostream.h>
-#include <stdlib.h>
-#include <string.h>
-
-// --- ROOT libraries ---
-#include <TClonesArray.h>
-#include <TGeoGlobalMagField.h>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjectTable.h>
-#include <TParticle.h>
-#include <TVirtualMC.h>
-
-// --- AliRoot header files ---
-#include "AliRun.h"
-#include "AliMC.h"
-#include "AliConst.h"
-#include "AliLog.h"
-#include "AliMagF.h"
-#include "AliVZEROLoader.h"
-#include "AliVZEROdigit.h"
-#include "AliVZEROhit.h"
-#include "AliVZEROv4.h"
-ClassImp(AliVZEROv4)
-
-//_____________________________________________________________________________
-AliVZEROv4:: AliVZEROv4():AliVZERO(),
-   fCellId(0),
-   fTrackPosition(),
-   fTrackMomentum(), 
-   fLightYield(93.75),
-   fLightAttenuation(0.05),
-   fnMeters(15.0),
-   fFibToPhot(0.3)
-   
-{
-// Standard default constructor 
-}
-
-//_____________________________________________________________________________
-AliVZEROv4::AliVZEROv4(const char *name, const char *title):
-   AliVZERO(name,title),
-   fCellId(0),
-   fTrackPosition(),
-   fTrackMomentum(),
-   fLightYield(93.75),
-   fLightAttenuation(0.05),
-   fnMeters(15.0),
-   fFibToPhot(0.3)
-   
-{
-
-// Standard constructor for V-zero Detector  version 2
-
-  AliDebug(2,"Create VZERO object");
-//       
-//   fLightYield              =  93.75; // Light yield in BC408 (93.75 eV per photon)
-//   fLightAttenuation        =   0.05; // Light attenuation in fiber (0.05 per meter)
-//   fnMeters                 =   15.0; // Number of meters of clear fibers to PM
-//   fFibToPhot               =    0.3; // Attenuation at fiber-photocathode interface
-}
-
-//_____________________________________________________________________________
-void AliVZEROv4::CreateGeometry()
-{
-
-// Creates the GEANT geometry of the V-zero Detector  version 3
-  
-  AliDebug(2,"Create VZERO Geometry ");
-      
-  Int_t    *idtmed = fIdtmed->GetArray()-2999;
-
-  Int_t    ndetR = 1;
-  Int_t    ndetL = 1;
-  Int_t    ncellsR = 1;
-  Int_t    ncellsL = 1;
-  
-  Int_t    idrotm[999];
-  Float_t  height1Right, height2Right, height3Right, height4Right; 
-  Float_t  heightRight;
-  Float_t  theta;  
-  
-  Float_t  halfThickQua;
-  
-  Float_t  zdet;
-  Float_t  r0Right, r4Right;
-  Float_t  pi = TMath::Pi();
-    
-  height1Right    =     3.42;  // height of cell 1, in cm
-  height2Right    =     6.78;  // height of cell 2, in cm
-  height3Right    =     7.11;  // height of cell 3, in cm
-  height4Right    =    10.91;  // height of cell 4, in cm
-  
-  theta       = pi/6.0/2.0;       // half angular opening = 15 degrees
-    
-  halfThickQua= fThickness1/2.0;  // half thickness of elementary cell (inner ring)
-  
-// distance 0.6 cm in zdet accounts for the fact V0R box back lid sits 0.6 away from 
-// absorber nose sitting at 90 cm. Will use -zdet later...
-// size of V0R box  (fThickness) is increased by 1 mm as compared to version v2 
-
-  fThickness  =    fThickness + 0.1;  
-  zdet        =    90.0 - 0.6 - fThickness/2.0;  // distance to vertex (along Z axis)   
-  r0Right     =    4.05;          // closest distance to center of the beam pipe
-  heightRight =    height1Right + height2Right + height3Right + height4Right;
-  r4Right     =    r0Right + heightRight;
-
-// Creation of mother volume v0LE - left part - :
-// Entrance face at  +350.0 cm  (new coordinate system) ...
-
-   Float_t   partube[3];
-   
-   partube[0] =  4.3;
-   partube[1] = 45.0;
-   partube[2] = fThickness1/2.0;   
-    
-   gMC->Gsvolu("V0LE","TUBE",idtmed[3005],partube,3);
-     
-// Creation of five rings - left part - :
-// Entrance face at +350.0 cm  (new coordinate system) ... 
-
-// Mother volume v0L0 in which will be set 5 scintillator cells 
-
-  Float_t   partubs[5];  
-    
-  Float_t   r0Left      =   4.3;   
-  Float_t   height1Left =   3.6;  
-  Float_t   height2Left =   6.4;  
-  Float_t   height3Left =  14.9; 
-  Float_t   height4Left =  14.4;  
-  Float_t   heightLeft  =   height1Left + height2Left + height3Left + height4Left; 
-                                      
-  Float_t   r4Left      =   r0Left  + heightLeft; 
-  
-  partubs[0]     =  r0Left;
-  partubs[1]     =  r4Left;
-  partubs[2]     =  fThickness1/2.0;
-  partubs[3]     =  90.0-15.0;
-  partubs[4]     = 120.0-15.0;
-
-  gMC->Gsvolu("V0L0","TUBS",idtmed[3010],partubs,5);  // air volume
-  
-  Float_t  r1Left =  r0Left + height1Left;        
-     
-  partubs[0]     =  r0Left;
-  partubs[1]     =  r1Left;
-
-  gMC->Gsvolu("V0L1","TUBS",idtmed[3005],partubs,5);  // quartz volume
-  gMC->Gspos("V0L1",1,"V0L0", 0.0, 0.0 , 0.0, 0,"ONLY"); 
-
-  Float_t  r2Left  =  r1Left + height2Left;       
-  
-  partubs[0]     =  r1Left;
-  partubs[1]     =  r2Left;
-
-  gMC->Gsvolu("V0L2","TUBS",idtmed[3005],partubs,5);  // quartz volume
-  gMC->Gspos("V0L2",1,"V0L0", 0.0, 0.0 , 0.0, 0,"ONLY"); 
-  
-  Float_t  r3Left  =  r2Left + height3Left;       
-      
-  partubs[0]     =  r2Left;
-  partubs[1]     =  r3Left;
-
-  gMC->Gsvolu("V0L3","TUBS",idtmed[3005],partubs,5);  // quartz volume
-  gMC->Gspos("V0L3",1,"V0L0", 0.0, 0.0 , 0.0, 0,"ONLY");
-
-  partubs[0]     =  r3Left;
-  partubs[1]     =  r4Left;
-
-  gMC->Gsvolu("V0L4","TUBS",idtmed[3005],partubs,5);  // quartz volume
-  gMC->Gspos("V0L4",1,"V0L0", 0.0, 0.0 , 0.0, 0,"ONLY");  
-
-// Creation of mother volume v0RI - right part - :
-  
-  partube[0] = r0Right - 0.2;
-  partube[1] = r4Right + 1.0;
-  partube[2] = fThickness/2.0; 
-      
-  gMC->Gsvolu("V0RI","TUBE",idtmed[3010],partube,3);
-  
-// Creation of  carbon lids (3.5 mm thick) to keep v0RI box shut...
-
-  Float_t  lidThickness = 0.35;
-  partube[0] =   r0Right;
-  partube[1] =   r4Right;
-  partube[2] =   +lidThickness/2.0;
-    
-  gMC->Gsvolu("V0CA","TUBE",idtmed[3001],partube,3); 
-  gMC->Gspos("V0CA",1,"V0RI",0.0,0.0, fThickness/2.0-partube[2],0,"ONLY");
-  gMC->Gspos("V0CA",2,"V0RI",0.0,0.0,-fThickness/2.0+partube[2],0,"ONLY");
-  
-// Creation of aluminum rings to maintain the v0RI pieces ...
-
-  partube[0] =   r0Right - 0.2;
-  partube[1] =   r0Right;
-  partube[2] =   +fThickness/2.0;
-   
-  gMC->Gsvolu("V0IR","TUBE",idtmed[3003],partube,3);    
-  gMC->Gspos("V0IR",1,"V0RI",0.0,0.0,0.0,0,"ONLY");
-
-  partube[0] =   r4Right;
-  partube[1] =   r4Right + 1.0;
-  partube[2] =   +fThickness/2.0;
-  gMC->Gsvolu("V0ER","TUBE",idtmed[3003],partube,3);    
-  gMC->Gspos("V0ER",1,"V0RI",0.0,0.0,0.0,0,"ONLY");
-  
-// Mother volume v0R0 in which will be set 4  scintillator cells 
-  
-  partubs[0]      =  r0Right;
-  partubs[1]      =  r4Right;
-  partubs[2]      =  fThickness/2.0;
-  partubs[3]      =  90.0-15.0;
-  partubs[4]      = 120.0-15.0;
-
-  gMC->Gsvolu("V0R0","TUBS",idtmed[3010],partubs,5);  // air volume 
-
-// Elementary cell of ring 1 :
-// (cells of ring 1  will be shifted by 1.7 cm towards vertex to output fibers) 
-   
-  Float_t   offsetFibers  =  1.7;
-  Float_t   offset        =  fThickness/2.0 - lidThickness - fThickness1/2.0; 
-  Float_t   r1Right       =  r0Right + height1Right;
-      
-  partubs[0]     =  r0Right;
-  partubs[1]     =  r1Right;
-  partubs[2]     =  fThickness1/2.0;
-  
-  gMC->Gsvolu("V0R1","TUBS",idtmed[3005],partubs,5);  // scintillator volume
-  gMC->Gspos("V0R1",1,"V0R0", 0.0, 0.0 , -offset + offsetFibers, 0,"ONLY"); 
-
-// Elementary cell of ring 2 :
-
-  Float_t   r2Right   =  r1Right + height2Right;       
-  
-  partubs[0]     =  r1Right;
-  partubs[1]     =  r2Right;
-
-  gMC->Gsvolu("V0R2","TUBS",idtmed[3005],partubs,5);  // scintillator volume
-  gMC->Gspos("V0R2",1,"V0R0", 0.0, 0.0 , -offset, 0,"ONLY"); 
-
-
-// Elementary cell of ring 3 :
-
-  Float_t   r3Right   =  r2Right + height3Right;   
-     
-  partubs[0]     =  r2Right;
-  partubs[1]     =  r3Right;
-
-  gMC->Gsvolu("V0R3","TUBS",idtmed[3005],partubs,5);  // scintillator volume
-  gMC->Gspos("V0R3",1,"V0R0", 0.0, 0.0 , -offset, 0,"ONLY");
-
-// Elementary cell of ring 4 :
-   
-  partubs[0]     =  r3Right;
-  partubs[1]     =  r4Right;
-
-  gMC->Gsvolu("V0R4","TUBS",idtmed[3005],partubs,5);  // scintillator volume
-  gMC->Gspos("V0R4",1,"V0R0", 0.0, 0.0 , -offset, 0,"ONLY");
-
-  Float_t  phiDeg = 180./6.; 
-
-// Right part : 
-  for(Float_t  phi = 15.0 ; phi < 360.0; phi = phi + phiDeg)
-      {        
-       AliMatrix(idrotm[902], 90.0, phi, 90.0, 90.0 +phi, 0.0 , 0.0);
-        gMC->Gspos("V0R0",ndetR,"V0RI",0.0,
-                         0.0,0.0,idrotm[902],"ONLY");
-       ndetR++;
-       }
-
-  gMC->Gspos("V0RI",1,"ALIC",0.0,0.0,-zdet,0,"ONLY");
-  ncellsR = (ndetR - 1) * 4;  
-  AliInfo(Form("Number of cells on Right side =   %d",  ncellsR));    
-
-// Left part :
-  
-  for(Float_t  phi = 15.0 ; phi < 360.0; phi = phi + phiDeg)
-      {       
-       AliMatrix(idrotm[902], 90.0, phi, 90.0, 90.0 +phi, 0.0 , 0.0);
-        gMC->Gspos("V0L0",ndetL,"V0LE",0.0,
-                         0.0,0.0,idrotm[902],"ONLY");
-        ndetL++;
-       }
-
-  gMC->Gspos("V0LE",1,"ALIC",0.0,0.0,350.0+fThickness1/2.0,0,"ONLY");
-  ncellsL = (ndetL - 1) * 4;
-  AliInfo(Form("Number of cells on Left side  =   %d",  ncellsL));    
-           
-}            
-    
-//_____________________________________________________________________________
-void AliVZEROv4::CreateMaterials()
-{
-
-// Creates materials used for geometry 
-
-    AliDebug(2,"VZERO create materials");
-    
-/*
-    Float_t ppckov[14] = { 5.5e-9, 5.7e-9, 5.9e-9, 6.1e-9, 6.3e-9, 6.5e-9, 6.7e-9, 
-                           6.9e-9, 7.1e-9, 7.3e-9, 7.5e-9, 7.7e-9, 7.9e-9, 8.1e-9 };
-
-           
-    Float_t ppckov_alu[14] = { 5.5e-9, 5.7e-9, 5.9e-9, 6.1e-9, 6.3e-9, 6.5e-9, 6.7e-9, 
-                               6.9e-9, 7.1e-9, 7.3e-9, 7.5e-9, 7.7e-9, 7.9e-9, 8.1e-9 };
-                          
-    Float_t rindex_quarz[14] = { 1.52398,  1.53090, 1.53835, 1.54641, 1.55513, 1.56458, 
-                                 1.57488,  1.58611, 1.59842, 1.61197, 1.62696, 1.64362, 
-                                 1.662295, 1.68337 };
-                                
-    Float_t absco_quarz[14] = { 105.8,  45.656, 35.665, 28.598, 25.007, 21.04, 17.525, 
-                                14.177, 9.282, 4.0925, 1.149, 0.3627, 0.1497, 0.05 };  
-                                                                                       
-    Float_t effic_all[14]   = { 1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1. };
-    
-        
-    Float_t rindex_alu[14] = { 1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1. }; 
-    
-    
-    Float_t absco_alu[14]  = { 1e-4,1e-4,1e-4,1e-4,1e-4,1e-4,1e-4,1e-4,1e-4,1e-4,
-                              1e-4,1e-4,1e-4,1e-4 };
-    Float_t effic_alu[14]  = { 1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1. };
-
-*/       
-
-    Int_t *idtmed = fIdtmed->GetArray()-2999;
-    
-    
-//  Parameters related to Quarz (SiO2) :
-    Float_t aqua[2], zqua[2], densqua, wmatqua[2];
-    Int_t nlmatqua;
-    
-    aqua[0]    = 28.09;
-    aqua[1]    = 16.;
-    zqua[0]    = 14.;
-    zqua[1]    = 8.;
-    densqua    = 2.64;
-    nlmatqua   = -2;
-    wmatqua[0] = 1.;
-    wmatqua[1] = 2.;
-
-// Parameters  related to aluminum sheets :
-    
-    Float_t  aal   = 26.98;
-    Float_t  zal   = 13.00; 
-    Float_t  densal=   2.7; 
-    Float_t  radlal=   8.9;
-       
-// Parameters  related to scintillator CH :
-    
-    Float_t ascin[2] = {1.00794,12.011};
-    Float_t zscin[2] = {1.,6.};
-    Float_t wscin[2] = {1.,1.};
-    Float_t denscin  = 1.032;
-    
-// AIR
-
-    Float_t aAir[4]={12.,14.,16.,36.};
-    Float_t zAir[4]={6.,7.,8.,18.};
-    Float_t wAir[4]={0.000124,0.755267,0.231781,0.012827};
-    Float_t dAir = 1.20479E-3;
-    
-//  Definition of materials :
-
-// AIR
-
-    AliMixture( 1, "AIR A$", aAir,zAir,dAir,4,wAir);
-    AliMixture(11, "AIR I$", aAir,zAir,dAir,4,wAir);
-    AliMaterial( 2, "CARBON$"  , 12.01, 6.0, 2.265, 18.8, 49.9, 0, 0);
-    AliMixture(  3, "QUA", aqua, zqua, densqua, nlmatqua, wmatqua);
-    AliMaterial( 4, "ALUMINIUM1$", 26.98, 13., 2.7, 8.9, 37.2, 0, 0);
-    AliMaterial( 5, "ALUMINIUM2$", aal, zal, densal, radlal, 0, 0, 0);
-    AliMixture( 6, "Scintillator$",ascin,zscin,denscin,-2,wscin);
-    
-     
-    Int_t   iSXFLD = ((AliMagF*)TGeoGlobalMagField::Instance()->GetField())->Integ();     // Field type  
-    Float_t sXMGMX = ((AliMagF*)TGeoGlobalMagField::Instance()->GetField())->Max();       // Field max.
-    
-    Float_t tmaxfd, stemax, deemax, epsil, stmin;
-        
-    tmaxfd = 10.;
-    stemax = 0.1;
-    deemax = 0.1;     
-    epsil  = 0.001;
-    stmin  = 0.001;
-  
-//  Active Air :    
-    AliMedium(1, "ACTIVE AIR$", 1, 1, iSXFLD, sXMGMX,
-              10.0, 1.0, 0.1, 0.1, 10.0, 0, 0) ;
-
-//  Inactive air : 
-  
-    AliMedium(11, "INACTIVE AIR$", 11, 0, iSXFLD, sXMGMX,
-              10.0, 1.0, 0.1, 0.1, 10.0, 0, 0) ;
-    
-    AliMedium(2, "CARBON$ ", 2,  1, iSXFLD, sXMGMX,
-              tmaxfd, stemax, deemax, epsil, stmin, 0, 0);   
-
-    AliMedium(3, "QUARZ$", 3, 1, iSXFLD, sXMGMX,
-              tmaxfd, fMaxStepQua, fMaxDestepQua, epsil, stmin, 0, 0);
-    
-    AliMedium(4,"ALUMINUM1$",4, 1, iSXFLD, sXMGMX,
-              tmaxfd, fMaxStepAlu, fMaxDestepAlu, epsil, stmin, 0, 0);
-             
-
-    AliMedium(5,"ALUMINUM2$",5, 1, iSXFLD, sXMGMX,
-              tmaxfd, fMaxStepAlu, fMaxDestepAlu, epsil, stmin, 0, 0);    
-
-    AliMedium(6,"SCINTILLATOR$",6, 1, iSXFLD, sXMGMX, 10.0, 0.1, 0.1, 0.003, 0.003, 0, 0);
-
-    gMC->Gstpar(idtmed[3000], "LOSS", 1.);  //  [3000] = air ACTIF  [3010] = air INACTIF
-    gMC->Gstpar(idtmed[3000], "HADR", 1.);
-    gMC->Gstpar(idtmed[3000], "DCAY", 1.);
-    gMC->Gstpar(idtmed[3000], "DRAY", 1.);
-    
-    gMC->Gstpar(idtmed[3001], "LOSS", 1.);  //  [3001] = carbon
-    gMC->Gstpar(idtmed[3001], "HADR", 1.);
-    gMC->Gstpar(idtmed[3001], "DCAY", 1.);
-    gMC->Gstpar(idtmed[3001], "DRAY", 1.);
-
-    gMC->Gstpar(idtmed[3002], "LOSS", 1.);  //  [3002] = quartz
-    gMC->Gstpar(idtmed[3002], "HADR", 1.);
-    gMC->Gstpar(idtmed[3002], "DCAY", 1.);
-    gMC->Gstpar(idtmed[3002], "DRAY", 1.);  
-    gMC->Gstpar(idtmed[3002], "CUTGAM",0.5E-4) ; 
-    gMC->Gstpar(idtmed[3002], "CUTELE",1.0E-4) ;
-    
-    gMC->Gstpar(idtmed[3003], "LOSS", 1.);  //  [3003] = normal aluminum
-    gMC->Gstpar(idtmed[3003], "HADR", 1.);
-    gMC->Gstpar(idtmed[3003], "DCAY", 1.);
-    gMC->Gstpar(idtmed[3003], "DRAY", 1.);
-    
-    gMC->Gstpar(idtmed[3004], "LOSS", 1.);  //  [3004] = reflecting aluminum
-    gMC->Gstpar(idtmed[3004], "HADR", 1.);
-    gMC->Gstpar(idtmed[3004], "DCAY", 1.);
-    gMC->Gstpar(idtmed[3004], "DRAY", 1.);
-    gMC->Gstpar(idtmed[3004], "CUTGAM",0.5E-4) ; 
-    gMC->Gstpar(idtmed[3004], "CUTELE",1.0E-4) ;
-    
-    gMC->Gstpar(idtmed[3005], "LOSS", 1.);  //  [3005] = scintillator
-    gMC->Gstpar(idtmed[3005], "HADR", 1.);
-    gMC->Gstpar(idtmed[3005], "DCAY", 1.);
-    gMC->Gstpar(idtmed[3005], "DRAY", 1.); 
-    gMC->Gstpar(idtmed[3005], "CUTGAM",0.5E-4) ; 
-    gMC->Gstpar(idtmed[3005], "CUTELE",1.0E-4) ;
-      
-    
-//    geant3->Gsckov(idtmed[3002], 14, ppckov, absco_quarz, effic_all,rindex_quarz);    
-//    geant3->Gsckov(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 AliVZEROv4::DrawModule() const
-{
-
-//  Drawing is done in DrawVZERO.C
-
-   AliDebug(2,"VZERO DrawModule");
-}
-
-//_____________________________________________________________________________
-void AliVZEROv4::Init()
-{
-// Initialises version 2 of the VZERO Detector
-// Just prints an information message
-  
-  AliDebug(2,Form("VZERO version %d initialized",IsVersion()));
-   
-//   gMC->SetMaxStep(fMaxStepAlu);
-//   gMC->SetMaxStep(fMaxStepQua);
-   
-    AliVZERO::Init();  
-}
-
-//_____________________________________________________________________________
-void AliVZEROv4::StepManager()
-{
-// Step Manager, called at each step 
-     Int_t     copy;
-     static    Int_t   vol[4];
-     static    Float_t hits[21];
-     static    Float_t eloss, tlength;
-     static    Int_t   nPhotonsInStep;
-     static    Int_t   nPhotons; 
-     static    Int_t   numStep;
-     Float_t   ringNumber;
-     Float_t   destep, step;
-     
-     numStep += 1; 
-          
-//   We keep only charged tracks :
-     
-     if ( !gMC->TrackCharge() || !gMC->IsTrackAlive() ) return; 
-
-     vol[0]    = gMC->CurrentVolOffID(1, vol[1]);
-     vol[2]    = gMC->CurrentVolID(copy);
-     vol[3]    = copy;
-     
-     static Int_t idV0R1 = gMC->VolId("V0R1");
-     static Int_t idV0L1 = gMC->VolId("V0L1");
-     static Int_t idV0R2 = gMC->VolId("V0R2");
-     static Int_t idV0L2 = gMC->VolId("V0L2");
-     static Int_t idV0R3 = gMC->VolId("V0R3");
-     static Int_t idV0L3 = gMC->VolId("V0L3");
-     static Int_t idV0R4 = gMC->VolId("V0R4");
-     static Int_t idV0L4 = gMC->VolId("V0L4");
-
-     if      ( gMC->CurrentVolID(copy) == idV0R1 ||
-               gMC->CurrentVolID(copy) == idV0L1 )
-              ringNumber = 1.0;
-     else if ( gMC->CurrentVolID(copy) == idV0R2 ||
-               gMC->CurrentVolID(copy) == idV0L2 ) 
-              ringNumber = 2.0;  
-     else if ( gMC->CurrentVolID(copy) == idV0R3 ||
-               gMC->CurrentVolID(copy) == idV0L3 )
-              ringNumber = 3.0;
-     else if ( gMC->CurrentVolID(copy) == idV0R4 ||
-               gMC->CurrentVolID(copy) == idV0L4 )
-              ringNumber = 4.0;               
-     else
-              ringNumber = 0.0;
-
-     if  (  ringNumber > 0.5  ) { 
-     
-        destep    = gMC->Edep();
-       step      = gMC->TrackStep();
-        
-       nPhotonsInStep  = Int_t(destep / (fLightYield *1e-9) ); 
-       nPhotonsInStep  = gRandom->Poisson(nPhotonsInStep);
-       
-       eloss    += destep;
-       tlength  += step;        
-       
-        if  ( gMC->IsTrackEntering()  )  { 
-        
-            nPhotons  =  nPhotonsInStep;       
-           gMC->TrackPosition(fTrackPosition);
-           gMC->TrackMomentum(fTrackMomentum);
-           
-            Float_t pt  = TMath::Sqrt( fTrackMomentum.Px() * fTrackMomentum.Px() +
-                                      fTrackMomentum.Py() * fTrackMomentum.Py() );
-               
-            hits[0]  = fTrackPosition.X();
-            hits[1]  = fTrackPosition.Y();
-            hits[2]  = fTrackPosition.Z();              
-           hits[3]  = Float_t (gMC->TrackPid()); 
-
-           hits[4]  = gMC->TrackTime();
-            hits[5]  = gMC->TrackCharge();
-           hits[6]  = fTrackMomentum.Theta()*TMath::RadToDeg();
-           hits[7]  = fTrackMomentum.Phi()*TMath::RadToDeg();
-           hits[8]  = ringNumber;
-        
-           hits[9]  = pt;
-           hits[10] = fTrackMomentum.P();
-           hits[11] = fTrackMomentum.Px();
-           hits[12] = fTrackMomentum.Py();
-           hits[13] = fTrackMomentum.Pz();
-           
-           TParticle *par = gAlice->GetMCApp()->Particle(gAlice->GetMCApp()->GetCurrentTrackNumber());
-            hits[14] = par->Vx();
-            hits[15] = par->Vy();
-            hits[16] = par->Vz();
-            
-           tlength  = 0.0;
-           eloss    = 0.0;         
-         }
-        
-        nPhotons  = nPhotons + nPhotonsInStep;
-        
-        if( gMC->IsTrackExiting() || gMC->IsTrackStop() || gMC->IsTrackDisappeared()){
-        
-        nPhotons  = nPhotons - Int_t((Float_t(nPhotons) * fLightAttenuation * fnMeters));       
-        nPhotons  = nPhotons - Int_t( Float_t(nPhotons) * fFibToPhot);  
-        
-        hits[17] =   eloss;
-        hits[18] = tlength;
-        hits[19] = nPhotons;
-        hits[20] = GetCellId (vol, hits); 
-                
-         AddHit(gAlice->GetMCApp()->GetCurrentTrackNumber(), vol, hits);
-                
-        tlength         = 0.0;
-        eloss           = 0.0; 
-        nPhotons        =   0;
-        nPhotonsInStep  =   0;
-        
-        numStep         =   0;  
-        } 
-    }
-      
-}
-
-//_____________________________________________________________________________
-void AliVZEROv4::AddHit(Int_t track, Int_t *vol, Float_t *hits)
-{
-  
-//  Adds a VZERO hit
-  
-  TClonesArray &lhits = *fHits;
-  new(lhits[fNhits++]) AliVZEROhit(fIshunt,track,vol,hits);
-}
-
-//_____________________________________________________________________________
-void AliVZEROv4::AddDigits(Int_t *tracks, Int_t* digits) 
-{
-
-//  Adds a VZERO digit
-
-   TClonesArray  &ldigits = *fDigits;
-   new(ldigits[fNdigits++]) AliVZEROdigit(tracks, digits);
-}
-
-//_____________________________________________________________________________
-void AliVZEROv4::MakeBranch(Option_t *option)
-{
-  
-// Creates new branches in the current Root Tree
-    
-  char branchname[10];
-  sprintf(branchname,"%s",GetName());
-  AliDebug(2,Form("fBufferSize = %d",fBufferSize));
-  
-  const char *cH = strstr(option,"H");
-  
-  if (fHits   && fLoader->TreeH() && cH) {
-    fLoader->TreeH()->Branch(branchname,&fHits, fBufferSize);
-    AliDebug(2,Form("Making Branch %s for hits",branchname));
-  }     
-
-  const char *cD = strstr(option,"D");
-  
-  if (fDigits   && fLoader->TreeD() && cD) {
-    fLoader->TreeD()->Branch(branchname,&fDigits, fBufferSize);
-    AliDebug(2,Form("Making Branch %s for digits",branchname));
-  }  
-   
-}
-
-//_____________________________________________________________________________
-Int_t AliVZEROv4::GetCellId(Int_t *vol, Float_t *hits) 
-{
-
-  //   Returns Id of scintillator cell
-  //   Right side from  0 to 47
-  //   Left  side from 48 to 95
-
-   Int_t index = vol[1];
-   fCellId     = 0;
-   
-   if (index < 10) index = index + 12; 
-   
-   if (hits[2] < 0.0) { 
-      index = (index - 10) + ( ( Int_t(hits[8]) - 1 ) * 12);
-      fCellId   = index;
-   }
-   else if (hits[2] > 0.0)
-   {
-      index = (index + 38) + ( ( Int_t(hits[8]) - 1 ) * 12);
-      fCellId   = index;}
-           
-   return fCellId;
-}
diff --git a/VZERO/AliVZEROv4.h b/VZERO/AliVZEROv4.h
deleted file mode 100755 (executable)
index 900a8f5..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-#ifndef ALIVZEROv4_H
-#define ALIVZEROv4_H
-/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
- * See cxx source for full Copyright notice                               */
-
-
-///////////////////////////////////////////////////
-//                                               //
-//  Manager and hits classes for set : VZERO     //
-//                                   version 4   //
-//                                               //
-///////////////////////////////////////////////////
-
-#include "TLorentzVector.h" 
-#include "AliVZERO.h"
-
-class AliVZEROv4 : public AliVZERO {
-  
-public:
-  AliVZEROv4();
-  AliVZEROv4(const char *name, const char *title);
-  virtual       ~AliVZEROv4() {}
-  virtual void   AddHit(Int_t track, Int_t *vol, Float_t *hits); 
-  virtual void   AddDigits(Int_t *tracks, Int_t *digits);
-  virtual void   CreateGeometry();
-  virtual void   CreateMaterials();
-  virtual void   DrawModule() const;
-  virtual void   Init();
-  virtual void   MakeBranch(Option_t *option);
-  virtual Int_t  IsVersion() const {return 3;}
-  virtual void   StepManager();
-  Int_t          GetCellId(Int_t *vol, Float_t *hits);
-  
-protected:
-  Int_t          fCellId;        // Scintillator cell number from 0 to 95 
-  TLorentzVector fTrackPosition; // Position of particle entering cell
-  TLorentzVector fTrackMomentum; // Momentum of particle entering cell
-  
-private:  
-  Float_t fLightYield;       // Lightyield in BC408   (93.75 eV per photon)
-  Float_t fLightAttenuation; // LightAttenuation in fibers (0.05 per meter)
-  Float_t fnMeters;          // Number of meters of fibers to PM
-  Float_t fFibToPhot;        // Loss in Fibers - Photocathode Connection 
-  
-  ClassDef(AliVZEROv4,1)  //Class for VZERO version 4
-};
-
-#endif
-
-
diff --git a/VZERO/AliVZEROv5.cxx b/VZERO/AliVZEROv5.cxx
deleted file mode 100755 (executable)
index 76d1d1b..0000000
+++ /dev/null
@@ -1,750 +0,0 @@
-/**************************************************************************
- * 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$ */
-
-//////////////////////////////////////////////////////////////////////
-//                                                                  //
-//  (V-zero) detector  version 5  as designed by the Lyon group     //
-//   All comments should be sent to Brigitte CHEYNIS :              //
-//                                  b.cheynis@ipnl.in2p3.fr         // 
-//   Geometry of the  16 th of june 2004                            //
-//  (now 8 sectors instead of 12 sectors as in previous version)    // 
-//   V0R (now V0C) sits between Z values  -89.6 and  -84.9 cm       //
-//   V0L (now V0A) sits between Z values +339.0 and +341.0 cm       //
-//   New coordinate system has been implemented in october 2003     //
-//                                                                  //
-//////////////////////////////////////////////////////////////////////
-
-// --- Standard libraries ---
-#include <Riostream.h>
-#include <stdlib.h>
-#include <string.h>
-
-// --- ROOT libraries ---
-#include <TClonesArray.h>
-#include <TGeoGlobalMagField.h>
-#include <TLorentzVector.h>
-#include <TMath.h>
-#include <TObjectTable.h>
-#include <TParticle.h>
-#include <TVirtualMC.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 "AliVZEROv5.h"
-#include "AliLog.h"
-ClassImp(AliVZEROv5)
-
-//_____________________________________________________________________________
-AliVZEROv5:: AliVZEROv5():AliVZERO(),
-   fCellId(0),
-   fTrackPosition(),
-   fTrackMomentum(), 
-   fLightYield(93.75),
-   fLightAttenuation(0.05),
-   fnMeters(15.0),
-   fFibToPhot(0.3)
-{
-// Standard default constructor 
-}
-
-//_____________________________________________________________________________
-AliVZEROv5::AliVZEROv5(const char *name, const char *title):
-   AliVZERO(name,title),
-   fCellId(0),
-   fTrackPosition(),
-   fTrackMomentum(),
-   fLightYield(93.75),
-   fLightAttenuation(0.05),
-   fnMeters(15.0),
-   fFibToPhot(0.3)    
-{
-
-// Standard constructor for V-zero Detector  version 5
-
-  AliDebug(2,"Create VZERO object ");
-//       
-//   fLightYield              =  93.75; // Light yield in BC408 (93.75 eV per photon)
-//   fLightAttenuation        =   0.05; // Light attenuation in fiber (0.05 per meter)
-//   fnMeters                 =   15.0; // Number of meters of clear fibers to PM
-//   fFibToPhot               =    0.3; // Attenuation at fiber-photocathode interface
-}
-
-//_____________________________________________________________________________
-void AliVZEROv5::CreateGeometry()
-{
-
-// Creates the GEANT geometry of the V-zero Detector  version 5
-  
-  AliDebug(2,"Create Geometry ");
-      
-  Int_t    *idtmed = fIdtmed->GetArray()-2999;
-
-  Int_t    ndetR = 1;
-  Int_t    ndetL = 1;
-  Int_t    ncellsR = 1;
-  Int_t    ncellsL = 1;
-  
-  Int_t    idrotm[999];
-  Float_t  height1Right, height2Right, height3Right, height4Right; 
-  Float_t  heightRight;
-  Float_t  theta;  
-  
-  Float_t  halfThickQua;
-  
-  Float_t  zdet;
-  Float_t  r0Right, r4Right, rBoxRight;
-  Float_t  pi = TMath::Pi();
-    
-  height1Right    =     2.6;  // height of cell 1, in cm
-  height2Right    =     4.6;  // height of cell 2, in cm
-  height3Right    =     7.6;  // height of cell 3, in cm
-  height4Right    =    12.7;  // height of cell 4, in cm
-  
-  theta       = pi/4.0/2.0;       // half angular opening = 22.5 degrees
-    
-  halfThickQua= fThickness1/2.0;  // half thickness of elementary cell (inner ring)
-  
-// distance 0.6 cm in zdet accounts for the fact V0R box back lid sits 0.6 away from 
-// absorber nose sitting at 90 cm. Will use -zdet later...
-// size of V0R box (fThickness) is increased by 3 mm as compared to basic version  
-
-  fThickness  =    fThickness + 0.3;             // now 4.7 cm instead of 4.4 cm
-  zdet        =    90.0 - 0.6 - fThickness/2.0;  // distance to vertex (along Z axis)   
-  r0Right     =    4.20;          // closest distance to center of the beam pipe
-  heightRight =    height1Right + height2Right + height3Right + height4Right;
-  r4Right     =    r0Right + heightRight + 0.3;
-  rBoxRight   =    38.0;          // external radius of right box
-     
-// Creation of mother volume v0LE - left part - :
-// Entrance face at  +339.0 cm  (new coordinate system) ...
-
-   Float_t   partube[3];
-   
-   partube[0] =  4.3;
-   partube[1] = 44.0;
-   partube[2] = fThickness1/2.0;   
-    
-   gMC->Gsvolu("V0LE","TUBE",idtmed[3005],partube,3);
-     
-// Creation of five rings - left part - :
-// Entrance face at +339.0 cm  (new coordinate system) ... 
-
-// Mother volume v0L0 in which will be set 5 scintillator cells 
-
-  Float_t   partubs[5];  
-    
-  Float_t   r0Left      =   4.3;   
-  Float_t   height1Left =   3.3;  
-  Float_t   height2Left =   6.2;  
-  Float_t   height3Left =   8.9; 
-  Float_t   height4Left =  20.9;  
-  Float_t   heightLeft  =   height1Left + height2Left + height3Left + height4Left; 
-                                      
-  Float_t   r4Left      =   r0Left  + heightLeft; 
-  
-  partubs[0]     =  r0Left;
-  partubs[1]     =  r4Left;
-  partubs[2]     =  fThickness1/2.0;
-  partubs[3]     =  90.0-22.5;
-  partubs[4]     = 135.0-22.5;
-
-  gMC->Gsvolu("V0L0","TUBS",idtmed[3010],partubs,5);  // air volume
-  
-  Float_t  r1Left =  r0Left + height1Left;        
-     
-  partubs[0]     =  r0Left;
-  partubs[1]     =  r1Left;
-
-  gMC->Gsvolu("V0L1","TUBS",idtmed[3005],partubs,5);  // quartz volume
-  gMC->Gspos("V0L1",1,"V0L0", 0.0, 0.0 , 0.0, 0,"ONLY"); 
-
-  Float_t  r2Left  =  r1Left + height2Left;       
-  
-  partubs[0]     =  r1Left;
-  partubs[1]     =  r2Left;
-
-  gMC->Gsvolu("V0L2","TUBS",idtmed[3005],partubs,5);  // quartz volume
-  gMC->Gspos("V0L2",1,"V0L0", 0.0, 0.0 , 0.0, 0,"ONLY"); 
-  
-  Float_t  r3Left  =  r2Left + height3Left;       
-      
-  partubs[0]     =  r2Left;
-  partubs[1]     =  r3Left;
-
-  gMC->Gsvolu("V0L3","TUBS",idtmed[3005],partubs,5);  // quartz volume
-  gMC->Gspos("V0L3",1,"V0L0", 0.0, 0.0 , 0.0, 0,"ONLY");
-
-  partubs[0]     =  r3Left;
-  partubs[1]     =  r4Left;
-
-  gMC->Gsvolu("V0L4","TUBS",idtmed[3005],partubs,5);  // quartz volume
-  gMC->Gspos("V0L4",1,"V0L0", 0.0, 0.0 , 0.0, 0,"ONLY");  
-
-// Creation of mother volume v0RI - right part - :
-  
-  partube[0] = r0Right - 0.2;
-  partube[1] = r4Right + 1.0;
-  partube[2] = fThickness/2.0; 
-      
-  gMC->Gsvolu("V0RI","TUBE",idtmed[3010],partube,3);
-  
-// Creation of  carbon lids (3.0 mm thick) to keep v0RI box shut...
-
-  Float_t  lidThickness = 0.30;
-  partube[0] =   r0Right;
-  partube[1] =   rBoxRight;
-  partube[2] =   +lidThickness/2.0;
-    
-  gMC->Gsvolu("V0CA","TUBE",idtmed[3001],partube,3); 
-  gMC->Gspos("V0CA",1,"V0RI",0.0,0.0, fThickness/2.0-partube[2],0,"ONLY");
-  gMC->Gspos("V0CA",2,"V0RI",0.0,0.0,-fThickness/2.0+partube[2],0,"ONLY");
-  
-// Creation of aluminum rings 3.0 mm thick to maintain the v0RI pieces ...
-
-  partube[0] =   r0Right;
-  partube[1] =   r0Right + 0.3;
-  partube[2] =   +fThickness/2.0;
-   
-  gMC->Gsvolu("V0IR","TUBE",idtmed[3003],partube,3);    
-  gMC->Gspos("V0IR",1,"V0RI",0.0,0.0,0.0,0,"ONLY");
-
-  partube[0] =   rBoxRight - 0.3;
-  partube[1] =   rBoxRight;
-  partube[2] =   +fThickness/2.0;
-  gMC->Gsvolu("V0ER","TUBE",idtmed[3003],partube,3);    
-  gMC->Gspos("V0ER",1,"V0RI",0.0,0.0,0.0,0,"ONLY");
-  
-// Mother volume v0R0 in which will be set 6 scintillator cells 
-  
-  partubs[0]      =  r0Right;
-  partubs[1]      =  r4Right;
-  partubs[2]      =  fThickness/2.0;
-  partubs[3]      =  90.0-22.5;
-  partubs[4]      = 135.0-22.5;
-
-  gMC->Gsvolu("V0R0","TUBS",idtmed[3010],partubs,5);  // air volume 
-
-// Elementary cell of ring 1 :
-// (cells of ring 1 will be shifted by 2.0 cm backwards to output fibers)
-   
-  Float_t   offsetFibers  =  1.0;
-  Float_t   offset        =  fThickness/2.0 - lidThickness - fThickness1/2.0; 
-  Float_t   r1Right       =  r0Right + 0.3 + height1Right;
-      
-  partubs[0]     =  r0Right + 0.3;
-  partubs[1]     =  r1Right;
-  partubs[2]     =  fThickness1/2.0;
-  
-  gMC->Gsvolu("V0R1","TUBS",idtmed[3005],partubs,5);  // scintillator volume
-  gMC->Gspos("V0R1",1,"V0R0", 0.0, 0.0 , -offset, 0,"ONLY"); 
-
-// Elementary cell of ring 2 :
-// (cells of ring 2 will be shifted by 1.0 cm backwards to output fibers)
-
-  Float_t   r2Right   =  r1Right + height2Right;       
-  
-  partubs[0]     =  r1Right;
-  partubs[1]     =  r2Right;
-
-  gMC->Gsvolu("V0R2","TUBS",idtmed[3005],partubs,5);  // scintillator volume
-  gMC->Gspos("V0R2",1,"V0R0", 0.0, 0.0 , -offset + offsetFibers, 0,"ONLY"); 
-
-// Elementary cell of ring 3 :
-
-  Float_t   r3Right   =  r2Right + height3Right;   
-     
-  partubs[0]     =  r2Right;
-  partubs[1]     =  r3Right;
-  partubs[3]     =  90.0-22.5;
-  partubs[4]     = 112.5-22.5;
-
-  gMC->Gsvolu("V0R3","TUBS",idtmed[3005],partubs,5);  // scintillator volume
-  gMC->Gspos("V0R3",1,"V0R0", 0.0, 0.0 , -offset + 2.0 * offsetFibers, 0,"ONLY");
-  
-  partubs[3]     = 112.5-22.5;
-  partubs[4]     = 135.0-22.5;
-  gMC->Gsvolu("V0R4","TUBS",idtmed[3005],partubs,5);  // scintillator volume
-  gMC->Gspos("V0R4",1,"V0R0", 0.0, 0.0 , -offset + 2.0 * offsetFibers, 0,"ONLY");
-  
-// Elementary cell of ring 4 :
-   
-  partubs[0]     =  r3Right;
-  partubs[1]     =  r4Right;
-  partubs[3]     =  90.0-22.5;
-  partubs[4]     = 112.5-22.5;
-
-  gMC->Gsvolu("V0R5","TUBS",idtmed[3005],partubs,5);  // scintillator volume
-  gMC->Gspos("V0R5",1,"V0R0", 0.0, 0.0 , -offset + 2.0 * offsetFibers, 0,"ONLY");
-  
-  partubs[3]     = 112.5-22.5;
-  partubs[4]     = 135.0-22.5;
-  gMC->Gsvolu("V0R6","TUBS",idtmed[3005],partubs,5);  // scintillator volume
-  gMC->Gspos("V0R6",1,"V0R0", 0.0, 0.0 , -offset + 2.0 * offsetFibers, 0,"ONLY");
-    
-  Float_t  phiDeg = 180./4.; 
-
-// Right part : 
-  for(Float_t  phi = 22.5; phi < 360.0; phi = phi + phiDeg)
-      {        
-       AliMatrix(idrotm[902], 90.0, phi, 90.0, 90.0 +phi, 0.0 , 0.0);
-        gMC->Gspos("V0R0",ndetR,"V0RI",0.0,
-                         0.0,0.0,idrotm[902],"ONLY");
-       ndetR++;
-       }
-
-  gMC->Gspos("V0RI",1,"ALIC",0.0,0.0,-zdet,0,"ONLY");
-  ncellsR = (ndetR - 1) * 6;  
-  AliInfo(Form("Number of cells on Right side =   %d\n",  ncellsR));
-
-// Left part :
-  
-  for(Float_t  phi = 22.5; phi < 360.0; phi = phi + phiDeg)
-      {       
-       AliMatrix(idrotm[902], 90.0, phi, 90.0, 90.0 +phi, 0.0 , 0.0);
-        gMC->Gspos("V0L0",ndetL,"V0LE",0.0,
-                         0.0,0.0,idrotm[902],"ONLY");
-        ndetL++;
-       }
-
-  gMC->Gspos("V0LE",1,"ALIC",0.0,0.0,339.0+fThickness1/2.0,0,"ONLY");
-  ncellsL = (ndetL - 1) * 4;
-  AliInfo(Form("Number of cells on Left side  =   %d\n",  ncellsL));    
-           
-}
-            
-//_____________________________________________________________________________
-void AliVZEROv5::CreateMaterials()
-{
-
-// Creates materials used for geometry 
-
-    AliDebug(2,"Create materials");
-    
-/*
-    Float_t ppckov[14] = { 5.5e-9, 5.7e-9, 5.9e-9, 6.1e-9, 6.3e-9, 6.5e-9, 6.7e-9, 
-                           6.9e-9, 7.1e-9, 7.3e-9, 7.5e-9, 7.7e-9, 7.9e-9, 8.1e-9 };
-
-           
-    Float_t ppckov_alu[14] = { 5.5e-9, 5.7e-9, 5.9e-9, 6.1e-9, 6.3e-9, 6.5e-9, 6.7e-9, 
-                               6.9e-9, 7.1e-9, 7.3e-9, 7.5e-9, 7.7e-9, 7.9e-9, 8.1e-9 };
-                          
-    Float_t rindex_quarz[14] = { 1.52398,  1.53090, 1.53835, 1.54641, 1.55513, 1.56458, 
-                                 1.57488,  1.58611, 1.59842, 1.61197, 1.62696, 1.64362, 
-                                 1.662295, 1.68337 };
-                                
-    Float_t absco_quarz[14] = { 105.8,  45.656, 35.665, 28.598, 25.007, 21.04, 17.525, 
-                                14.177, 9.282, 4.0925, 1.149, 0.3627, 0.1497, 0.05 };  
-                                                                                       
-    Float_t effic_all[14]   = { 1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1. };
-    
-        
-    Float_t rindex_alu[14] = { 1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1. }; 
-    
-    
-    Float_t absco_alu[14]  = { 1e-4,1e-4,1e-4,1e-4,1e-4,1e-4,1e-4,1e-4,1e-4,1e-4,
-                              1e-4,1e-4,1e-4,1e-4 };
-    Float_t effic_alu[14]  = { 1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1. };
-
-*/       
-
-    Int_t *idtmed = fIdtmed->GetArray()-2999;
-    
-    
-//  Parameters related to Quarz (SiO2) :
-    Float_t aqua[2], zqua[2], densqua, wmatqua[2];
-    Int_t nlmatqua;
-    
-    aqua[0]    = 28.09;
-    aqua[1]    = 16.;
-    zqua[0]    = 14.;
-    zqua[1]    = 8.;
-    densqua    = 2.64;
-    nlmatqua   = -2;
-    wmatqua[0] = 1.;
-    wmatqua[1] = 2.;
-
-// Parameters  related to aluminum sheets :
-    
-    Float_t  aal   = 26.98;
-    Float_t  zal   = 13.00; 
-    Float_t  densal=   2.7; 
-    Float_t  radlal=   8.9;
-       
-// Parameters  related to scintillator CH :
-    
-    Float_t ascin[2] = {1.00794,12.011};
-    Float_t zscin[2] = {1.,6.};
-    Float_t wscin[2] = {1.,1.};
-    Float_t denscin  = 1.032;
-    
-// AIR
-
-    Float_t aAir[4]={12.,14.,16.,36.};
-    Float_t zAir[4]={6.,7.,8.,18.};
-    Float_t wAir[4]={0.000124,0.755267,0.231781,0.012827};
-    Float_t dAir = 1.20479E-3;
-        
-//  Definition of materials :
-       
-    AliMixture( 1, "AIR A$", aAir,zAir,dAir,4,wAir);
-    AliMixture(11, "AIR I$", aAir,zAir,dAir,4,wAir);
-    AliMaterial( 2, "CARBON$"  , 12.01, 6.0, 2.265, 18.8, 49.9, 0, 0);
-    AliMixture(  3, "QUA", aqua, zqua, densqua, nlmatqua, wmatqua);
-    AliMaterial( 4, "ALUMINIUM1$", 26.98, 13., 2.7, 8.9, 37.2, 0, 0);
-    AliMaterial( 5, "ALUMINIUM2$", aal, zal, densal, radlal, 0, 0, 0);
-    AliMixture( 6, "Scintillator$",ascin,zscin,denscin,-2,wscin);
-    
-     
-    Int_t   iSXFLD = ((AliMagF*)TGeoGlobalMagField::Instance()->GetField())->Integ();     // Field type 
-    Float_t sXMGMX = ((AliMagF*)TGeoGlobalMagField::Instance()->GetField())->Max();       // Field max.
-    
-    Float_t tmaxfd, stemax, deemax, epsil, stmin;
-        
-    tmaxfd = 10.;
-    stemax = 0.1;
-    deemax = 0.1;     
-    epsil  = 0.001;
-    stmin  = 0.001;
-  
-//  Active Air :    
-    AliMedium(1, "ACTIVE AIR$", 1, 1, iSXFLD, sXMGMX,
-              10.0, 1.0, 0.1, 0.1, 10.0, 0, 0) ;
-
-//  Inactive air : 
-  
-    AliMedium(11, "INACTIVE AIR$", 11, 0, iSXFLD, sXMGMX,
-              10.0, 1.0, 0.1, 0.1, 10.0, 0, 0) ;
-    
-    AliMedium(2, "CARBON$ ", 2,  1, iSXFLD, sXMGMX,
-              tmaxfd, stemax, deemax, epsil, stmin, 0, 0);   
-
-    AliMedium(3, "QUARZ$", 3, 1, iSXFLD, sXMGMX,
-              tmaxfd, fMaxStepQua, fMaxDestepQua, epsil, stmin, 0, 0);
-    
-    AliMedium(4,"ALUMINUM1$",4, 1, iSXFLD, sXMGMX,
-              tmaxfd, fMaxStepAlu, fMaxDestepAlu, epsil, stmin, 0, 0);
-             
-
-    AliMedium(5,"ALUMINUM2$",5, 1, iSXFLD, sXMGMX,
-              tmaxfd, fMaxStepAlu, fMaxDestepAlu, epsil, stmin, 0, 0);    
-
-    AliMedium(6,"SCINTILLATOR$",6, 1, iSXFLD, sXMGMX, 10.0, 0.1, 0.1, 0.003, 0.003, 0, 0);
-
-    gMC->Gstpar(idtmed[3000], "LOSS", 1.);  //  [3000] = air ACTIF  [3010] = air INACTIF
-    gMC->Gstpar(idtmed[3000], "HADR", 1.);
-    gMC->Gstpar(idtmed[3000], "DCAY", 1.);
-    gMC->Gstpar(idtmed[3000], "DRAY", 1.);
-    
-    gMC->Gstpar(idtmed[3001], "LOSS", 1.);  //  [3001] = carbon
-    gMC->Gstpar(idtmed[3001], "HADR", 1.);
-    gMC->Gstpar(idtmed[3001], "DCAY", 1.);
-    gMC->Gstpar(idtmed[3001], "DRAY", 1.);
-
-    gMC->Gstpar(idtmed[3002], "LOSS", 1.);  //  [3002] = quartz
-    gMC->Gstpar(idtmed[3002], "HADR", 1.);
-    gMC->Gstpar(idtmed[3002], "DCAY", 1.);
-    gMC->Gstpar(idtmed[3002], "DRAY", 1.);  
-    gMC->Gstpar(idtmed[3002], "CUTGAM",0.5E-4) ; 
-    gMC->Gstpar(idtmed[3002], "CUTELE",1.0E-4) ;
-    
-    gMC->Gstpar(idtmed[3003], "LOSS", 1.);  //  [3003] = normal aluminum
-    gMC->Gstpar(idtmed[3003], "HADR", 1.);
-    gMC->Gstpar(idtmed[3003], "DCAY", 1.);
-    gMC->Gstpar(idtmed[3003], "DRAY", 1.);
-    
-    gMC->Gstpar(idtmed[3004], "LOSS", 1.);  //  [3004] = reflecting aluminum
-    gMC->Gstpar(idtmed[3004], "HADR", 1.);
-    gMC->Gstpar(idtmed[3004], "DCAY", 1.);
-    gMC->Gstpar(idtmed[3004], "DRAY", 1.);
-    gMC->Gstpar(idtmed[3004], "CUTGAM",0.5E-4) ; 
-    gMC->Gstpar(idtmed[3004], "CUTELE",1.0E-4) ;
-    
-    gMC->Gstpar(idtmed[3005], "LOSS", 1.);  //  [3005] = scintillator
-    gMC->Gstpar(idtmed[3005], "HADR", 1.);
-    gMC->Gstpar(idtmed[3005], "DCAY", 1.);
-    gMC->Gstpar(idtmed[3005], "DRAY", 1.); 
-    gMC->Gstpar(idtmed[3005], "CUTGAM",0.5E-4) ; 
-    gMC->Gstpar(idtmed[3005], "CUTELE",1.0E-4) ;
-      
-    
-//    geant3->Gsckov(idtmed[3002], 14, ppckov, absco_quarz, effic_all,rindex_quarz);    
-//    geant3->Gsckov(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 AliVZEROv5::DrawModule() const
-{
-
-//  Drawing is done in DrawVZERO.C
-
-   AliDebug(2,"DrawModule");
-}
-
-//_____________________________________________________________________________
-void AliVZEROv5::Init()
-{
-// Initialises version 2 of the VZERO Detector
-// Just prints an information message
-  
-   AliInfo(Form("VZERO version %d initialized \n",IsVersion()));
-   
-//   gMC->SetMaxStep(fMaxStepAlu);
-//   gMC->SetMaxStep(fMaxStepQua);
-   
-    AliVZERO::Init();  
-}
-
-//_____________________________________________________________________________
-void AliVZEROv5::StepManager()
-{
-// Step Manager, called at each step 
-     Int_t     copy;
-     static    Int_t   vol[4];
-     static    Float_t hits[21];
-     static    Float_t eloss, tlength;
-     static    Int_t   nPhotonsInStep;
-     static    Int_t   nPhotons; 
-     static    Int_t   numStep;
-     Float_t   ringNumber;
-     Float_t   destep, step;
-     
-     numStep += 1; 
-          
-//   We keep only charged tracks :
-     
-     if ( !gMC->TrackCharge() || !gMC->IsTrackAlive() ) return; 
-
-     vol[0]    = gMC->CurrentVolOffID(1, vol[1]);
-     vol[2]    = gMC->CurrentVolID(copy);
-     vol[3]    = copy;
-     
-     static Int_t idV0R1 = gMC->VolId("V0R1");
-     static Int_t idV0L1 = gMC->VolId("V0L1");
-     static Int_t idV0R2 = gMC->VolId("V0R2");
-     static Int_t idV0L2 = gMC->VolId("V0L2");
-     static Int_t idV0R3 = gMC->VolId("V0R3");
-     static Int_t idV0L3 = gMC->VolId("V0L3");
-     static Int_t idV0R4 = gMC->VolId("V0R4");
-     static Int_t idV0L4 = gMC->VolId("V0L4");
-     static Int_t idV0R5 = gMC->VolId("V0R5");
-     static Int_t idV0R6 = gMC->VolId("V0R6");
-
-     if      ( gMC->CurrentVolID(copy) == idV0R1 ||
-               gMC->CurrentVolID(copy) == idV0L1 )
-              ringNumber = 1.0;
-     else if ( gMC->CurrentVolID(copy) == idV0R2 ||
-               gMC->CurrentVolID(copy) == idV0L2 ) 
-              ringNumber = 2.0;  
-     else if ( gMC->CurrentVolID(copy) == idV0R3 ||
-               gMC->CurrentVolID(copy) == idV0R4 ||
-               gMC->CurrentVolID(copy) == idV0L3 )
-              ringNumber = 3.0;
-     else if ( gMC->CurrentVolID(copy) == idV0R5 ||
-               gMC->CurrentVolID(copy) == idV0R6 ||
-               gMC->CurrentVolID(copy) == idV0L4 )
-              ringNumber = 4.0;               
-     else
-              ringNumber = 0.0;
-
-     if  (  ringNumber > 0.5  ) { 
-     
-        destep    = gMC->Edep();
-       step      = gMC->TrackStep();
-        
-       nPhotonsInStep  = Int_t(destep / (fLightYield *1e-9) ); 
-       nPhotonsInStep  = gRandom->Poisson(nPhotonsInStep);
-       
-       eloss    += destep;
-       tlength  += step;        
-       
-        if  ( gMC->IsTrackEntering()  )  { 
-        
-            nPhotons  =  nPhotonsInStep;       
-           gMC->TrackPosition(fTrackPosition);
-           gMC->TrackMomentum(fTrackMomentum);
-           
-            Float_t pt  = TMath::Sqrt( fTrackMomentum.Px() * fTrackMomentum.Px() +
-                                      fTrackMomentum.Py() * fTrackMomentum.Py() );
-               
-            hits[0]  = fTrackPosition.X();
-            hits[1]  = fTrackPosition.Y();
-            hits[2]  = fTrackPosition.Z();              
-           hits[3]  = Float_t (gMC->TrackPid()); 
-
-           hits[4]  = gMC->TrackTime();
-            hits[5]  = gMC->TrackCharge();
-           hits[6]  = fTrackMomentum.Theta()*TMath::RadToDeg();
-           hits[7]  = fTrackMomentum.Phi()*TMath::RadToDeg();
-           hits[8]  = ringNumber;
-        
-           hits[9]  = pt;
-           hits[10] = fTrackMomentum.P();
-           hits[11] = fTrackMomentum.Px();
-           hits[12] = fTrackMomentum.Py();
-           hits[13] = fTrackMomentum.Pz();
-           
-           TParticle *par = gAlice->GetMCApp()->Particle(gAlice->GetMCApp()->GetCurrentTrackNumber());
-            hits[14] = par->Vx();
-            hits[15] = par->Vy();
-            hits[16] = par->Vz();
-            
-           tlength  = 0.0;
-           eloss    = 0.0;         
-         }
-        
-        nPhotons  = nPhotons + nPhotonsInStep;
-        
-        if( gMC->IsTrackExiting() || gMC->IsTrackStop() || gMC->IsTrackDisappeared()){
-        
-        nPhotons  = nPhotons - Int_t((Float_t(nPhotons) * fLightAttenuation * fnMeters));       
-        nPhotons  = nPhotons - Int_t( Float_t(nPhotons) * fFibToPhot);  
-        
-        hits[17] =   eloss;
-        hits[18] = tlength;
-        hits[19] = nPhotons;
-        hits[20] = GetCellId (vol, hits); 
-                
-         AddHit(gAlice->GetMCApp()->GetCurrentTrackNumber(), vol, hits);
-                
-        tlength         = 0.0;
-        eloss           = 0.0; 
-        nPhotons        =   0;
-        nPhotonsInStep  =   0;
-        
-        numStep         =   0;  
-        } 
-    }
-      
-}
-
-//_____________________________________________________________________________
-void AliVZEROv5::AddHit(Int_t track, Int_t *vol, Float_t *hits)
-{
-  
-//  Adds a VZERO hit
-  
-  TClonesArray &lhits = *fHits;
-  new(lhits[fNhits++]) AliVZEROhit(fIshunt,track,vol,hits);
-}
-
-//_____________________________________________________________________________
-void AliVZEROv5::AddDigits(Int_t *tracks, Int_t* digits) 
-{
-
-//  Adds a VZERO digit
-
-   TClonesArray  &ldigits = *fDigits;
-   new(ldigits[fNdigits++]) AliVZEROdigit(tracks, digits);
-}
-
-//_____________________________________________________________________________
-void AliVZEROv5::MakeBranch(Option_t *option)
-{
-  
-// Creates new branches in the current Root Tree
-    
-  char branchname[10];
-  sprintf(branchname,"%s",GetName());
-  AliDebug(2,Form("fBufferSize = %d",fBufferSize));
-  
-  const char *cH = strstr(option,"H");
-  
-  if (fHits   && fLoader->TreeH() && cH) {
-    fLoader->TreeH()->Branch(branchname,&fHits, fBufferSize);
-    AliDebug(2,Form("Making Branch %s for hits",branchname));
-  }     
-
-  const char *cD = strstr(option,"D");
-  
-  if (fDigits   && fLoader->TreeD() && cD) {
-    fLoader->TreeD()->Branch(branchname,&fDigits, fBufferSize);
-    AliDebug(2,Form("Making Branch %s for digits",branchname));
-  }  
-   
-}
-
-//_____________________________________________________________________________
-Int_t AliVZEROv5::GetCellId(Int_t *vol, Float_t *hits) 
-{
-
-  //   Returns Id of scintillator cell
-  //   Right side from  0 to 47
-  //   Left  side from 48 to 95
-  
-  //   hits[8] = ring number (1 to 4)
-  //   vol[1]  = copy number (1 to 8)
-
-   Int_t index      = vol[1];
-   Int_t RingNumber = Int_t(hits[8]);   
-   fCellId          = 0;
-   
-//    cout << "volID = " << vol[0] << "  copy = " << vol[1] << endl;
-//    cout << "X     = " << hits[0] << "    Y = " << hits[1] << endl;
-   
-   Float_t phi = Float_t(TMath::ATan2(Double_t(hits[1]),Double_t(hits[0])) ); 
-   phi = kRaddeg * phi;
-    
-   if (index < 7) index = index + 8; 
-   
-   if (hits[2] < 0.0) { 
-      if(RingNumber < 3) {
-         index = (index - 7) + ( ( RingNumber - 1 ) * 8);}
-      else if(RingNumber >= 3){ 
-       if(gMC->CurrentVolID(vol[1]) == gMC->VolId("V0R3")|| 
-          gMC->CurrentVolID(vol[1]) == gMC->VolId("V0R5") ) 
-         {index = (index*2 - 14) + ( ( RingNumber - 2 ) * 16); }
-       if(gMC->CurrentVolID(vol[1]) == gMC->VolId("V0R4")||
-          gMC->CurrentVolID(vol[1]) == gMC->VolId("V0R6") ) 
-         {index = (index*2 - 13) + ( ( RingNumber - 2 ) * 16); }
-      }
-      fCellId   = index;           
-   }
-           
-   else if (hits[2] > 0.0){
-      index = (index - 7 + 48) + ( ( RingNumber - 1 ) * 8);
-      fCellId   = index;}
-             
-//    cout << " ring   = " << RingNumber << " phi = "<<  phi << endl; 
-//    cout << " cellID = " << fCellId <<  endl;
-//    cout <<  "**********" << endl;         
-           
-   return fCellId;
-   
-   
-}
diff --git a/VZERO/AliVZEROv5.h b/VZERO/AliVZEROv5.h
deleted file mode 100755 (executable)
index 1d83eae..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef ALIVZEROv5_H
-#define ALIVZEROv5_H
-/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
- * See cxx source for full Copyright notice                               */
-
-
-///////////////////////////////////////////////////
-//                                               //
-//  Manager and hits classes for set : VZERO     //
-//                                   version 5   //
-//                                   june 2004   //
-//                                               //
-///////////////////////////////////////////////////
-
-#include "TLorentzVector.h" 
-#include "AliVZERO.h"
-
-class AliVZEROv5 : public AliVZERO {
-  
-public:
-  AliVZEROv5();
-  AliVZEROv5(const char *name, const char *title);
-  virtual       ~AliVZEROv5() {}
-  virtual void   AddHit(Int_t track, Int_t *vol, Float_t *hits); 
-  virtual void   AddDigits(Int_t *tracks, Int_t *digits);
-  virtual void   CreateGeometry();
-  virtual void   CreateMaterials();
-  virtual void   DrawModule() const;
-  virtual void   Init();
-  virtual void   MakeBranch(Option_t *option);
-  virtual Int_t  IsVersion() const {return 3;}
-  virtual void   StepManager();
-  Int_t          GetCellId(Int_t *vol, Float_t *hits);
-  
-protected:
-  Int_t          fCellId;        // Scintillator cell number from 0 to 95 
-  TLorentzVector fTrackPosition; // Position of particle entering cell
-  TLorentzVector fTrackMomentum; // Momentum of particle entering cell
-  
-private:  
-  Float_t fLightYield;       // Lightyield in BC408   (93.75 eV per photon)
-  Float_t fLightAttenuation; // LightAttenuation in fibers (0.05 per meter)
-  Float_t fnMeters;          // Number of meters of fibers to PM
-  Float_t fFibToPhot;        // Loss in Fibers - Photocathode Connection 
-  
-  ClassDef(AliVZEROv5,1)  //Class for VZERO version 5
-};
-
-#endif
-
-
index a634f75..4d3ef3e 100755 (executable)
@@ -7,10 +7,6 @@
 #pragma link off all functions;
  
 #pragma link C++ class  AliVZERO+;
-#pragma link C++ class  AliVZEROv2+;
-#pragma link C++ class  AliVZEROv3+;
-#pragma link C++ class  AliVZEROv4+;
-#pragma link C++ class  AliVZEROv5+;
 #pragma link C++ class  AliVZEROv6+;
 #pragma link C++ class  AliVZEROv7+;
 #pragma link C++ class  AliVZEROhit+;
index c9c58a8..59a7134 100644 (file)
@@ -3,10 +3,6 @@
 
 SRCS= \
 AliVZERO.cxx \
-AliVZEROv2.cxx \
-AliVZEROv3.cxx \
-AliVZEROv4.cxx \
-AliVZEROv5.cxx \
 AliVZEROv6.cxx \
 AliVZEROv7.cxx \
 AliVZEROhit.cxx \