From 58d6a7132f38d6bdd049f99faa501db8e66c66db Mon Sep 17 00:00:00 2001
From: alla <alla@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Thu, 6 May 2004 07:01:27 +0000
Subject: [PATCH 1/1]  Violations fixed

---
 FMD/AliFMD.cxx | 19 ++-----------------
 FMD/AliFMD.h   | 14 ++++++++------
 2 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/FMD/AliFMD.cxx b/FMD/AliFMD.cxx
index 53b43e9491a..0c21558482f 100644
--- a/FMD/AliFMD.cxx
+++ b/FMD/AliFMD.cxx
@@ -47,8 +47,6 @@
 #include <TClonesArray.h>
 #include <TFile.h>
 #include <TGeometry.h>
-#include <TLorentzVector.h>
-#include <TMath.h>
 #include <TNode.h>
 #include <TTUBE.h>
 #include <TTree.h>
@@ -60,7 +58,6 @@
 #include "AliFMDhit.h"
 #include "AliFMDv1.h"
 #include "AliLoader.h"
-#include "AliMagF.h"
 #include "AliRun.h"
 #include "AliMC.h"
 #include "AliFMDDigitizer.h"
@@ -102,6 +99,7 @@ AliDetector (name, title)
 //-----------------------------------------------------------------------------
 AliFMD::~AliFMD ()
 {
+  //destructor for base class AliFMD
   if (fHits)
     {
       fHits->Delete ();
@@ -189,7 +187,7 @@ void AliFMD::BuildGeometry ()
 }
 
 //_____________________________________________________________________________
-Int_t AliFMD::DistanceToPrimitive (Int_t /*px*/, Int_t /*py*/)
+const Int_t AliFMD::DistanceToPrimitive (Int_t /*px*/, Int_t /*py*/)
 {
   //
   // Calculate the distance from the mouse to the FMD on the screen
@@ -302,19 +300,6 @@ void AliFMD::SetTreeAddress ()
 
 
 
-void
-AliFMD::Eta2Radius (Float_t eta, Float_t zDisk, Float_t * radius)
-{
-  Float_t expEta = TMath::Exp (-eta);
-  Float_t theta = TMath::ATan (expEta);
-  theta = 2. * theta;
-  Float_t rad = zDisk * (TMath::Tan (theta));
-  *radius = rad;
-
-  if (fDebug)
-    printf ("%s: eta %f radius %f\n", ClassName (), eta, rad);
-}
-
 //-----------------------------------------------------------------------
 
 void AliFMD::MakeBranchInTreeD(TTree *treeD, const char *file)
diff --git a/FMD/AliFMD.h b/FMD/AliFMD.h
index 7b95b5dfe18..f5647881496 100644
--- a/FMD/AliFMD.h
+++ b/FMD/AliFMD.h
@@ -17,13 +17,15 @@ class TClonesArray;
 public:
   AliFMD();
   AliFMD(const char *name, const char *title);
+  AliFMD(const AliFMD& FMD):AliDetector(FMD) {;}  //copy ctor
   virtual       ~AliFMD(); 
-  virtual void   AddHit(Int_t, Int_t*, Float_t*);
-  virtual void   AddDigit(Int_t*);
+ AliFMD&  operator=(const AliFMD&)                 {return *this;}
+  virtual void   AddHit(Int_t track, Int_t * vol, Float_t * hits);
+  virtual void   AddDigit(Int_t* digits);
    virtual void   BuildGeometry();
   virtual void   CreateGeometry() {}
   virtual void   CreateMaterials()=0; 
-  virtual Int_t  DistanceToPrimitive(Int_t px, Int_t py);
+  virtual const Int_t  DistanceToPrimitive(Int_t px, Int_t py);
   virtual Int_t  IsVersion() const =0;
   virtual void   Init();
   virtual void   MakeBranch(Option_t *opt=" ");
@@ -35,12 +37,12 @@ public:
   virtual void   StepManager() {}
    
   void SetEventNumber(Int_t i)     {fEvNrSig = i;}
-  void  Eta2Radius(Float_t, Float_t, Float_t*);
+
 
  
    // Digitisation
   TClonesArray *ReconParticles() const {return fReconParticles;}   
-  virtual void SetHitsAddressBranch(TBranch *b){b->SetAddress(&fHits);}
+  virtual const void SetHitsAddressBranch(TBranch *b){b->SetAddress(&fHits);}
   virtual AliDigitizer* CreateDigitizer(AliRunDigitizer* manager) const;
 
  protected:
@@ -54,7 +56,7 @@ public:
   Int_t fEvNrSig;                 // signal     event number
 
 
-  TClonesArray *fReconParticles;
+  TClonesArray *fReconParticles; //array of reconstructed multiplicity in 0.1eta
 
  ClassDef(AliFMD,6)  //Class for the FMD detector
 };
-- 
2.39.3