Coding rule violations corrected

diff --git a/EVGEN/AliGenSlowNucleons.cxx b/EVGEN/AliGenSlowNucleons.cxx
index 569f5f2a5012d209fb0eb7a4a1cf43c751e6dac8..494dfbe8dcd1abf0b6caa8565d51f2c4e278f364 100644 (file)
--- a/EVGEN/AliGenSlowNucleons.cxx
+++ b/EVGEN/AliGenSlowNucleons.cxx
@@ -44,8 +44,6 @@ AliGenSlowNucleons::AliGenSlowNucleons()
      fMomentum(0.),
      fBeta(0.),
      fPmax (0.),
-     fATarget (0.),
-     fZTarget (0.),
      fCharge(0),
      fProtonDirection(1.),
      fTemperatureG(0.), 
@@ -74,8 +72,6 @@ AliGenSlowNucleons::AliGenSlowNucleons(Int_t npart)
      fMomentum(0.),
      fBeta(0.),
      fPmax (10.),
-     fATarget (208.),
-     fZTarget (82.),
      fCharge(1),
      fProtonDirection(1.),
      fTemperatureG(0.04), 
@@ -118,7 +114,7 @@ void AliGenSlowNucleons::Init()
   // Initialization
   //
     Float_t kMass  = TDatabasePDG::Instance()->GetParticle(kProton)->Mass();
-    fMomentum = fCMS/2. * fZTarget / fATarget;
+    fMomentum = fCMS/2. * Float_t(fZTarget) / Float_t(fATarget);
     fBeta     = fMomentum / TMath::Sqrt(kMass * kMass + fMomentum * fMomentum);
     if (fDebug) {
        fDebugHist1 = new TH2F("DebugHist1", "nu vs N_slow", 100, 0., 100., 20, 0., 20.);

diff --git a/EVGEN/AliGenSlowNucleons.h b/EVGEN/AliGenSlowNucleons.h
index b8cf3e7389f08e712fdc787281c4ac6e8852e814..73835cf2cba0591cfa99ba7010e1bb12cd9aed5a 100644 (file)
--- a/EVGEN/AliGenSlowNucleons.h
+++ b/EVGEN/AliGenSlowNucleons.h
@@ -27,7 +27,7 @@ public:
     virtual void Generate();
     virtual void SetPmax(Float_t pmax = 10.) {fPmax = pmax;}
     virtual void SetNominalCmsEnergy(Float_t energy = 14000.) {fCMS = energy;}
-    virtual void SetTarget(Float_t a=208, Float_t z=82) {fATarget = a; fZTarget = z;}
+    virtual void SetTarget(Int_t a = 208, Int_t z = 82) {fATarget = a; fZTarget = z;}
     virtual void SetTarget(TString s, Int_t a, Int_t z) {AliGenerator::SetTarget(s, a, z);}
     virtual void SetProtonDirection(Float_t dir = 1.);
     virtual void SetCharge(Int_t c = 1) {fCharge = c;}
@@ -57,8 +57,6 @@ public:
     Float_t  fMomentum;        // Target nucleus momentum
     Float_t  fBeta;            // Target nucleus beta
     Float_t  fPmax;            // Maximum slow nucleon momentum
-    Float_t  fATarget;         // Target nucleus mass number
-    Float_t  fZTarget;         // Target nucleus charge number
     Int_t    fCharge;          // Slow nucleon charge
     Float_t  fProtonDirection; // Direction of the proton
     Float_t  fTemperatureG;    // Source Temperature for gray nucleons

diff --git a/EVGEN/AliOmegaDalitz.cxx b/EVGEN/AliOmegaDalitz.cxx
index b962bf03507701af3f13d401a09a2f646b51275a..0df10a111e59bdd7c8a09e7be719878c604a8658 100644 (file)
--- a/EVGEN/AliOmegaDalitz.cxx
+++ b/EVGEN/AliOmegaDalitz.cxx
@@ -249,7 +249,7 @@ Int_t AliOmegaDalitz::ImportParticles(TClonesArray *particles)
 
 void AliOmegaDalitz::
 Rot(Double_t pin[3], Double_t pout[3], Double_t costheta, Double_t sintheta,
-    Double_t cosphi, Double_t sinphi)
+    Double_t cosphi, Double_t sinphi) const
 {
 // Perform rotation
   pout[0] = pin[0]*costheta*cosphi-pin[1]*sinphi+pin[2]*sintheta*cosphi;

diff --git a/EVGEN/AliOmegaDalitz.h b/EVGEN/AliOmegaDalitz.h
index 711c62995a5ed800b5e12cbf5a59ea7cdd7f89b3..0a9424e71c82a5ea4a87d0954e97922e616f635b 100644 (file)
--- a/EVGEN/AliOmegaDalitz.h
+++ b/EVGEN/AliOmegaDalitz.h
@@ -40,17 +40,19 @@ class AliOmegaDalitz : public AliDecayer
     virtual void    Decay(TClonesArray* array);
     virtual const   TLorentzVector* Products() const {return fProducts;}
     virtual void    Copy(TObject&) const;
+    
+ protected:
+    TH1F*           fEPMass;       // Histogram for electron pair mass
+    TH1F*           fMPMass;       // Histogram for muon pair mass
+    TLorentzVector  fProducts[3];  // Decay products
+
  private:
     virtual void    Rot(Double_t pin[3], Double_t pout[3],
                        Double_t costheta, Double_t sintheta,
-                       Double_t cosphi, Double_t sinphi);
+                       Double_t cosphi, Double_t sinphi) const;
     AliOmegaDalitz(const AliOmegaDalitz &dalitz);
     AliOmegaDalitz & operator=(const AliOmegaDalitz & rhs);
     
- protected:
-    TH1F*           fEPMass;       // Histogram for electron pair mass
-    TH1F*           fMPMass;       // Histogram for muon pair mass
-    TLorentzVector  fProducts[3];  // Decay products
     ClassDef(AliOmegaDalitz, 1) // AliDecayer implementation for omega Dalitz
 };