Coding Violations Removed

diff --git a/TMEVSIM/AliGenMevSim.cxx b/TMEVSIM/AliGenMevSim.cxx
index b973e61f49263549aabaa2f4746d586e65cc0cfd..496a028c19018117504ed7b11629e98cdfb888d4 100644 (file)
--- a/TMEVSIM/AliGenMevSim.cxx
+++ b/TMEVSIM/AliGenMevSim.cxx
@@ -98,11 +98,14 @@ void AliGenMevSim::Init()
 
   // mevsim specyfic parameters
   
-  mevsim->SetModelType(fConfig->fModelType);
-  mevsim->SetReacPlaneCntrl(fConfig->fReacPlaneCntrl);
-  mevsim->SetPsiRParams(fConfig->fPsiRMean, fConfig->fPsiRStDev);
-  mevsim->SetMultFacParams(fConfig->fMultFacMean, fConfig->fMultFacStDev);
-  
+  mevsim->SetModelType(fConfig->GetModelType());
+  Int_t ctrl; Float_t psiRMean = 0; Float_t psiRStDev = 0;
+  fConfig->GetRectPlane(ctrl,psiRMean,psiRStDev);
+  mevsim->SetReacPlaneCntrl(ctrl);
+  mevsim->SetPsiRParams(psiRMean, psiRStDev);
+  Float_t mean; Float_t stDev;
+  fConfig->GetMultFac(mean,stDev);
+  mevsim->SetMultFacParams(mean,stDev);
   // mevsim initialisation
 
   mevsim->Initialize();

diff --git a/TMEVSIM/AliMevSimConfig.cxx b/TMEVSIM/AliMevSimConfig.cxx
index 539fdadf4d1eb350785bd6223ee67b1dfcb76730..6a181b5a6b292eb1d3bfdd4c247c3ce7b7446155 100644 (file)
--- a/TMEVSIM/AliMevSimConfig.cxx
+++ b/TMEVSIM/AliMevSimConfig.cxx
@@ -12,8 +12,18 @@
  * about the suitability of this software for any purpose. It is          *
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
-
-/* $Id$ */
+//__________________________________________________________________
+////////////////////////////////////////////////////////////////////
+//
+// class AliMevSimConfig
+//
+// Class containing configuation inforamtion for MeVSim generator
+// --------------------------------------------
+// --------------------------------------------
+// --------------------------------------------
+// author: radomski@if.pw.edu.pl
+//
+////////////////////////////////////////////////////////////////////
 
 #include "AliMevSimConfig.h"
 
