mag. field and geometry initialised from GRP

[u/mrichter/AliRoot.git] / LHC / AliLHC.cxx

diff --git a/LHC/AliLHC.cxx b/LHC/AliLHC.cxx
index 9430f6956c690b8dc5999bd90bba59d0a9caac08..cd46f6a5a54af36774ffbf07ef580770a18ca96f 100644 (file)
--- a/LHC/AliLHC.cxx
+++ b/LHC/AliLHC.cxx
@@ -13,9 +13,18 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-*/
+/* $Id$ */
+
+//
+// Class for a simple description of the LHC.
+// The LHC is described by two beams,
+// the interaction regions and the
+// beam loss processes.
+// Run paramters can be set in order to simulate the time evolution
+// of emittance, number of particles per bunch and luminosity.
+// Author: Andreas Morsch
+// andreas.morsch@cern.ch
+
 #include "AliLHC.h"
 #include "AliLhcIRegion.h"
 #include "AliLhcProcess.h"
@@ -23,23 +32,50 @@ $Log$
 
 ClassImp(AliLHC)
 
-AliLHC::AliLHC()
+
+AliLHC::AliLHC():
+    fNRegions(0),
+    fNProcesses(0),
+    fIRegions(new TList()),
+    fProcesses(new TList()),
+    fBeams(new TObjArray(2)),
+    fRadius(0.),
+    fAverageBeta(0.),
+    fAverageDisp(0.),
+    fNt(0),
+    fNmax(0),
+    fTime(0.),
+    fTimeA(0),
+    fTimeStep(0.),
+    fTimeMax(0.),
+    fFillingTime(0.),
+    fSetUpTime(0.)
 {
 // Constructor
-    fIRegions   = new TList;
-    fProcesses  = new TList;
-    fNRegions   = 0;
-    fNProcesses = 0;
-    fBeams = new TObjArray(2);
-    (*fBeams)[0] = 0;
-    (*fBeams)[1] = 0;    
-    fTime = 0;
-    fTimeMax = 0;
+    fBeams->AddAt(0,0);
+    fBeams->AddAt(0,1);    
 }
 
-AliLHC::AliLHC(const AliLHC& lhc)
+AliLHC::AliLHC(const AliLHC& lhc):
+    TObject(lhc),
+    fNRegions(0),
+    fNProcesses(0),
+    fIRegions(0),
+    fProcesses(0),
+    fBeams(0),
+    fRadius(0.),
+    fAverageBeta(0.),
+    fAverageDisp(0.),
+    fNt(0),
+    fNmax(0),
+    fTime(0.),
+    fTimeA(0),
+    fTimeStep(0.),
+    fTimeMax(0.),
+    fFillingTime(0.),
+    fSetUpTime(0.)
 {
-// copy constructor
+// Copy constructor
 }
 
 AliLHC::~AliLHC()
@@ -153,7 +189,7 @@ void AliLHC::Evaluate()
   //
   // Loop over generators and initialize
   while((region = (AliLhcIRegion*)nextregion())) {
-    region->Draw();
+    region->DrawPlots();
   }
   
   TIter next(fProcesses);
@@ -161,13 +197,13 @@ void AliLHC::Evaluate()
   //
   // Evolve for each process
   while((process = (AliLhcProcess*)next())) {
-    process->Draw();
+    process->DrawPlots();
   }
   
-  Beam(0)->Draw();
+  Beam(0)->DrawPlots();
 }
    
-AliLHC& AliLHC::operator=(const  AliLHC & rhs)
+AliLHC& AliLHC::operator=(const  AliLHC & /*rhs*/)
 {
 // Assignment operator
     return *this;