All coding rule violations except RS3 corrected

[u/mrichter/AliRoot.git] / EVGEN / AliDimuCombinator.h

diff --git a/EVGEN/AliDimuCombinator.h b/EVGEN/AliDimuCombinator.h
index 0ce339047afa5490d6e9cb4a01cc3589dc7b0157..ae6a593d6d41f503629df23d5270f97926b8736b 100644 (file)
--- a/EVGEN/AliDimuCombinator.h
+++ b/EVGEN/AliDimuCombinator.h
@@ -1,39 +1,22 @@
-#ifndef _AliDimuCombinator_H
-#define _AliDimuCombinator_H
+#ifndef ALIDIMUCOMBINATOR_H
+#define ALIDIMUCOMBINATOR_H
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
 /* $Id$ */
+#include <TParticle.h>
+#include <TObject.h>
 
-#include "TParticle.h"
-#include <TBrowser.h>
-#include <TList.h>
-#include <TTree.h>
-#include <TROOT.h>
+class TClonesArray;
+class TParticle;
 
 
 class AliDimuCombinator:
     public TObject 
 {
 public:
-    AliDimuCombinator(TClonesArray* Partarray){
-       fPartArray=Partarray;
-       fNParticle=fPartArray->GetEntriesFast();
-       
-       fimuon1 =0;
-       fimuon2 =0;
-       fmuon1  =0;
-       fmuon2  =0;
-       fimin1  = 0;
-       fimin2  = 0;
-       fimax1  = fNParticle;
-       fimax2  = fNParticle;
-       fPtMin  =0;
-       fEtaMin =-10;
-       fEtaMax =-10;
-       fRate1=1.;
-       fRate2=1.;
-    }
+    AliDimuCombinator(TClonesArray* Partarray);
+    AliDimuCombinator(const AliDimuCombinator &combinator);
 //    
 //  Iterators
 //  Single muons
@@ -55,7 +38,9 @@ public:
     void SetSecondRange(Int_t from, Int_t to);    
 //  Cuts
     void SetPtMin(Float_t ptmin) {fPtMin=ptmin;}
-    void SetEtaCut(Float_t etamin, Float_t etamax){fEtaMin=etamin; fEtaMax=etamax;}      Bool_t Selected(TParticle* part);
+    void SetEtaCut(Float_t etamin, Float_t etamax)
+       {fEtaMin=etamin; fEtaMax=etamax;}
+    Bool_t Selected(TParticle* part);
     Bool_t Selected(TParticle* part1, TParticle* part2);
 // Kinematics
     Float_t Mass(TParticle* part1, TParticle* part);
@@ -70,7 +55,8 @@ public:
     void    SetRate(Float_t rate1, Float_t rate2 ){fRate1=rate1; fRate2=rate2;}
     Float_t Weight(TParticle* part);
     Float_t Weight(TParticle* part1, TParticle* part);
-    Float_t Decay_Prob(TParticle* part);
+    Float_t DecayProbability(TParticle* part);
+    AliDimuCombinator & operator=(const AliDimuCombinator & rhs);
     
  private:
     void FirstPartner();
@@ -80,27 +66,29 @@ public:
     Int_t Origin(TParticle* part);
     TParticle* Parent(TParticle* part);
     TParticle* Partner();
-    Int_t Type(TParticle *part){return part->GetPdgCode();}
+    Int_t Type(TParticle *part) {return part->GetPdgCode();}
 private:
-    TClonesArray *fPartArray;
-    Int_t fNParticle;
-    Int_t fimuon1;
-    Int_t fimuon2;
-    Int_t fimin1;
-    Int_t fimin2;
-    Int_t fimax1;
-    Int_t fimax2;
-    Float_t fRate1;
-    Float_t fRate2;
-    TParticle *fmuon1;
-    TParticle *fmuon2;
-    Float_t fPtMin;
-    Float_t fEtaMin;
-    Float_t fEtaMax;
-  ClassDef(AliDimuCombinator,1) // Dimuon Combinator
+    TClonesArray *fPartArray;      // MC Event
+    Int_t fNParticle;              // Number of particles
+    Int_t fimuon1;                 // Index of first muon
+    Int_t fimuon2;                 // Index of second muon
+    Int_t fimin1;                  // Lowest index for first   muon  
+    Int_t fimin2;                  // Lowest index for second  muon 
+    Int_t fimax1;                  // Highest index for first  muon  
+    Int_t fimax2;                  // Highest index for second muon 
+    Float_t fRate1;                // weight factor  
+    Float_t fRate2;                // weight factor
+    TParticle *fmuon1;             // First muon
+    TParticle *fmuon2;             // Second muon
+    Float_t fPtMin;                // pT-cut 
+    Float_t fEtaMin;               // Minimum pseudorapidity cut
+    Float_t fEtaMax;               // Maximum pseudorapidity cut
+    
+    ClassDef(AliDimuCombinator,1)  // Tools for dimuon combinatoric studies
 };
 #endif
 
 
 
 
+