Overlaps corrected, new shape of sectors

[u/mrichter/AliRoot.git] / EVGEN / AliGeVSimParticle.cxx

diff --git a/EVGEN/AliGeVSimParticle.cxx b/EVGEN/AliGeVSimParticle.cxx
index f1bff06dc36debaa13b65551d8d36d11debfbd32..ed35fe9be8155e46b7cd104d09f3ade8daf52c85 100644 (file)
--- a/EVGEN/AliGeVSimParticle.cxx
+++ b/EVGEN/AliGeVSimParticle.cxx
@@ -46,12 +46,42 @@
 #include "TMath.h"
 #include "AliGeVSimParticle.h"
 
-ClassImp(AliGeVSimParticle);
+ClassImp(AliGeVSimParticle)
+
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
+AliGeVSimParticle::AliGeVSimParticle():
+    fPDG(0),
+    fModel(0),
+    fN(0),
+    fMultTotal(kTRUE),
+    fIsSetMult(kFALSE),
+    fT(0.),
+    fSigmaY(0.),
+    fExpansion(0.),
+    fIsDirectedSimple(kTRUE),
+    fIsEllipticSimple(kTRUE),
+    fIsEllipticOld(kFALSE)
+{
+    // Default constructor
+  for (Int_t i = 0; i < 4; i++) fV1[i] = 0.;
+  for (Int_t i = 0; i < 3; i++) fV2[i] = 0.;
+}
 
 AliGeVSimParticle::AliGeVSimParticle(Int_t pdg, Int_t model, Float_t multiplicity,
-                                    Float_t T, Float_t dY, Float_t exp) {
+                                    Float_t T, Float_t dY, Float_t exp):
+    fPDG(pdg),
+    fModel(model),
+    fN(multiplicity),
+    fMultTotal(kTRUE),
+    fIsSetMult(kFALSE),
+    fT(T),
+    fSigmaY(dY),
+    fExpansion(exp),
+    fIsDirectedSimple(kTRUE),
+    fIsEllipticSimple(kTRUE),
+    fIsEllipticOld(kFALSE)
+{
   //
   //  pdg          - Particle type code in PDG standard (see: http://pdg.lbl.gov)
   //  model        - momentum distribution model (1 - 7)
@@ -59,51 +89,33 @@ AliGeVSimParticle::AliGeVSimParticle(Int_t pdg, Int_t model, Float_t multiplicit
   //  T            - Inverse slope parameter ("temperature")
   //  dY           - Raridity Width (only for model 1)
   //  exp          - expansion velocity (only for model 4) 
-  
-  fPDG = pdg;
-  fT = T;
-  fSigmaY = dY;
-  fExpansion = exp;
-
-  fN = multiplicity;
-  fMultTotal = kTRUE;
-  fIsSetMult = kFALSE;
-
-  SetModel(model);
-
   fV1[0] = fV1[1] = fV1[2] = fV1[3] = 0.;
   fV2[0] = fV2[1] = fV2[2] = 0.;
-
-  fIsEllipticSimple = fIsDirectedSimple = kTRUE;
-  fIsEllipticOld = kFALSE;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-AliGeVSimParticle::AliGeVSimParticle(Int_t pdg, Int_t model, Float_t multiplicity) {
+AliGeVSimParticle::AliGeVSimParticle(Int_t pdg, Int_t model, Float_t multiplicity):
+    fPDG(pdg),
+    fModel(model),
+    fN(multiplicity),
+    fMultTotal(kTRUE),
+    fIsSetMult(kFALSE),
+    fT(0.),
+    fSigmaY(0.),
+    fExpansion(0.),
+    fIsDirectedSimple(kTRUE),
+    fIsEllipticSimple(kTRUE),
+    fIsEllipticOld(kFALSE)
+ {
   //
   // pdg - Particle type code in PDG standard (see: http://pdg.lbl.gov)
   //  
   // Note that multiplicity can be interpreted by GeVSim 
   // either as Total multiplicity in the acceptance or dN/dY
   // 
- 
-  fPDG = pdg;
-  fN = multiplicity; 
-  fMultTotal = kTRUE;
-  fIsSetMult = kFALSE;
-  
-  SetModel(model);
-
-  fT = 0.;
-  fSigmaY = 0.;
-  fExpansion = 0.;
-  
   fV1[0] = fV1[1] = fV1[2] = fV1[3] = 0.;
   fV2[0] = fV2[1] = fV2[2] = 0.; 
-
-  fIsEllipticSimple = fIsDirectedSimple = kTRUE;
-  fIsEllipticOld = kFALSE;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////