X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=LHC%2FAliLhcIRegion.cxx;h=f3c5a11bea4a67880d90e731fd34db481dd4161b;hb=31a3bbb0b4e08dee50d9e75a69bac1a8acfca13c;hp=4d521dd37b34820c14984460fa4c8ca722d91fc0;hpb=11141716b2bcbc1704fb336142e793cafd3df786;p=u%2Fmrichter%2FAliRoot.git

diff --git a/LHC/AliLhcIRegion.cxx b/LHC/AliLhcIRegion.cxx
index 4d521dd37b3..f3c5a11bea4 100644
--- a/LHC/AliLhcIRegion.cxx
+++ b/LHC/AliLhcIRegion.cxx
@@ -13,10 +13,17 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-*/
-
+/* $Id$ */
+
+//
+// Realisation of AliLhcMonitor simulating an LHC interaction region.
+// The interaction region is described by the two LHC beams,
+// by the beta* and the crossing angle. 
+// As a monitor it records the luminosity, average luminosity and beta*
+// time evolution.
+// Author: Andreas Morsch
+// andreas.morsch@cern.ch
+//
 #include "AliLhcIRegion.h"
 #include "AliLhcBeam.h"
 #include "AliLHC.h"
@@ -31,16 +38,39 @@ $Log$
 ClassImp(AliLhcIRegion)
 
 AliLhcIRegion::AliLhcIRegion(AliLHC* lhc, const char* name, const char* title)
-    :TNamed(name,title)
+    :TNamed(name,title),
+     fAccelerator(lhc),
+     fBeam1(0),
+     fBeam2(0),
+     fLuminosity(0.),
+     fLuminosity0(0.),
+     fAverageLumi(0.),
+     fBetaStar(0.),
+     fBetaStar0(0.),
+     fCrossingAngle(0.),
+     fFrequency(0.),
+     fLumiArray(0),
+     fAverageLumiArray(0),
+     fBetaStarArray(0)
 {
 // Constructor
-    fAccelerator=lhc;   
-    fLumiArray        = 0;  
-    fAverageLumiArray = 0;
-    fBetaStarArray = 0;
 }
 
-AliLhcIRegion::AliLhcIRegion(const AliLhcIRegion& region)
+AliLhcIRegion::AliLhcIRegion(const AliLhcIRegion& region): 
+    TNamed(region), AliLhcMonitor(region),
+    fAccelerator(0),
+    fBeam1(0),
+    fBeam2(0),
+    fLuminosity(0.),
+    fLuminosity0(0.),
+    fAverageLumi(0.),
+    fBetaStar(0.),
+    fBetaStar0(0.),
+    fCrossingAngle(0.),
+    fFrequency(0.),
+    fLumiArray(0),
+    fAverageLumiArray(0),
+    fBetaStarArray(0)
 {
 // copy constructor
 }
@@ -55,7 +85,7 @@ AliLhcIRegion::~AliLhcIRegion()
 }
 
 
-AliLhcIRegion& AliLhcIRegion::operator=(const  AliLhcIRegion & rhs)
+AliLhcIRegion& AliLhcIRegion::operator=(const  AliLhcIRegion & /*rhs*/)
 {
 // Assignment operator
     return *this;
@@ -209,7 +239,7 @@ void AliLhcIRegion::DrawPlots()
   mg->Draw("AC");
 
   TCanvas *c2 = new TCanvas(name2,title, 200, 10, 700, 500);
-  c1->SetGrid();
+  c2->SetGrid();
   grLumiB->Draw("AC");
 
 }