Coding convention violations removed

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

diff --git a/VZERO/AliVZERO.h b/VZERO/AliVZERO.h
index 34961e16156aad5cd748dee7cb5a5efe1b266c64..ecfd717963d5c17413c34fae7873c99a3c7915a4 100755 (executable)
--- a/VZERO/AliVZERO.h
+++ b/VZERO/AliVZERO.h
@@ -1,5 +1,5 @@
-#ifndef VZERO_H
-#define VZERO_H
+#ifndef ALIVZERO_H
+#define ALIVZERO_H
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
@@ -7,30 +7,36 @@
 //////////////////////////////////////////////////
 //  Manager and hits classes for set : VZERO    //
 //////////////////////////////////////////////////
- 
-#include "AliDetector.h"
-#include "AliHit.h"
-#include "TNamed.h"
-#include "TTree.h"
 
-class TDirectory;
-R__EXTERN TDirectory *  gDirectory;
- 
+#include "AliRun.h"
+#include "AliMC.h"
+#include "AliDetector.h"
+#include "AliVZEROLoader.h"
  
+#include <TNamed.h>
+#include <TTree.h>
+
+class AliVZEROhit; 
+class AliVZEROdigit;
+  
 class AliVZERO : public AliDetector {
  
 public:
 
   AliVZERO() {}
   AliVZERO(const char *name, const char *title);
-  virtual       ~AliVZERO() {}
-  virtual void   AddDigit( Int_t* tracks, Int_t* digits) = 0;
+  virtual       ~AliVZERO();
+//  virtual void   AddHit(Int_t track , Int_t *vol, Float_t *hits)=0; 
+//  virtual void   AddDigits(Int_t* tracks, Int_t* digits)=0;
   virtual void   BuildGeometry();
   virtual void   CreateGeometry();
   virtual void   CreateMaterials();
   virtual Int_t  DistanceToPrimitive(Int_t px, Int_t py);
   virtual Int_t  IsVersion() const = 0;
   virtual void   Init();
+  virtual AliLoader* MakeLoader(const char* topfoldername);
+  virtual void   SetTreeAddress();  
+  virtual void   MakeBranch(Option_t *option) =0;
   virtual void   DrawModule() {};
   virtual void   StepManager() {};
   virtual inline  void   SetThickness(Float_t thick)  {fThickness = thick;};
@@ -41,16 +47,12 @@ public:
   virtual void   SetMaxDestepQua(Float_t p1);
   virtual void   SetMaxDestepAlu(Float_t p1);
 
-   Int_t         fNCerenkovs;    //  Number of cerenkovs (detected on photocathode)
-   Int_t         fNGCerenkovs;   //  Number of cerenkovs (generated)
-   Int_t         fMulti; // Multiplicity of charged particles
-
    Float_t      fThickness;
    Float_t      fThickness1;
 
 protected:
 
-   Int_t fIdSens1;
+   Int_t fIdSens1;           // Sensitive volume  in VZERO
   
 // Stepping Parameters
    Float_t fMaxStepQua;      // Maximum step size inside the quartz volumes