From 98490ea95568eabdaccce53289622d9dccd257eb Mon Sep 17 00:00:00 2001 From: alibrary Date: Thu, 21 Nov 2002 16:13:03 +0000 Subject: [PATCH] Removing AliMCProcess and AliMC --- STEER/AliConfig.cxx | 6 ++++- STEER/AliConfig.h | 7 +++-- STEER/AliGenerator.cxx | 7 +++-- STEER/AliGenerator.h | 7 ++--- STEER/AliLego.cxx | 4 ++- STEER/AliMCQA.cxx | 4 ++- STEER/AliModule.cxx | 4 ++- STEER/AliRun.cxx | 59 ++++++++++++++++++++++-------------------- STEER/AliRun.h | 10 +++---- STEER/AliStack.cxx | 7 +++-- STEER/STEERLinkDef.h | 2 -- STEER/libSTEER.pkg | 2 +- 12 files changed, 70 insertions(+), 49 deletions(-) diff --git a/STEER/AliConfig.cxx b/STEER/AliConfig.cxx index 6247d40ed58..2e46d52fd79 100644 --- a/STEER/AliConfig.cxx +++ b/STEER/AliConfig.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.9 2002/10/29 14:59:45 alibrary +Some more code cleanup + Revision 1.8 2002/10/29 14:26:49 hristov Code clean-up (F.Carminati) @@ -50,6 +53,7 @@ New files for folders and Stack #include #include #include +#include #include "AliConfig.h" #include "AliDetector.h" @@ -309,7 +313,7 @@ void AliConfig::Add (AliGenerator * obj) } //____________________________________________________________________________ -void AliConfig::Add (AliMC * obj) +void AliConfig::Add (TVirtualMC * obj) { AddInFolder(fMCFolder, obj); } diff --git a/STEER/AliConfig.h b/STEER/AliConfig.h index af5c79cbb71..5beddc15a34 100644 --- a/STEER/AliConfig.h +++ b/STEER/AliConfig.h @@ -6,6 +6,9 @@ /* $Id$ */ /* * $Log$ + * Revision 1.8 2002/10/29 14:59:45 alibrary + * Some more code cleanup + * * Revision 1.7 2002/10/29 14:26:49 hristov * Code clean-up (F.Carminati) * @@ -32,11 +35,11 @@ * */ -#include "AliMC.h" class TDatabasePDG; class TFolder; class TString; +class TVirtualMC; class AliConfig; class AliDetector; @@ -52,7 +55,7 @@ public: virtual ~ AliConfig (); void Add (AliGenerator *generator); - void Add (AliMC *mc); + void Add (TVirtualMC *mc); void Add (TDatabasePDG *pdg); void Add (AliModule *module); void Add (AliDetector *detector); diff --git a/STEER/AliGenerator.cxx b/STEER/AliGenerator.cxx index fab25406475..95b93f209e8 100644 --- a/STEER/AliGenerator.cxx +++ b/STEER/AliGenerator.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.20 2002/10/29 14:26:49 hristov +Code clean-up (F.Carminati) + Revision 1.19 2002/03/12 11:06:03 morsch Add particle status code to argument list of SetTrack(..). @@ -428,7 +431,7 @@ void AliGenerator::VertexInternal() //_______________________________________________________________________ void AliGenerator::SetTrack(Int_t done, Int_t parent, Int_t pdg, Float_t *pmom, Float_t *vpos, Float_t *polar, - Float_t tof, AliMCProcess mech, Int_t &ntr, + Float_t tof, TMCProcess mech, Int_t &ntr, Float_t weight, Int_t is) { @@ -445,7 +448,7 @@ void AliGenerator::SetTrack(Int_t done, Int_t parent, Int_t pdg, Double_t px, Double_t py, Double_t pz, Double_t e, Double_t vx, Double_t vy, Double_t vz, Double_t tof, Double_t polx, Double_t poly, Double_t polz, - AliMCProcess mech, Int_t &ntr, Float_t weight, Int_t is) + TMCProcess mech, Int_t &ntr, Float_t weight, Int_t is) { if (fStack) diff --git a/STEER/AliGenerator.h b/STEER/AliGenerator.h index 5de8143f8f9..2707a45bc8d 100644 --- a/STEER/AliGenerator.h +++ b/STEER/AliGenerator.h @@ -14,8 +14,9 @@ #include "TLorentzVector.h" #include "TArrayF.h" +#include "TMCProcess.h" + #include "AliRndm.h" -#include "AliMCProcess.h" class TGenerator; class AliStack; @@ -78,13 +79,13 @@ class AliGenerator : public TNamed, public AliRndm protected: virtual void SetTrack(Int_t done, Int_t parent, Int_t pdg, Float_t *pmom, Float_t *vpos, Float_t *polar, - Float_t tof, AliMCProcess mech, Int_t &ntr, + Float_t tof, TMCProcess mech, Int_t &ntr, Float_t weight = 1, Int_t is = 0); virtual void SetTrack(Int_t done, Int_t parent, Int_t pdg, Double_t px, Double_t py, Double_t pz, Double_t e, Double_t vx, Double_t vy, Double_t vz, Double_t tof, Double_t polx, Double_t poly, Double_t polz, - AliMCProcess mech, Int_t &ntr, Float_t weight = 1, Int_t is = 0); + TMCProcess mech, Int_t &ntr, Float_t weight = 1, Int_t is = 0); virtual void KeepTrack(Int_t itrack); virtual void SetHighWaterMark(Int_t nt); diff --git a/STEER/AliLego.cxx b/STEER/AliLego.cxx index 021371e4d9b..34ad63402ee 100644 --- a/STEER/AliLego.cxx +++ b/STEER/AliLego.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.30 2002/10/29 14:26:49 hristov +Code clean-up (F.Carminati) + Revision 1.29 2002/10/14 14:57:32 hristov Merging the VirtualMC branch to the main development branch (HEAD) @@ -135,7 +138,6 @@ Introduction of the Copyright and cvs Log #include "AliDebugVolume.h" #include "AliLego.h" #include "AliLegoGenerator.h" -#include "AliMC.h" #include "AliRun.h" ClassImp(AliLego) diff --git a/STEER/AliMCQA.cxx b/STEER/AliMCQA.cxx index 0f74c0a3842..8ee9acba5aa 100644 --- a/STEER/AliMCQA.cxx +++ b/STEER/AliMCQA.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.8 2002/10/29 14:26:49 hristov +Code clean-up (F.Carminati) + Revision 1.7 2002/10/14 14:57:32 hristov Merging the VirtualMC branch to the main development branch (HEAD) @@ -66,7 +69,6 @@ Introducing new Rndm and QA classes #include "AliMCQA.h" #include "AliRun.h" #include "AliModule.h" -#include "AliMC.h" ClassImp(AliMCQA) diff --git a/STEER/AliModule.cxx b/STEER/AliModule.cxx index ad5c009ad5c..2a7e3247f24 100644 --- a/STEER/AliModule.cxx +++ b/STEER/AliModule.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.19 2002/10/29 14:26:49 hristov +Code clean-up (F.Carminati) + Revision 1.18 2001/12/19 14:46:26 morsch Add possibility to disable StepManager() for each module separately. @@ -77,7 +80,6 @@ Introduction of the Copyright and cvs Log #include "AliModule.h" #include "AliRun.h" #include "AliMagF.h" -#include "AliMC.h" #include "AliConfig.h" ClassImp(AliModule) diff --git a/STEER/AliRun.cxx b/STEER/AliRun.cxx index 08caf547f44..56160612a30 100644 --- a/STEER/AliRun.cxx +++ b/STEER/AliRun.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.92 2002/11/15 17:12:04 alibrary +Cleaning includes + Revision 1.91 2002/10/29 14:26:49 hristov Code clean-up (F.Carminati) @@ -265,42 +268,42 @@ Introduction of the Copyright and cvs Log // // /////////////////////////////////////////////////////////////////////////////// -#include #include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "Riostream.h" +#include "TBRIK.h" +#include "TBrowser.h" +#include "TCint.h" +#include "TFile.h" +#include "TFolder.h" +#include "TGeometry.h" +#include "TKey.h" +#include "TNode.h" +#include "TObjectTable.h" #include "TParticle.h" -#include "AliRun.h" +#include "TRandom3.h" +#include "TROOT.h" +#include "TSystem.h" +#include "TTree.h" + +#include "AliConfig.h" +#include "AliDetector.h" #include "AliDisplay.h" -#include "AliMC.h" +#include "AliGenEventHeader.h" +#include "AliGenerator.h" +#include "AliHeader.h" +#include "AliHit.h" #include "AliLego.h" +#include "AliLegoGenerator.h" +#include "AliMCQA.h" #include "AliMagFC.h" #include "AliMagFCM.h" #include "AliMagFDM.h" -#include "AliHit.h" -#include "TRandom3.h" -#include "AliMCQA.h" -#include "AliGenerator.h" -#include "AliLegoGenerator.h" -#include "AliConfig.h" -#include "AliStack.h" -#include "AliGenEventHeader.h" -#include "AliHeader.h" -#include "AliDetector.h" #include "AliPDG.h" +#include "AliRun.h" +#include "AliStack.h" AliRun *gAlice; @@ -1732,7 +1735,7 @@ void AliRun::SetCurrentTrack(Int_t track) //_______________________________________________________________________ void AliRun::SetTrack(Int_t done, Int_t parent, Int_t pdg, Float_t *pmom, Float_t *vpos, Float_t *polar, Float_t tof, - AliMCProcess mech, Int_t &ntr, Float_t weight, Int_t is) + TMCProcess mech, Int_t &ntr, Float_t weight, Int_t is) { // Delegate to stack // @@ -1746,7 +1749,7 @@ void AliRun::SetTrack(Int_t done, Int_t parent, Int_t pdg, Double_t px, Double_t py, Double_t pz, Double_t e, Double_t vx, Double_t vy, Double_t vz, Double_t tof, Double_t polx, Double_t poly, Double_t polz, - AliMCProcess mech, Int_t &ntr, Float_t weight, Int_t is) + TMCProcess mech, Int_t &ntr, Float_t weight, Int_t is) { // Delegate to stack // diff --git a/STEER/AliRun.h b/STEER/AliRun.h index 8dfe4c11417..5f5a96a1f9b 100644 --- a/STEER/AliRun.h +++ b/STEER/AliRun.h @@ -8,7 +8,9 @@ #include #include #include +#include #include +#include #include class TBranch; class TBrowser; @@ -20,8 +22,6 @@ class TParticle; class TRandom; class TTree; -#include "AliMC.h" -#include "AliMCProcess.h" class AliDetector; class AliDisplay; class AliGenEventHeader; @@ -128,13 +128,13 @@ public: virtual void SetField(AliMagF* magField); virtual void SetTrack(Int_t done, Int_t parent, Int_t pdg, Float_t *pmom, Float_t *vpos, Float_t *polar, - Float_t tof, AliMCProcess mech, Int_t &ntr, + Float_t tof, TMCProcess mech, Int_t &ntr, Float_t weight = 1, Int_t is = 0); virtual void SetTrack(Int_t done, Int_t parent, Int_t pdg, Double_t px, Double_t py, Double_t pz, Double_t e, Double_t vx, Double_t vy, Double_t vz, Double_t tof, Double_t polx, Double_t poly, Double_t polz, - AliMCProcess mech, Int_t &ntr, Float_t weight=1, + TMCProcess mech, Int_t &ntr, Float_t weight=1, Int_t is = 0); virtual void SetHighWaterMark(const Int_t nt); @@ -210,7 +210,7 @@ protected: AliDisplay *fDisplay; //! Pointer to event display TStopwatch fTimer; // Timer object AliMagF *fField; // Magnetic Field Map - AliMC *fMC; //! Pointer to MonteCarlo object + TVirtualMC *fMC; //! Pointer to MonteCarlo object TArrayI *fImedia; //! Array of correspondence between media and detectors Int_t fNdets; // Number of detectors Float_t fTrRmax; // Maximum radius for tracking diff --git a/STEER/AliStack.cxx b/STEER/AliStack.cxx index d2c1e821416..5fe40789ad2 100644 --- a/STEER/AliStack.cxx +++ b/STEER/AliStack.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.26 2002/10/29 14:26:49 hristov +Code clean-up (F.Carminati) + Revision 1.25 2002/10/22 15:21:39 hristov New methods for more effective access of particles from TreeK (J.Chudoba) @@ -198,7 +201,7 @@ AliStack::~AliStack() //_____________________________________________________________________________ void AliStack::SetTrack(Int_t done, Int_t parent, Int_t pdg, Float_t *pmom, Float_t *vpos, Float_t *polar, Float_t tof, - AliMCProcess mech, Int_t &ntr, Float_t weight, Int_t is) + TMCProcess mech, Int_t &ntr, Float_t weight, Int_t is) { // // Load a track on the stack @@ -242,7 +245,7 @@ void AliStack::SetTrack(Int_t done, Int_t parent, Int_t pdg, Double_t px, Double_t py, Double_t pz, Double_t e, Double_t vx, Double_t vy, Double_t vz, Double_t tof, Double_t polx, Double_t poly, Double_t polz, - AliMCProcess mech, Int_t &ntr, Double_t weight, Int_t is) + TMCProcess mech, Int_t &ntr, Double_t weight, Int_t is) { // // Load a track on the stack diff --git a/STEER/STEERLinkDef.h b/STEER/STEERLinkDef.h index 345a0cbb6c9..c6b2a000448 100644 --- a/STEER/STEERLinkDef.h +++ b/STEER/STEERLinkDef.h @@ -14,8 +14,6 @@ #pragma link C++ enum VertexSmear_t; #pragma link C++ enum VertexSource_t; -#pragma link C++ typedef AliMC; -#pragma link C++ typedef AliMCProcess; #pragma link C++ class AliPDG+; #pragma link C++ class AliGenerator+; diff --git a/STEER/libSTEER.pkg b/STEER/libSTEER.pkg index 6e534fa5846..263a943615b 100644 --- a/STEER/libSTEER.pkg +++ b/STEER/libSTEER.pkg @@ -20,4 +20,4 @@ HDRS:= $(SRCS:.cxx=.h) DHDR= STEERLinkDef.h -EXPORT:=$(SRCS:.cxx=.h) AliMC.h AliConst.h AliCallf77.h AliMCProcess.h +EXPORT:=$(SRCS:.cxx=.h) AliConst.h AliCallf77.h -- 2.31.1