o rename Toy -> AliToy

o add TPCupgrade library

diff --git a/TPC/Upgrade/ToyMCEvent.cxx b/TPC/Upgrade/AliToyMCEvent.cxx
similarity index 54%
rename from TPC/Upgrade/ToyMCEvent.cxx
rename to TPC/Upgrade/AliToyMCEvent.cxx
index df808c194d9aaa69af7a2f7ac7466f3563ddc0db..f1cefb1c87e6f18eea55ea7514591d30aff862c2 100644 (file)
--- a/TPC/Upgrade/ToyMCEvent.cxx
+++ b/TPC/Upgrade/AliToyMCEvent.cxx
@@ -1,22 +1,22 @@
-#include "ToyMCEvent.h"
+#include "AliToyMCEvent.h"
 
-ClassImp(ToyMCEvent);
-Int_t ToyMCEvent::evCounter = 0;
+ClassImp(AliToyMCEvent);
+Int_t AliToyMCEvent::evCounter = 0;
 
-ToyMCEvent::ToyMCEvent()
+AliToyMCEvent::AliToyMCEvent()
   :TObject()
   ,fT0(-1.)
   ,fX(-1000.)
   ,fY(-1000.)
   ,fZ(-1000.)
-  ,fTracks("ToyMCTrack")
+  ,fTracks("AliToyMCTrack")
 {
   fEventNumber = evCounter;
   evCounter++;
 }
 
 //____________________________________________________
-ToyMCEvent::ToyMCEvent(const ToyMCEvent &event)
+AliToyMCEvent::AliToyMCEvent(const AliToyMCEvent &event)
   : TObject(event)
   ,fEventNumber(event.fEventNumber)
   ,fT0(event.fT0)
@@ -29,17 +29,17 @@ ToyMCEvent::ToyMCEvent(const ToyMCEvent &event)
 }
 
 //_____________________________________________________
-ToyMCEvent& ToyMCEvent::operator = (const ToyMCEvent &event)
+AliToyMCEvent& AliToyMCEvent::operator = (const AliToyMCEvent &event)
 {
   //assignment operator
   if (&event == this) return *this;
-  new (this) ToyMCEvent(event);
+  new (this) AliToyMCEvent(event);
 
   return *this;
 }
 //_____________________________________________________
-ToyMCTrack* ToyMCEvent::AddTrack(const ToyMCTrack &track)
+AliToyMCTrack* AliToyMCEvent::AddTrack(const AliToyMCTrack &track)
 {
-  return new(fTracks[fTracks.GetEntriesFast()]) ToyMCTrack(track);
+  return new(fTracks[fTracks.GetEntriesFast()]) AliToyMCTrack(track);
 }
 

diff --git a/TPC/Upgrade/ToyMCEvent.h b/TPC/Upgrade/AliToyMCEvent.h
similarity index 64%
rename from TPC/Upgrade/ToyMCEvent.h
rename to TPC/Upgrade/AliToyMCEvent.h
index 53e0a9de370f20ed28e826b8cd2c0ce1fb4d09d3..134f9d582be6fc7fe3e523eb1b2f62c7ccd98926 100644 (file)
--- a/TPC/Upgrade/ToyMCEvent.h
+++ b/TPC/Upgrade/AliToyMCEvent.h
@@ -1,22 +1,22 @@
-#ifndef ToyMCEvent_H
-#define ToyMCEvent_H
+#ifndef AliToyMCEvent_H
+#define AliToyMCEvent_H
 
 
 #include <TClonesArray.h>
-#include "ToyMCTrack.h"
+#include "AliToyMCTrack.h"
 