@@ -23,14 +33,14 @@ ClassImp(AliMevSimConfig)
 //////////////////////////////////////////////////////////////////////////////////////////////////
 
 AliMevSimConfig::AliMevSimConfig() {
-
+//def ctor
   Init();
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////////////
 
 AliMevSimConfig::AliMevSimConfig(Int_t modelType) {
-
+//ctor
   Init();
   SetModelType(modelType);
 }
@@ -38,12 +48,12 @@ AliMevSimConfig::AliMevSimConfig(Int_t modelType) {
 //////////////////////////////////////////////////////////////////////////////////////////////////
 
 AliMevSimConfig::~AliMevSimConfig() {
+//dtor
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////////////
 
 void AliMevSimConfig::Init() {
-
   // Default Values
 
   fModelType = 1;
@@ -63,8 +73,8 @@ void AliMevSimConfig::Init() {
 //////////////////////////////////////////////////////////////////////////////////////////////////
  
 void AliMevSimConfig::SetModelType(Int_t modelType) {
-
-  if (modelType < 0 || modelType > kMAX_MODEL)
+//Sets type of the model
+  if (modelType < 0 || modelType > fgkMAX_MODEL)
     Error("SetModelType","Wrog Model Type indentifier (%d)",modelType);
 
   fModelType = modelType;
@@ -73,8 +83,8 @@ void AliMevSimConfig::SetModelType(Int_t modelType) {
 //////////////////////////////////////////////////////////////////////////////////////////////////
 
 void AliMevSimConfig::SetRectPlane(Int_t ctrl, Float_t psiRMean, Float_t psiRStDev) {
-
-  if (ctrl < 0 || ctrl > kMAX_CTRL)
+//Sets reaction plane parameters
+  if (ctrl < 0 || ctrl > fgkMAX_CTRL)
     Error("SetReactPlane","Wrong Control Parameter (%d)", ctrl);
 
   fReacPlaneCntrl = ctrl;
@@ -85,7 +95,7 @@ void AliMevSimConfig::SetRectPlane(Int_t ctrl, Float_t psiRMean, Float_t psiRStD
 //////////////////////////////////////////////////////////////////////////////////////////////////
 
 void AliMevSimConfig::SetMultFac(Float_t mean, Float_t stDev) {
-  
+  //Sets multiplicity mean and variance
   fMultFacMean = mean;
   fMultFacStDev = stDev;
 }
@@ -94,7 +104,7 @@ void AliMevSimConfig::SetMultFac(Float_t mean, Float_t stDev) {
 
 void AliMevSimConfig::SetStDev(Float_t mult, Float_t temp, Float_t sigma,
   Float_t expVel, Float_t psiR, Float_t Vn, Float_t multFac) {
-
+//sets Dev parameters (whatever Dev is)
   fNStDevMult = mult;
   fNStDevTemp = temp;
   fNStDevSigma = sigma;
@@ -102,12 +112,26 @@ void AliMevSimConfig::SetStDev(Float_t mult, Float_t temp, Float_t sigma,
   fNStdDevPSIr = psiR;
   fNStDevVn = Vn;
   fNStDevMultFac =multFac;
+
+}
+void AliMevSimConfig::GetStDev(Float_t& mult, Float_t& temp, Float_t& sigma,
+                Float_t& expVel, Float_t& psiR, Float_t& Vn, Float_t& multFac) const
+{
+ //returns dev parameters
+   mult  = fNStDevMult;
+   temp  = fNStDevTemp;
+   sigma  = fNStDevSigma;
+   expVel  = fNStDevExpVel;
+   psiR  = fNStdDevPSIr;
+   Vn  = fNStDevVn;
+   multFac  = fNStDevMultFac;
+ 
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////////////
 
 void AliMevSimConfig::SetGrid(Int_t integr, Int_t scan) {
-
+//Sets grid 
   fNIntegPts = integr;
   fNScanPts = scan;
 }

diff --git a/TMEVSIM/AliMevSimConfig.h b/TMEVSIM/AliMevSimConfig.h
index de01b2d0c47b0280006b46c9e510c08b1bfd7bb3..88ef932988d05c846e893707f3daae0ceedd3fce 100644 (file)
--- a/TMEVSIM/AliMevSimConfig.h
+++ b/TMEVSIM/AliMevSimConfig.h
@@ -6,30 +6,49 @@
 
 /* $Id$ */
 
+//__________________________________________________________________
+////////////////////////////////////////////////////////////////////
+//
+// class AliMevSimConfig
+//
+// Class containing configuation inforamtion for MeVSim generator
+// --------------------------------------------
+// --------------------------------------------
+// --------------------------------------------
+// author: radomski@if.pw.edu.pl
+//
+////////////////////////////////////////////////////////////////////
+
 #include "TObject.h"
 
 class AliGenMevSim;
 
 class AliMevSimConfig : public TObject {
 
-  friend class AliGenMevSim;
-
  protected:
 
-  static const Int_t kMAX_MODEL = 4;
-  static const Int_t kMAX_CTRL = 4;
+  static const Int_t fgkMAX_MODEL = 4; //Maximum number of available models
+  static const Int_t fgkMAX_CTRL = 4;//Maximum number of available controls
 
-  Int_t fModelType;
+  Int_t fModelType;  //current type of model
 
-  Int_t fReacPlaneCntrl;
-  Float_t fPsiRMean, fPsiRStDev;
+  Int_t fReacPlaneCntrl; //reaction plane simulation model
+  Float_t fPsiRMean; //fPsiRMean mean psi
+  Float_t fPsiRStDev; //fPsiRStDev  psi variance
 
-  Float_t fMultFacMean, fMultFacStDev;
+  Float_t fMultFacMean;//fMultFacMean Mean multiplicity
+  Float_t fMultFacStDev;//fMultFacStDev multiplicity variance
 
-  Float_t fNStDevMult, fNStDevTemp, fNStDevSigma, fNStDevExpVel, fNStdDevPSIr, fNStDevVn, fNStDevMultFac;
+  Float_t fNStDevMult;//fNStDevMult
+  Float_t fNStDevTemp;//fNStDevTemp
+  Float_t fNStDevSigma;//fNStDevSigma
+  Float_t fNStDevExpVel;//fNStDevExpVel
+  Float_t fNStdDevPSIr;//fNStdDevPSIr
+  Float_t fNStDevVn;//fNStDevVn
+  Float_t fNStDevMultFac;//fNStDevMultFac
 
-  Int_t fNIntegPts;
-  Int_t fNScanPts;
+  Int_t fNIntegPts;//fNIntegPts
+  Int_t fNScanPts;//fNScanPts
 
   void Init();
 
@@ -41,15 +60,21 @@ class AliMevSimConfig : public TObject {
   ~AliMevSimConfig();
 
   void SetModelType(Int_t modelType);
+  Int_t  GetModelType() const {return fModelType;}
 
   void SetRectPlane(Int_t ctrl, Float_t psiRMean = 0, Float_t psiRStDev = 0);
+  void GetRectPlane(Int_t& ctrl, Float_t& psiRMean, Float_t& psiRStDev ) const
+   {ctrl  = fReacPlaneCntrl; psiRMean = fPsiRMean; psiRStDev = fPsiRStDev;}
+  
   void SetMultFac(Float_t mean, Float_t stDev);
+  void GetMultFac(Float_t& mean, Float_t& stDev) const {mean = fMultFacMean ;stDev = fMultFacStDev;}
 
   void SetStDev(Float_t mult, Float_t temp, Float_t sigma,
-               Float_t expVel, Float_t psiR, Float_t Vn, Float_t multFac);
-
+                Float_t expVel, Float_t psiR, Float_t Vn, Float_t multFac);
+  void GetStDev(Float_t& mult, Float_t& temp, Float_t& sigma,
+                Float_t& expVel, Float_t& psiR, Float_t& Vn, Float_t& multFac) const;
   void SetGrid(Int_t integr, Int_t scan);
-
+  void GetGrid(Int_t& integr, Int_t& scan) const {scan=fNScanPts;integr=fNIntegPts;}
 
   ClassDef(AliMevSimConfig,1)