Do not allocate fixed size arrays via new

[u/mrichter/AliRoot.git] / VZERO / AliVZEROhit.cxx

diff --git a/VZERO/AliVZEROhit.cxx b/VZERO/AliVZEROhit.cxx
index 7f8fb794481ad8d9dd82057b48657ba73bf408ba..a2fff136362cc1fe5f1d776e55674c6696a5e298 100644 (file)
--- a/VZERO/AliVZEROhit.cxx
+++ b/VZERO/AliVZEROhit.cxx
@@ -25,40 +25,81 @@
 #include "AliVZEROhit.h"
 
 ClassImp(AliVZEROhit)
- 
+ //___________________________________________
+AliVZEROhit::AliVZEROhit()
+  : AliHit(), 
+    fVolume(0),
+    fCopy(0),
+    fTrackPiD(0.0),
+    fTof(0.0),
+    fCharge(0.0),
+    fTheta(0.0),
+    fPhi(0.0),
+    fRingNumber(0.0),
+    fPt(0.0),
+    fPmom(0.0),
+    fPx(0.0),
+    fPy(0.0),
+    fPz(0.0),
+    fVx(0.0),
+    fVy(0.0),
+    fVz(0.0),
+    fEloss(0.0),
+    fTleng(0.0),
+    fNphot(0),
+    fCell(0)
+{
+/// Default constructor
+}
 //_____________________________________________________________________________
-AliVZEROhit::AliVZEROhit(Int_t shunt, Int_t track, Int_t* vol, Float_t* hits):
-  AliHit(shunt, track)
+AliVZEROhit::AliVZEROhit(Int_t shunt, Int_t track, Int_t* vol, Float_t* hits)
+  : AliHit(shunt, track),
+    fVolume(vol[0]),
+    fCopy(vol[1]),
+    fTrackPiD(hits[3]),
+    fTof(hits[4]),
+    fCharge(hits[5]),
+    fTheta(hits[6]),
+    fPhi(hits[7]),
+    fRingNumber(hits[8]),
+    fPt(hits[9]),
+    fPmom(hits[10]),
+    fPx(hits[11]),
+    fPy(hits[12]),
+    fPz(hits[13]),
+    fVx(hits[14]),
+    fVy(hits[15]),
+    fVz(hits[16]),
+    fEloss(hits[17]),
+    fTleng(hits[18]),
+    fNphot((Int_t) hits[19]),
+    fCell((Int_t) hits[20])         
+ 
+//   fVolume      = vol[0];       // Volume ID
+//   fCopy        = vol[1];       // Copy number
+//   fTrackPiD    = hits[3];      // Track PiD
+//   fTof         = hits[4];      // Particle time of flight
+//   fCharge      = hits[5];      // Particle charge
+//   fTheta       = hits[6];      // Incident theta angle in degrees 
+//   fPhi         = hits[7];      // Incident phi angle in degrees
+//   fRingNumber  = hits[8];      // Ring number    
+//   fPt          = hits[9];      // Local transverse momentum of the particle
+//   fPmom        = hits[10];     // Local P momentum of the particle
+//   fPx          = hits[11];     // Local Px momentum of the particle
+//   fPy          = hits[12];     // Local Py momentum of the particle
+//   fPz          = hits[13];     // Local Pz momentum of the particle
+//   
+//   fVx          = hits[14];     // Vertex x coordinate
+//   fVy          = hits[15];     // Vertex y coordinate
+//   fVz          = hits[16];     // Vertex z coordinate  
+//   fEloss       = hits[17];     // Energy deposited inside volume
+//   fTleng       = hits[18];     // Track length inside volume  
+//   fNphot       = (Int_t) hits[19]; // Number of photons created by current hit 
+//   fCell        = (Int_t) hits[20]; // Scintillator cell number from 0 to 71
+
 {
-  //
-  // Adds a VZERO hit
-  //
-  
-  fVolume        = vol[0];     // Volume ID
-  fCopy          = vol[1];     // Copy number
-  fX            = hits[0];    // X position of hit
-  fY             = hits[1];    // Y position of hit
-  fZ             = hits[2];    // Z position of hit
-  fTrackPiD      = hits[3];    // Track PiD
-  fTof           = hits[4];    // Particle time of flight
-  fCharge        = hits[5];    // Particle charge
-  fTheta         = hits[6];    // Incident theta angle in degrees 
-  fPhi           = hits[7];    // Incident phi angle in degrees
-  fRingNumber    = hits[8];    // Ring number 
-  
-  fPt            = hits[9];    // Local transverse momentum of the particle
-  fPmom          = hits[10];   // Local P momentum of the particle
-  fPx            = hits[11];   // Local Px momentum of the particle
-  fPy            = hits[12];   // Local Py momentum of the particle
-  fPz            = hits[13];   // Local Pz momentum of the particle
-  
-  fVx            = hits[14];   // Vertex x coordinate
-  fVy            = hits[15];   // Vertex y coordinate
-  fVz            = hits[16];   // Vertex z coordinate
-  
-  fEloss         = hits[17];   // Energy deposited inside volume
-  fTleng         = hits[18];   // Track length inside volume  
-  fNphot         = hits[19];   // Number of photons created by current hit 
-  fCell          = hits[20];   // Scintillator cell number from 0 to 71
-  
+// Constructor
+   fX           = hits[0];      // X position of hit
+   fY           = hits[1];      // Y position of hit
+   fZ           = hits[2];      // Z position of hit   
 }