-class ToyMCEvent : public TObject {
+class AliToyMCEvent : public TObject {
  public:
-  ToyMCEvent();
-  ToyMCEvent(const ToyMCEvent &event);
-  virtual ~ToyMCEvent() {}
-  ToyMCEvent& operator = (const ToyMCEvent &event);
+  AliToyMCEvent();
+  AliToyMCEvent(const AliToyMCEvent &event);
+  virtual ~AliToyMCEvent() {}
+  AliToyMCEvent& operator = (const AliToyMCEvent &event);
   
 
-  ToyMCTrack* AddTrack(const ToyMCTrack &track);
+  AliToyMCTrack* AddTrack(const AliToyMCTrack &track);
 
   Int_t GetNumberOfTracks() const { return fTracks.GetEntriesFast(); }
-  const ToyMCTrack* GetTrack(Int_t track) const { return static_cast<const ToyMCTrack*>(fTracks.At(track)); }
+  const AliToyMCTrack* GetTrack(Int_t track) const { return static_cast<const AliToyMCTrack*>(fTracks.At(track)); }
     
   void SetT0 (Float_t time)              { fT0   = time;          }
   void SetX(Float_t var)                 { fX = var;              }
@@ -41,7 +41,7 @@ class ToyMCEvent : public TObject {
 
   TClonesArray fTracks;
 
-  ClassDef(ToyMCEvent, 1);
+  ClassDef(AliToyMCEvent, 1);
 
 };
 

diff --git a/TPC/Upgrade/ToyMCEventGenerator.cxx b/TPC/Upgrade/AliToyMCEventGenerator.cxx
similarity index 94%
rename from TPC/Upgrade/ToyMCEventGenerator.cxx
rename to TPC/Upgrade/AliToyMCEventGenerator.cxx
index 309db5db62beeadb2f4ec9e65e0fa5442f842d6d..4d85ffee59ba0b1a19923d7e178cd07cbad58586 100644 (file)
--- a/TPC/Upgrade/ToyMCEventGenerator.cxx
+++ b/TPC/Upgrade/AliToyMCEventGenerator.cxx
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "ToyMCEventGenerator.h"
+#include "AliToyMCEventGenerator.h"
 #include <AliTPCROC.h>
 #include <AliTrackPointArray.h>
 #include <TDatabasePDG.h>
@@ -12,10 +12,10 @@
 #include <AliTPCcalibDB.h>
 #include <TGeoGlobalMagField.h>
 #include <AliTPCclusterMI.h>
-ClassImp(ToyMCEventGenerator);
+ClassImp(AliToyMCEventGenerator);
 
 
-ToyMCEventGenerator::ToyMCEventGenerator()
+AliToyMCEventGenerator::AliToyMCEventGenerator()
   :TObject()
   ,fTPCParam(0x0)
 {
@@ -36,20 +36,20 @@ ToyMCEventGenerator::ToyMCEventGenerator()
   fTPCParam->ReadGeoMatrices();
 }
 //________________________________________________________________
-ToyMCEventGenerator::ToyMCEventGenerator(const ToyMCEventGenerator &gen)
+AliToyMCEventGenerator::AliToyMCEventGenerator(const AliToyMCEventGenerator &gen)
   :TObject(gen)
   ,fSpaceCharge(gen.fSpaceCharge)
 {
   //
 }
 //________________________________________________________________
-ToyMCEventGenerator::~ToyMCEventGenerator() 
+AliToyMCEventGenerator::~AliToyMCEventGenerator() 
 {
   delete fSpaceCharge;
   delete fTPCParam;
 }
 //________________________________________________________________
-Bool_t ToyMCEventGenerator::DistortTrack(ToyMCTrack &trackIn, Double_t t0) {
+Bool_t AliToyMCEventGenerator::DistortTrack(AliToyMCTrack &trackIn, Double_t t0) {
 
   if(!fTPCParam) {
     fTPCParam = AliTPCcalibDB::Instance()->GetParameters();
@@ -69,7 +69,7 @@ Bool_t ToyMCEventGenerator::DistortTrack(ToyMCTrack &trackIn, Double_t t0) {
   const Double_t iFCRadius=  83.5; //radius constants found in AliTPCCorrection.cxx 
   const Double_t oFCRadius= 254.5;
   
-  ToyMCTrack track(trackIn);
+  AliToyMCTrack track(trackIn);
   const Int_t nMaxPoints = kNRows+50;
   AliTrackPointArray pointArray0(nMaxPoints);
   AliTrackPointArray pointArray1(nMaxPoints);

diff --git a/TPC/Upgrade/AliToyMCEventGenerator.h b/TPC/Upgrade/AliToyMCEventGenerator.h
new file mode 100644 (file)
index 0000000..14b26e7
--- /dev/null
+++ b/TPC/Upgrade/AliToyMCEventGenerator.h
@@ -0,0 +1,30 @@
+#ifndef AliToyMCEventGenerator_H
+#define AliToyMCEventGenerator_H
+
+
+#include "AliToyMCEvent.h"
+#include "AliToyMCTrack.h"
+#include <AliTPCSpaceCharge3D.h>
+#include <AliTPCParam.h>
+class AliToyMCEventGenerator : public TObject {
+ public:
+  AliToyMCEventGenerator();
+  AliToyMCEventGenerator(const AliToyMCEventGenerator &gen);
+  virtual ~AliToyMCEventGenerator();
+
+  virtual AliToyMCEvent* Generate(Double_t time) = 0;
+
+  Bool_t DistortTrack(AliToyMCTrack &trackIn, Double_t t0);
+
+ protected:
+  AliTPCParam *fTPCParam;
+  
+ private:
+  AliTPCSpaceCharge3D *fSpaceCharge;
+  
+  ClassDef(AliToyMCEventGenerator, 1)
+     
+};
+
+#endif
+

diff --git a/TPC/Upgrade/ToyMCEventGeneratorSimple.cxx b/TPC/Upgrade/AliToyMCEventGeneratorSimple.cxx
similarity index 68%
rename from TPC/Upgrade/ToyMCEventGeneratorSimple.cxx
rename to TPC/Upgrade/AliToyMCEventGeneratorSimple.cxx
index de073ae018761ef0c10bd44116a5d8cb97591185..ba0b5a28e1ca7dcb1bc7ec42f2f27649c6444c71 100644 (file)
--- a/TPC/Upgrade/ToyMCEventGeneratorSimple.cxx
+++ b/TPC/Upgrade/AliToyMCEventGeneratorSimple.cxx
@@ -1,15 +1,15 @@
 #include <iostream>
-#include "ToyMCEventGeneratorSimple.h"
+#include "AliToyMCEventGeneratorSimple.h"
 #include <TDatabasePDG.h>
 #include <TRandom.h>
 #include <TF1.h>
-#include "ToyMCEvent.h"
+#include "AliToyMCEvent.h"
 
-ClassImp(ToyMCEventGeneratorSimple);
+ClassImp(AliToyMCEventGeneratorSimple);
 
 
-ToyMCEventGeneratorSimple::ToyMCEventGeneratorSimple()
-  :ToyMCEventGenerator()
+AliToyMCEventGeneratorSimple::AliToyMCEventGeneratorSimple()
+  :AliToyMCEventGenerator()
   ,fVertexMean(0.)
   ,fVertexSigma(7.)
 {
@@ -17,34 +17,34 @@ ToyMCEventGeneratorSimple::ToyMCEventGeneratorSimple()
   
 }
 //________________________________________________________________
-ToyMCEventGeneratorSimple::ToyMCEventGeneratorSimple(const ToyMCEventGeneratorSimple &gen)
-  :ToyMCEventGenerator(gen)
+AliToyMCEventGeneratorSimple::AliToyMCEventGeneratorSimple(const AliToyMCEventGeneratorSimple &gen)
+  :AliToyMCEventGenerator(gen)
   ,fVertexMean(gen.fVertexMean)
   ,fVertexSigma(gen.fVertexSigma)
 {
 }
 //________________________________________________________________
-ToyMCEventGeneratorSimple::~ToyMCEventGeneratorSimple()
+AliToyMCEventGeneratorSimple::~AliToyMCEventGeneratorSimple()
 {
 }
  //________________________________________________________________
-ToyMCEventGeneratorSimple& ToyMCEventGeneratorSimple::operator = (const ToyMCEventGeneratorSimple &gen)
+AliToyMCEventGeneratorSimple& AliToyMCEventGeneratorSimple::operator = (const AliToyMCEventGeneratorSimple &gen)
 {
   //assignment operator
   if (&gen == this) return *this;
-  new (this) ToyMCEventGeneratorSimple(gen);
+  new (this) AliToyMCEventGeneratorSimple(gen);
 
   return *this;
 }
 //________________________________________________________________
-void ToyMCEventGeneratorSimple::SetParameters(Double_t vertexMean, Double_t vertexSigma) {
+void AliToyMCEventGeneratorSimple::SetParameters(Double_t vertexMean, Double_t vertexSigma) {
   fVertexMean = vertexMean;
   fVertexSigma = vertexSigma;
 }
 //________________________________________________________________
-ToyMCEvent* ToyMCEventGeneratorSimple::Generate(Double_t time) {
+AliToyMCEvent* AliToyMCEventGeneratorSimple::Generate(Double_t time) {
 
-  ToyMCEvent *retEvent = new ToyMCEvent();
+  AliToyMCEvent *retEvent = new AliToyMCEvent();
   retEvent->SetT0(time);
   retEvent->SetX(0);
   retEvent->SetX(0);
@@ -75,7 +75,7 @@ ToyMCEvent* ToyMCEventGeneratorSimple::Generate(Double_t time) {
     pxyz[2]=pt*TMath::Tan(theta);
     Double_t vertex[3]={0,0,retEvent->GetZ()};
     Double_t cv[21]={0};
-    ToyMCTrack *tempTrack = new ToyMCTrack(vertex,pxyz,cv,sign);
+    AliToyMCTrack *tempTrack = new AliToyMCTrack(vertex,pxyz,cv,sign);
     
     Bool_t trackDist = DistortTrack(*tempTrack, time);
     if(trackDist) retEvent->AddTrack(*tempTrack);

diff --git a/TPC/Upgrade/AliToyMCEventGeneratorSimple.h b/TPC/Upgrade/AliToyMCEventGeneratorSimple.h
new file mode 100644 (file)
index 0000000..3f9a79f
--- /dev/null
+++ b/TPC/Upgrade/AliToyMCEventGeneratorSimple.h
@@ -0,0 +1,32 @@
+#ifndef AliToyMCEventGeneratorSimple_H
+#define AliToyMCEventGeneratorSimple_H
+
+
+#include "AliToyMCEvent.h"
+#include "AliToyMCTrack.h"
+#include "AliToyMCEventGenerator.h"
+class AliToyMCEventGeneratorSimple : public AliToyMCEventGenerator {
+ public:
+  AliToyMCEventGeneratorSimple();
+  AliToyMCEventGeneratorSimple(const AliToyMCEventGeneratorSimple &gen);
+  virtual ~AliToyMCEventGeneratorSimple();
+  AliToyMCEventGeneratorSimple & operator = (const AliToyMCEventGeneratorSimple &gen);
+
+  AliToyMCEvent* Generate(Double_t time);
+  void SetParameters(Double_t vertexMean, Double_t vertexSigma);
+ private:
+  
+  Double_t fVertexMean;
+  Double_t fVertexSigma;
+
+  ClassDef(AliToyMCEventGeneratorSimple, 1)
+
+};
+
+
+
+
+
+
+#endif
+

diff --git a/TPC/Upgrade/ToyMCTrack.cxx b/TPC/Upgrade/AliToyMCTrack.cxx
similarity index 71%
rename from TPC/Upgrade/ToyMCTrack.cxx
rename to TPC/Upgrade/AliToyMCTrack.cxx
index 3be217dbf172bc65843090a8f5f3a6bcc7710e01..bf9d951d20abe20441fa9094e22250d4245c79e9 100644 (file)
--- a/TPC/Upgrade/ToyMCTrack.cxx
+++ b/TPC/Upgrade/AliToyMCTrack.cxx
@@ -1,8 +1,8 @@
-#include "ToyMCTrack.h"
+#include "AliToyMCTrack.h"
 
-ClassImp(ToyMCTrack);
+ClassImp(AliToyMCTrack);
 
-ToyMCTrack::ToyMCTrack()
+AliToyMCTrack::AliToyMCTrack()
   :AliExternalTrackParam()
   ,fSpacePoints("AliTPCclusterMI")
   ,fDistortedSpacePoints("AliTPCclusterMI")
@@ -10,7 +10,7 @@ ToyMCTrack::ToyMCTrack()
   //default constructor
 }
 //____________________________________________________
-ToyMCTrack::ToyMCTrack(const ToyMCTrack &track)
+AliToyMCTrack::AliToyMCTrack(const AliToyMCTrack &track)
   : AliExternalTrackParam(track)
   ,fSpacePoints(track.fSpacePoints)
   ,fDistortedSpacePoints(track.fDistortedSpacePoints)
@@ -18,16 +18,16 @@ ToyMCTrack::ToyMCTrack(const ToyMCTrack &track)
   //copy constructor
 }
 //_____________________________________________________
-ToyMCTrack& ToyMCTrack::operator = (const ToyMCTrack &track)
+AliToyMCTrack& AliToyMCTrack::operator = (const AliToyMCTrack &track)
 {
   //assignment operator
   if (&track == this) return *this;
-  new (this) ToyMCTrack(track);
+  new (this) AliToyMCTrack(track);
 
   return *this;
 }
 //________________________________________________________________
-ToyMCTrack::ToyMCTrack(Double_t x, Double_t alpha, 
+AliToyMCTrack::AliToyMCTrack(Double_t x, Double_t alpha, 
                       const Double_t param[5], 
                       const Double_t covar[15])
   :AliExternalTrackParam(x,alpha,param,covar)
@@ -37,7 +37,7 @@ ToyMCTrack::ToyMCTrack(Double_t x, Double_t alpha,
   //create external track parameters from given arguments
 }
 //________________________________________________________________
-ToyMCTrack::ToyMCTrack(Double_t xyz[3],Double_t pxpypz[3],
+AliToyMCTrack::AliToyMCTrack(Double_t xyz[3],Double_t pxpypz[3],
                       Double_t cv[21],Short_t sign)
   :AliExternalTrackParam(xyz,pxpypz,cv,sign)
   ,fSpacePoints("AliTPCclusterMI")
@@ -45,12 +45,12 @@ ToyMCTrack::ToyMCTrack(Double_t xyz[3],Double_t pxpypz[3],
 {
 }
 //________________________________________________________________
-AliTPCclusterMI* ToyMCTrack::AddSpacePoint(const AliTPCclusterMI &spoint)
+AliTPCclusterMI* AliToyMCTrack::AddSpacePoint(const AliTPCclusterMI &spoint)
 {
   return new(fSpacePoints[fSpacePoints.GetEntriesFast()]) AliTPCclusterMI(spoint);
 }
 //________________________________________________________________
-AliTPCclusterMI* ToyMCTrack::AddDistortedSpacePoint(const AliTPCclusterMI &spoint)
+AliTPCclusterMI* AliToyMCTrack::AddDistortedSpacePoint(const AliTPCclusterMI &spoint)
 {
   return new(fDistortedSpacePoints[fDistortedSpacePoints.GetEntriesFast()]) AliTPCclusterMI(spoint);
 }

diff --git a/TPC/Upgrade/ToyMCTrack.h b/TPC/Upgrade/AliToyMCTrack.h
similarity index 74%
rename from TPC/Upgrade/ToyMCTrack.h
rename to TPC/Upgrade/AliToyMCTrack.h
index 80b5efbc89a815c29c169fdcd85c140f6a76c130..f86063085198f83b5fba12162b906b5986645464 100644 (file)
--- a/TPC/Upgrade/ToyMCTrack.h
+++ b/TPC/Upgrade/AliToyMCTrack.h
@@ -5,18 +5,18 @@
 #include <TClonesArray.h>
 #include <AliTPCclusterMI.h>
 
-class ToyMCTrack : public AliExternalTrackParam {
+class AliToyMCTrack : public AliExternalTrackParam {
  
  public:
-  ToyMCTrack();
-  ToyMCTrack(Double_t x, Double_t alpha, 
+  AliToyMCTrack();
+  AliToyMCTrack(Double_t x, Double_t alpha, 
             const Double_t param[5], 
             const Double_t covar[15]);
-  ToyMCTrack(Double_t xyz[3],Double_t pxpypz[3],
+  AliToyMCTrack(Double_t xyz[3],Double_t pxpypz[3],
             Double_t cv[21],Short_t sign);
-  ToyMCTrack(const ToyMCTrack &track);
-  ToyMCTrack& operator=(const ToyMCTrack &track);
-  virtual ~ToyMCTrack() {}
+  AliToyMCTrack(const AliToyMCTrack &track);
+  AliToyMCTrack& operator=(const AliToyMCTrack &track);
+  virtual ~AliToyMCTrack() {}
   
   Int_t GetNumberOfSpacePoints()     const { return fSpacePoints.GetEntriesFast(); }
   Int_t GetNumberOfDistSpacePoints() const { return fDistortedSpacePoints.GetEntriesFast(); }
@@ -33,7 +33,7 @@ class ToyMCTrack : public AliExternalTrackParam {
   TClonesArray fDistortedSpacePoints;
  
  
-  ClassDef(ToyMCTrack,1)
+  ClassDef(AliToyMCTrack,1)
 };
 
 #endif

diff --git a/TPC/Upgrade/ToyMCEventGenerator.h b/TPC/Upgrade/ToyMCEventGenerator.h
deleted file mode 100644 (file)
index af5112f..0000000
--- a/TPC/Upgrade/ToyMCEventGenerator.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef ToyMCEventGenerator_H
-#define ToyMCEventGenerator_H
-
-
-#include "ToyMCEvent.h"
-#include "ToyMCTrack.h"
-#include <AliTPCSpaceCharge3D.h>
-#include <AliTPCParam.h>
-class ToyMCEventGenerator : public TObject {
- public:
-  ToyMCEventGenerator();
-  ToyMCEventGenerator(const ToyMCEventGenerator &gen);
-  virtual ~ToyMCEventGenerator();
-
-  virtual ToyMCEvent* Generate(Double_t time) = 0;
-
-  Bool_t DistortTrack(ToyMCTrack &trackIn, Double_t t0);
-
- protected:
-  AliTPCParam *fTPCParam;
-  
- private:
-  AliTPCSpaceCharge3D *fSpaceCharge;
-  
-  ClassDef(ToyMCEventGenerator, 1)
-     
-};
-
-#endif
-

diff --git a/TPC/Upgrade/ToyMCEventGeneratorSimple.h b/TPC/Upgrade/ToyMCEventGeneratorSimple.h
deleted file mode 100644 (file)
index b924950..0000000
--- a/TPC/Upgrade/ToyMCEventGeneratorSimple.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef ToyMCEventGeneratorSimple_H
-#define ToyMCEventGeneratorSimple_H
-
-
-#include "ToyMCEvent.h"
-#include "ToyMCTrack.h"
-#include "ToyMCEventGenerator.h"
-class ToyMCEventGeneratorSimple : public ToyMCEventGenerator {
- public:
-  ToyMCEventGeneratorSimple();
-  ToyMCEventGeneratorSimple(const ToyMCEventGeneratorSimple &gen);
-  virtual ~ToyMCEventGeneratorSimple();
-  ToyMCEventGeneratorSimple & operator = (const ToyMCEventGeneratorSimple &gen);
-
-  ToyMCEvent* Generate(Double_t time);
-  void SetParameters(Double_t vertexMean, Double_t vertexSigma);
- private:
-  
-  Double_t fVertexMean;
-  Double_t fVertexSigma;
-
-  ClassDef(ToyMCEventGeneratorSimple, 1)
-
-};
-
-
-
-
-
-
-#endif
-

diff --git a/TPC/Upgrade/macros/loadlibs.C b/TPC/Upgrade/macros/loadlibs.C
index 60dacad8409ced9bdd5f0ff687b6cdc3221fe397..6aaf44d74cc353613ccb908e8459cd54acda6898 100644 (file)
--- a/TPC/Upgrade/macros/loadlibs.C
+++ b/TPC/Upgrade/macros/loadlibs.C
@@ -7,7 +7,7 @@ void loadlibs(const char *dir=".")
   gSystem->AddIncludePath("-I$ROOTSYS/include");
    Bool_t hasAR=!TString(gSystem->Getenv("ALICE_ROOT")).IsNull();
   // if (hasAR) gSystem->AddIncludePath("-I$ALICE_ROOT/ -I$ALICE_ROOT/include -I$ALICE_ROOT/STEER  -I$ALICE_ROOT/ANALYSIS -I$ALICE_ROOT/TPC -I$ALICE_ROOT/RAW");
-  if (hasAR) gSystem->AddIncludePath("-I$ALICE_ROOT/ -I$ALICE_ROOT/include -I$ALICE_ROOT/STEER  -I$ALICE_ROOT/ANALYSIS -I$ALICE_ROOT/TPC -I$ALICE_ROOT/RAW -I$ALICE_ROOT/STEER/STEERBase/ -I$ALICE_ROOT/STEER/ESD/");
+  if (hasAR) gSystem->AddIncludePath("-I$ALICE_ROOT/ -I$ALICE_ROOT/include -I$ALICE_ROOT/STEER  -I$ALICE_ROOT/ANALYSIS -I$ALICE_ROOT/TPC -I$ALICE_ROOT/TPC/Base -I$ALICE_ROOT/TPC/Rec -I$ALICE_ROOT/RAW -I$ALICE_ROOT/STEER/STEERBase/ -I$ALICE_ROOT/STEER/ESD/");
 
   gSystem->Load("libCore");
   gSystem->Load("libPhysics");
@@ -32,6 +32,7 @@ void loadlibs(const char *dir=".")
 
   gSystem->Load("libTPCbase");
   gSystem->Load("libTPCrec");
+  gSystem->Load("libTPCupgrade");
   
   // gSystem->Load("libANALYSISalice");
  gSystem->Load("libTPCcalib");
@@ -60,10 +61,10 @@ void loadlibs(const char *dir=".")
   // gROOT->LoadMacro(Form("%s/CRSIMRunGenerator.cxx+g",dir));
   // CRSIMDrawer *drawer = new CRSIMDrawer("test.root");
   //CRSIMDisplay *disp = new CRSIMDisplay();
-  gROOT->LoadMacro(Form("%s/ToyMCTrack.cxx+g",dir));
-  gROOT->LoadMacro(Form("%s/ToyMCEvent.cxx+g",dir));
-  gROOT->LoadMacro(Form("%s/ToyMCEventGenerator.cxx+g",dir));
-  gROOT->LoadMacro(Form("%s/ToyMCEventGeneratorSimple.cxx+g",dir));
+  //gROOT->LoadMacro(Form("%s/AliToyMCTrack.cxx+g",dir));
+  //gROOT->LoadMacro(Form("%s/AliToyMCEvent.cxx+g",dir));
+ // gROOT->LoadMacro(Form("%s/AliToyMCEventGenerator.cxx+g",dir));
+ // gROOT->LoadMacro(Form("%s/AliToyMCEventGeneratorSimple.cxx+g",dir));
   //  gROOT->LoadMacro(Form("%s/ToyMCDrawer.cxx+g",dir));
   // disp->SetDrawer(drawer);