New methods and data member added by M. Horner.

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

diff --git a/VZERO/AliVZERO.cxx b/VZERO/AliVZERO.cxx
index 9eb5a58dd2f6be4b61fb38d8fbc2f614304c0685..3d7b6a370ce6a62c988a621b6f629558d8e09aa0 100755 (executable)
--- a/VZERO/AliVZERO.cxx
+++ b/VZERO/AliVZERO.cxx
@@ -20,12 +20,13 @@
 //                          V-Zero   Detector                            //
 //  This class contains the base procedures for the VZERO  detector      //
 //  All comments should be sent to Brigitte CHEYNIS :                    //
-//                                 b.cheynis@ipnl.in2p3.fr               //                                                     //                                                                           //
+//                                 b.cheynis@ipnl.in2p3.fr               //
+//                                                                       //
 //                                                                       //
 ///////////////////////////////////////////////////////////////////////////
 
-#include <iostream.h>
-#include <fstream.h>
+#include <Riostream.h>
+#include <Riostream.h>
 
 #include "TMath.h"
 #include "TTUBE.h"
@@ -34,7 +35,6 @@
 #include "AliRun.h"
 #include "AliVZERO.h"
 #include "AliVZEROdigit.h"
-#include "AliMC.h"
 #include "AliVZEROhit.h"
 
 ClassImp(AliVZERO)
@@ -48,17 +48,17 @@ AliVZERO::AliVZERO(const char *name, const char *title)
   // Standard constructor for VZERO Detector
   //
   
-  fIshunt       =  1 ; // All hits are associated with primary particles  
+  fIshunt       =  1;  // All hits are associated with primary particles  
    
-  fHits         =  new TClonesArray("AliVZEROhit",400) ; 
-  fDigits       =  new TClonesArray("AliVZEROdigit",400) ; 
-  
-  fNhits        =    0;
-  fNdigits      =    0; 
-  fNCerenkovs   =    0; 
-  fMulti        =    0;
-  fThickness    =  3.1;   // total thickness of the V0R box
-  fThickness1   =  2.5;   // thickness of the thickest quartz cell
+  fHits         =  new TClonesArray("AliVZEROhit", 400);
+  fDigits       =  new TClonesArray("AliVZEROdigit",400); 
+   
+  gAlice->AddHitList(fHits);
+
+//  fDigits       =  new TClonesArray("AliVZEROdigit",400) ; 
+
+  fThickness    =  4.1;   // total thickness of the V0R box
+  fThickness1   =  0.7;   // thickness of the thickest cell (2.5 in version 0)
   
   fMaxStepQua   =  0.05; 
   fMaxStepAlu   =  0.01; 
@@ -67,7 +67,16 @@ AliVZERO::AliVZERO(const char *name, const char *title)
   fMaxDestepAlu =  -1.0;
   
   SetMarkerColor(kRed);
- }
+}
+
+//_____________________________________________________________________________
+AliVZERO::~AliVZERO()
+{
+    if (fHits) {
+        fHits->Delete();
+        delete fHits;
+    }
+}
 
 //_____________________________________________________________________________
 void AliVZERO::BuildGeometry()
@@ -91,6 +100,9 @@ void AliVZERO::CreateMaterials()
   // Build simple ROOT TNode geometry for event display
   //
 }
+
+
+
 //_____________________________________________________________________________
 Int_t AliVZERO::DistanceToPrimitive(Int_t px, Int_t py)
 {
@@ -110,6 +122,7 @@ void AliVZERO::Init()
   //
 }
 
+
 //-------------------------------------------------------------------------
 
 void AliVZERO::SetMaxStepQua(Float_t p1)