From 116cbefdd457541a56d5dfd1a53b09c3ccc50964 Mon Sep 17 00:00:00 2001 From: alibrary Date: Tue, 14 Jan 2003 10:50:20 +0000 Subject: [PATCH] Cleanup of STEER coding conventions --- CRT/AliCRTv1.cxx | 19 +++++---- CRT/AliGenCRT.cxx | 11 ++++-- EMCAL/AliEMCALGeometry.cxx | 2 + EMCAL/AliEMCALJetFinder.cxx | 35 +++++++++-------- EVGEN/AliDimuCombinator.cxx | 13 ++++--- EVGEN/AliGenBox.cxx | 8 +++- EVGEN/AliGenCocktail.cxx | 8 +++- EVGEN/AliGenFLUKAsource.cxx | 6 ++- EVGEN/AliGenFixed.cxx | 6 ++- EVGEN/AliGenGeVSim.cxx | 27 +++++++------ EVGEN/AliGenGeVSim.h | 2 + EVGEN/AliGenGrayParticles.cxx | 11 ++++-- EVGEN/AliGenHBTprocessor.h | 3 +- EVGEN/AliGenHIJINGpara.cxx | 23 ++++++----- EVGEN/AliGenHIJINGparaBa.cxx | 15 +++++--- EVGEN/AliGenHalo.cxx | 14 +++++-- EVGEN/AliGenHaloProtvino.cxx | 12 ++++-- EVGEN/AliGenHijing.cxx | 19 +++++---- EVGEN/AliGenHijingEventHeader.h | 3 +- EVGEN/AliGenMC.cxx | 8 +++- EVGEN/AliGenPMDlib.cxx | 8 +++- EVGEN/AliGenPythia.cxx | 19 +++++---- EVGEN/AliGenThetaSlice.cxx | 8 +++- EVGEN/AliMevSimParticle.h | 5 ++- HBTAN/AliHBTLLWeights.cxx | 9 +++-- ITS/AliCascadeVertex.cxx | 3 +- ITS/AliCascadeVertexer.cxx | 7 ++-- ITS/AliV0vertex.cxx | 1 + ITS/AliV0vertexer.cxx | 7 ++-- MUON/AliMUONDigitizer.cxx | 23 ++++++----- MUON/AliMUONMerger.cxx | 21 +++++----- MUON/AliMUONv0.cxx | 10 +++-- MUON/AliMUONv1.cxx | 10 +++-- RICH/AliRICH.cxx | 57 ++++++++++++++------------- STEER/AliCollisionGeometry.h | 2 +- STEER/AliConfig.cxx | 48 +++++++++++------------ STEER/AliConfig.h | 24 ++++++------ STEER/AliDebugVolume.cxx | 7 ++++ STEER/AliDetector.cxx | 2 +- STEER/AliDigit.cxx | 6 +++ STEER/AliDigit.h | 2 +- STEER/AliDigitNew.cxx | 6 +++ STEER/AliDigitizer.h | 4 +- STEER/AliDisplay.cxx | 3 +- STEER/AliDisplay.h | 2 +- STEER/AliESD.cxx | 1 + STEER/AliESD.h | 4 +- STEER/AliFieldMap.cxx | 5 ++- STEER/AliFieldMap.h | 34 ++++++++--------- STEER/AliGausCorr.cxx | 2 +- STEER/AliGausCorr.h | 11 +----- STEER/AliGenEventHeader.h | 7 +--- STEER/AliGenerator.cxx | 16 +++++++- STEER/AliGenerator.h | 16 ++++---- STEER/AliGeometry.h | 7 ++-- STEER/AliHeader.cxx | 6 +++ STEER/AliHit.cxx | 6 +++ STEER/AliKalmanTrack.cxx | 12 ++++-- STEER/AliKalmanTrack.h | 10 ++--- STEER/AliLegoGenerator.cxx | 6 +++ STEER/AliLegoGeneratorEta.cxx | 6 +++ STEER/AliLegoGeneratorPhiZ.cxx | 6 +++ STEER/AliLegoGeneratorXYZ.cxx | 6 +++ STEER/AliMCQA.cxx | 36 +++++++++-------- STEER/AliMagF.cxx | 3 ++ STEER/AliMagFC.cxx | 6 +++ STEER/AliMagFDM.cxx | 18 ++++++--- STEER/AliMagFDM.h | 2 +- STEER/AliMagFMaps.cxx | 1 + STEER/AliMergeCombi.cxx | 7 +++- STEER/AliMergeCombi.h | 6 +-- STEER/AliModule.cxx | 7 ++-- STEER/AliModule.h | 6 +-- STEER/AliPDG.h | 1 - STEER/AliPoints.cxx | 2 +- STEER/AliPoints.h | 2 +- STEER/AliRndm.cxx | 1 + STEER/AliRndm.h | 2 +- STEER/AliRun.cxx | 68 ++++++++++++++++++--------------- STEER/AliRun.h | 5 +-- STEER/AliRunDigitizer.cxx | 7 ++-- STEER/AliRunDigitizer.h | 4 +- STEER/AliStack.h | 3 -- STEER/AliStream.cxx | 18 ++++++--- STEER/AliStream.h | 10 ++--- STEER/AliTrackMap.cxx | 5 --- STEER/AliTrackMapper.cxx | 4 +- STEER/AliTrackMapper.h | 7 ++-- STEER/AliTrackReference.cxx | 8 +++- STEER/AliTrackReference.h | 2 +- STEER/AliTracker.cxx | 5 ++- TPC/AliSimDigits.cxx | 9 +++-- TPC/AliTPCv2.cxx | 13 ++++--- TPC/AliTPCv3.cxx | 15 +++++--- ZDC/AliGenZDC.cxx | 13 ++++--- 95 files changed, 604 insertions(+), 392 deletions(-) diff --git a/CRT/AliCRTv1.cxx b/CRT/AliCRTv1.cxx index cda4a1a3c5c..fe1d896e0b1 100644 --- a/CRT/AliCRTv1.cxx +++ b/CRT/AliCRTv1.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.4 2002/11/21 19:34:52 alibrary +Removing AliMC and AliMCProcess + Revision 1.3 2002/10/23 06:47:56 alibrary Introducing Riostream.h @@ -60,20 +63,20 @@ First version, stand alone detector // // /////////////////////////////////////////////////////////////////////////////// -#include -#include +#include #include -#include +#include #include +#include +#include -#include "AliRun.h" -#include "AliMagF.h" -#include "AliConst.h" -#include "AliPDG.h" -#include "AliCRTv1.h" #include "AliCRTConstants.h" +#include "AliCRTv1.h" +#include "AliConst.h" +#include "AliMagF.h" +#include "AliRun.h" ClassImp(AliCRTv1) diff --git a/CRT/AliGenCRT.cxx b/CRT/AliGenCRT.cxx index eb26ac5b937..735b350a4d5 100644 --- a/CRT/AliGenCRT.cxx +++ b/CRT/AliGenCRT.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.4 2002/11/21 19:34:52 alibrary +Removing AliMC and AliMCProcess + Revision 1.3 2002/10/23 06:47:56 alibrary Introducing Riostream.h @@ -51,13 +54,13 @@ First version, generation of cosmic muons on the surface ///////////////////////////////////////////////////////////////////////////// #include -#include "TMCProcess.h" +#include +#include -#include "AliRun.h" -#include "AliConst.h" -#include "AliPDG.h" +#include "AliConst.h" #include "AliGenCRT.h" +#include "AliRun.h" ClassImp(AliGenCRT) diff --git a/EMCAL/AliEMCALGeometry.cxx b/EMCAL/AliEMCALGeometry.cxx index 4cfc070a04f..c639c3773d3 100644 --- a/EMCAL/AliEMCALGeometry.cxx +++ b/EMCAL/AliEMCALGeometry.cxx @@ -35,7 +35,9 @@ #include // --- AliRoot header files --- +#include #include +#include // -- ALICE Headers. #include "AliConst.h" diff --git a/EMCAL/AliEMCALJetFinder.cxx b/EMCAL/AliEMCALJetFinder.cxx index 37f823d2da9..c91e60eb1c7 100644 --- a/EMCAL/AliEMCALJetFinder.cxx +++ b/EMCAL/AliEMCALJetFinder.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.33 2003/01/10 10:48:19 morsch +SetSamplingFraction() removed from constructor. + Revision 1.32 2003/01/10 10:26:40 morsch Sampling fraction initialized from geometry class. @@ -125,39 +128,39 @@ Revision 1.3 2002/01/18 05:07:56 morsch #include // From root ... -#include -#include -#include +#include +#include #include +#include +#include #include #include #include -#include -#include #include +#include #include -#include -#include -#include #include #include +#include #include +#include +#include +#include // From AliRoot ... -#include "AliEMCALJetFinder.h" -#include "AliEMCALFast.h" -#include "AliEMCALGeometry.h" -#include "AliEMCALHit.h" +#include "AliEMCAL.h" #include "AliEMCALDigit.h" #include "AliEMCALDigitizer.h" +#include "AliEMCALFast.h" +#include "AliEMCALGeometry.h" #include "AliEMCALHadronCorrection.h" +#include "AliEMCALHit.h" +#include "AliEMCALJetFinder.h" #include "AliEMCALJetMicroDst.h" -#include "AliRun.h" +#include "AliHeader.h" #include "AliMagF.h" #include "AliMagFCM.h" -#include "AliEMCAL.h" -#include "AliHeader.h" -#include "AliPDG.h" +#include "AliRun.h" // Interface to FORTRAN #include "Ecommon.h" diff --git a/EVGEN/AliDimuCombinator.cxx b/EVGEN/AliDimuCombinator.cxx index 12f70e2283f..ce061153c26 100644 --- a/EVGEN/AliDimuCombinator.cxx +++ b/EVGEN/AliDimuCombinator.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.11 2001/11/27 12:18:05 morsch +Fully commented version by Bruno Espagnon. + Revision 1.10 2001/03/27 11:14:54 morsch Weight calculation for correlated particles updated: - Decay probability is counted once if muons are decay products @@ -51,15 +54,15 @@ Introduction of the Copyright and cvs Log andreas.morsch@cern.ch */ - -#include "AliDimuCombinator.h" -#include "AliPDG.h" -#include "AliRun.h" -#include #include #include +#include +#include #include +#include "AliDimuCombinator.h" +#include "AliRun.h" + // ClassImp(AliDimuCombinator) AliDimuCombinator::AliDimuCombinator() diff --git a/EVGEN/AliGenBox.cxx b/EVGEN/AliGenBox.cxx index 416c5c0dd70..72a72598464 100644 --- a/EVGEN/AliGenBox.cxx +++ b/EVGEN/AliGenBox.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.7 2002/02/08 16:50:50 morsch +Add name and title in constructor. + Revision 1.6 2001/07/27 17:09:35 morsch Use local SetTrack, KeepTrack and SetHighWaterMark methods to delegate either to local stack or to stack owned by AliRun. @@ -62,10 +65,11 @@ All coding rule violations except RS3 corrected (AM) // // /////////////////////////////////////////////////////////////////// +#include "TPDGCode.h" + +#include "AliConst.h" #include "AliGenBox.h" #include "AliRun.h" -#include "AliConst.h" -#include "AliPDG.h" ClassImp(AliGenBox) diff --git a/EVGEN/AliGenCocktail.cxx b/EVGEN/AliGenCocktail.cxx index a711aa065fb..b9edd43873c 100644 --- a/EVGEN/AliGenCocktail.cxx +++ b/EVGEN/AliGenCocktail.cxx @@ -15,6 +15,10 @@ /* $Log$ +Revision 1.15 2003/01/07 14:13:22 morsch +Communication between generators provising and requesting collision +geometries. + Revision 1.14 2002/02/08 16:50:50 morsch Add name and title in constructor. @@ -59,10 +63,12 @@ Introduction of the Copyright and cvs Log // Author: andreas.morsch@cern.ch // +#include +#include + #include "AliGenCocktail.h" #include "AliGenCocktailEntry.h" #include "AliRun.h" -#include ClassImp(AliGenCocktail) diff --git a/EVGEN/AliGenFLUKAsource.cxx b/EVGEN/AliGenFLUKAsource.cxx index 06edd255109..8cf95bd5b01 100644 --- a/EVGEN/AliGenFLUKAsource.cxx +++ b/EVGEN/AliGenFLUKAsource.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.16 2002/11/21 16:22:35 alibrary +Removing AliMCProcess and AliMC + Revision 1.15 2001/07/27 17:09:36 morsch Use local SetTrack, KeepTrack and SetHighWaterMark methods to delegate either to local stack or to stack owned by AliRun. @@ -58,9 +61,10 @@ Introduction of the Copyright and cvs Log // Files can be chained. // Author: andreas.morsch@cern.ch +#include "TPDGCode.h" + #include "AliGenFLUKAsource.h" #include "AliRun.h" -#include "AliPDG.h" #include diff --git a/EVGEN/AliGenFixed.cxx b/EVGEN/AliGenFixed.cxx index 923678aa415..7bef151ec55 100644 --- a/EVGEN/AliGenFixed.cxx +++ b/EVGEN/AliGenFixed.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.7 2001/10/30 11:27:35 morsch +fExplicit member data correctly initialized. + Revision 1.6 2001/07/27 17:09:36 morsch Use local SetTrack, KeepTrack and SetHighWaterMark methods to delegate either to local stack or to stack owned by AliRun. @@ -58,9 +61,10 @@ All coding rule violations except RS3 corrected (AM) // // /////////////////////////////////////////////////////////////////// +#include "TPDGCode.h" + #include "AliGenFixed.h" #include "AliRun.h" -#include "AliPDG.h" ClassImp(AliGenFixed) diff --git a/EVGEN/AliGenGeVSim.cxx b/EVGEN/AliGenGeVSim.cxx index d39e278efc1..37e23bd60f4 100644 --- a/EVGEN/AliGenGeVSim.cxx +++ b/EVGEN/AliGenGeVSim.cxx @@ -49,24 +49,23 @@ //////////////////////////////////////////////////////////////////////////////// -#include "Riostream.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "TROOT.h" -#include "TCanvas.h" -#include "TParticle.h" -#include "TObjArray.h" -#include "TF1.h" -#include "TF2.h" -#include "TH1.h" -#include "TH2.h" -#include "AliRun.h" -#include "AliPDG.h" -#include "AliGenerator.h" - -#include "AliGenGeVSim.h" #include "AliGeVSimParticle.h" +#include "AliGenGeVSim.h" #include "AliGenGeVSimEventHeader.h" +#include "AliGenerator.h" +#include "AliRun.h" ClassImp(AliGenGeVSim); diff --git a/EVGEN/AliGenGeVSim.h b/EVGEN/AliGenGeVSim.h index 08848bcb23e..6a02c587b91 100644 --- a/EVGEN/AliGenGeVSim.h +++ b/EVGEN/AliGenGeVSim.h @@ -59,6 +59,8 @@ class TH2D; class TObjArray; class AliGeVSimParticle; +#include "AliGenerator.h" + class AliGenGeVSim : public AliGenerator { diff --git a/EVGEN/AliGenGrayParticles.cxx b/EVGEN/AliGenGrayParticles.cxx index 20f5f7cd5b0..4bf739245c6 100644 --- a/EVGEN/AliGenGrayParticles.cxx +++ b/EVGEN/AliGenGrayParticles.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.5 2003/01/07 14:11:43 morsch +Comminication with gray particle model and collision geometry added. + Revision 1.4 2003/01/06 10:09:57 morsch Use AliGrayParticleModel. @@ -39,11 +42,13 @@ Gray particle generator, first commit. Source is modelled by a relativistic Maxwell distributions. Original code by Ferenc Sikler */ + +#include +#include + +#include "AliCollisionGeometry.h" #include "AliGenGrayParticles.h" #include "AliGrayParticleModel.h" -#include "AliCollisionGeometry.h" -#include "AliPDG.h" -#include ClassImp(AliGenGrayParticles) diff --git a/EVGEN/AliGenHBTprocessor.h b/EVGEN/AliGenHBTprocessor.h index a1bbc669a66..fd142657a76 100644 --- a/EVGEN/AliGenHBTprocessor.h +++ b/EVGEN/AliGenHBTprocessor.h @@ -11,8 +11,9 @@ #ifndef ALIGENHBTPROCESSOR_H #define ALIGENHBTPROCESSOR_H +#include + #include "AliGenerator.h" -#include "AliPDG.h" class THBTprocessor; class TClonesArray; diff --git a/EVGEN/AliGenHIJINGpara.cxx b/EVGEN/AliGenHIJINGpara.cxx index 94550daff78..ba8100c98d0 100644 --- a/EVGEN/AliGenHIJINGpara.cxx +++ b/EVGEN/AliGenHIJINGpara.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.18 2002/12/11 11:58:11 morsch +Bug in formula for pi0 energy for decay corrected. + Revision 1.17 2002/12/10 17:44:57 morsch Correct mother child relation for pi0. @@ -99,19 +102,19 @@ All coding rule violations except RS3 corrected (AM) // // /////////////////////////////////////////////////////////////////// -#include "AliGenHIJINGpara.h" -#include "AliGenEventHeader.h" -#include "AliRun.h" -#include "AliConst.h" -#include "AliDecayer.h" -#include "AliDecayerPythia.h" -#include "AliPDG.h" - -#include #include -#include #include +#include +#include #include +#include + +#include "AliConst.h" +#include "AliDecayer.h" +#include "AliDecayerPythia.h" +#include "AliGenEventHeader.h" +#include "AliGenHIJINGpara.h" +#include "AliRun.h" ClassImp(AliGenHIJINGpara) diff --git a/EVGEN/AliGenHIJINGparaBa.cxx b/EVGEN/AliGenHIJINGparaBa.cxx index 18e115c0e7f..20256cf49ae 100644 --- a/EVGEN/AliGenHIJINGparaBa.cxx +++ b/EVGEN/AliGenHIJINGparaBa.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.1 2002/01/08 09:47:28 morsch +HIJING parameterisation including baryons, first commit. + */ /////////////////////////////////////////////////////////////////// // Parameterisation of pi, K, n and p eta and pt distributions // @@ -24,14 +27,14 @@ $Log$ // // /////////////////////////////////////////////////////////////////// -#include "AliGenHIJINGparaBa.h" +#include +#include +#include + +#include "AliConst.h" #include "AliGenEventHeader.h" +#include "AliGenHIJINGparaBa.h" #include "AliRun.h" -#include "AliConst.h" -#include "AliPDG.h" - -#include -#include ClassImp(AliGenHIJINGparaBa) diff --git a/EVGEN/AliGenHalo.cxx b/EVGEN/AliGenHalo.cxx index cb0c814aeaa..78d18e355bf 100644 --- a/EVGEN/AliGenHalo.cxx +++ b/EVGEN/AliGenHalo.cxx @@ -15,6 +15,11 @@ /* $Log$ +Revision 1.11 2001/07/27 17:09:36 morsch +Use local SetTrack, KeepTrack and SetHighWaterMark methods +to delegate either to local stack or to stack owned by AliRun. +(Piotr Skowronski, A.M.) + Revision 1.10 2000/12/21 16:24:06 morsch Coding convention clean-up @@ -44,12 +49,13 @@ Introduction of the Copyright and cvs Log // for this purpose. // Author: andreas.morsch@cern.ch -#include "AliGenHalo.h" -#include "AliRun.h" -#include "AliPDG.h" +#include #include -#include +#include + +#include "AliGenHalo.h" +#include "AliRun.h" ClassImp(AliGenHalo) AliGenHalo::AliGenHalo() diff --git a/EVGEN/AliGenHaloProtvino.cxx b/EVGEN/AliGenHaloProtvino.cxx index e7fdcbb17bc..2eb40d2cf4b 100644 --- a/EVGEN/AliGenHaloProtvino.cxx +++ b/EVGEN/AliGenHaloProtvino.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.12 2002/11/21 16:22:35 alibrary +Removing AliMCProcess and AliMC + Revision 1.11 2002/10/14 14:55:35 hristov Merging the VirtualMC branch to the main development branch (HEAD) @@ -63,13 +66,14 @@ Generator to read beam halo file from Protvino group. // for this purpose. // Author: andreas.morsch@cern.ch -#include "AliGenHaloProtvino.h" -#include "AliRun.h" -#include "AliPDG.h" +#include #include +#include #include -#include + +#include "AliGenHaloProtvino.h" +#include "AliRun.h" ClassImp(AliGenHaloProtvino) AliGenHaloProtvino::AliGenHaloProtvino() diff --git a/EVGEN/AliGenHijing.cxx b/EVGEN/AliGenHijing.cxx index 498e964e3f8..156cd52b87c 100644 --- a/EVGEN/AliGenHijing.cxx +++ b/EVGEN/AliGenHijing.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.46 2003/01/07 14:12:33 morsch +Provides collision geometry. + Revision 1.45 2002/12/16 09:44:49 morsch Default for fRadiation is 3. @@ -176,19 +179,19 @@ AliGenerator interface class to HIJING using THijing (test version) // // andreas.morsch@cern.ch -#include "AliGenHijing.h" -#include "AliGenHijingEventHeader.h" -#include "AliRun.h" -#include "AliPDG.h" - #include -#include -#include #include +#include #include +#include +#include + +#include "AliGenHijing.h" +#include "AliGenHijingEventHeader.h" +#include "AliRun.h" - ClassImp(AliGenHijing) + ClassImp(AliGenHijing) AliGenHijing::AliGenHijing() :AliGenMC() diff --git a/EVGEN/AliGenHijingEventHeader.h b/EVGEN/AliGenHijingEventHeader.h index 8b5ef9fea0d..00054711926 100644 --- a/EVGEN/AliGenHijingEventHeader.h +++ b/EVGEN/AliGenHijingEventHeader.h @@ -6,9 +6,10 @@ /* $Id$ */ +#include + #include "AliGenEventHeader.h" #include "AliCollisionGeometry.h" -#include class AliGenHijingEventHeader : public AliGenEventHeader, public AliCollisionGeometry { diff --git a/EVGEN/AliGenMC.cxx b/EVGEN/AliGenMC.cxx index c9f932a4196..e5c67ae1751 100644 --- a/EVGEN/AliGenMC.cxx +++ b/EVGEN/AliGenMC.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.13 2002/10/14 14:55:35 hristov +Merging the VirtualMC branch to the main development branch (HEAD) + Revision 1.5.4.2 2002/07/24 08:56:28 alibrary Updating EVGEN on TVirtulaMC @@ -63,11 +66,12 @@ AliGenMC base class for AliGenParam and AliGenPythia commonalities. // decay products and particle selection. // andreas.morsch@cern.ch -#include "AliGenMC.h" -#include "AliPDG.h" #include +#include #include +#include "AliGenMC.h" + ClassImp(AliGenMC) AliGenMC::AliGenMC() diff --git a/EVGEN/AliGenPMDlib.cxx b/EVGEN/AliGenPMDlib.cxx index 977021c6a60..6a6c6f556e1 100644 --- a/EVGEN/AliGenPMDlib.cxx +++ b/EVGEN/AliGenPMDlib.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.5 2002/10/14 14:55:35 hristov +Merging the VirtualMC branch to the main development branch (HEAD) + Revision 1.3.10.1 2002/06/10 14:57:41 hristov Merged with v3-08-02 @@ -34,9 +37,10 @@ THIS VERSION IS JUST A TEMPLATE THE PT AND Y DISTRIBUTIONS HAVE TO BE CORRECTED */ +#include +#include + #include "AliGenPMDlib.h" -#include "AliPDG.h" -#include "TMath.h" ClassImp(AliGenPMDlib) // diff --git a/EVGEN/AliGenPythia.cxx b/EVGEN/AliGenPythia.cxx index b2566db6a7b..0dc99ac09a6 100644 --- a/EVGEN/AliGenPythia.cxx +++ b/EVGEN/AliGenPythia.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.68 2002/12/11 09:16:16 morsch +Use GetJets to fill header. + Revision 1.67 2002/12/09 15:24:09 morsch Same trigger routine can use Pycell or Pyclus. @@ -214,18 +217,18 @@ Introduction of the Copyright and cvs Log // andreas.morsch@cern.ch // +#include +#include +#include +#include +#include +#include "AliConst.h" +#include "AliDecayerPythia.h" #include "AliGenPythia.h" #include "AliGenPythiaEventHeader.h" -#include "AliDecayerPythia.h" -#include "AliRun.h" #include "AliPythia.h" -#include "AliPDG.h" -#include "AliConst.h" -#include -#include -#include -#include +#include "AliRun.h" ClassImp(AliGenPythia) diff --git a/EVGEN/AliGenThetaSlice.cxx b/EVGEN/AliGenThetaSlice.cxx index 13819b2293d..ba4237a63aa 100644 --- a/EVGEN/AliGenThetaSlice.cxx +++ b/EVGEN/AliGenThetaSlice.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.1 2002/03/11 10:56:06 morsch +AliGenThetaSlice, first commit. (Jiri Chudoba) + */ //////////////////////////////////////////////////////////////////////// // @@ -31,10 +34,11 @@ $Log$ // //////////////////////////////////////////////////////////////////////// +#include + +#include "AliConst.h" #include "AliGenThetaSlice.h" #include "AliRun.h" -#include "AliConst.h" -#include "AliPDG.h" ClassImp(AliGenThetaSlice) diff --git a/EVGEN/AliMevSimParticle.h b/EVGEN/AliMevSimParticle.h index 7786a4edb89..40dd522dd9a 100644 --- a/EVGEN/AliMevSimParticle.h +++ b/EVGEN/AliMevSimParticle.h @@ -7,9 +7,10 @@ /* $Id$ */ -#include "AliPDG.h" -#include "TMevSimPartTypeParams.h" +#include + #include "TMevSimConverter.h" +#include "TMevSimPartTypeParams.h" class AliMevSimParticle :public TMevSimPartTypeParams { diff --git a/HBTAN/AliHBTLLWeights.cxx b/HBTAN/AliHBTLLWeights.cxx index fb6b40ced91..4724b8d9f99 100644 --- a/HBTAN/AliHBTLLWeights.cxx +++ b/HBTAN/AliHBTLLWeights.cxx @@ -1,10 +1,11 @@ +#include +#include +#include +#include + #include "AliHBTLLWeights.h" -#include "AliPDG.h" #include "AliHBTPair.h" #include "AliHBTParticle.h" -#include -#include -#include /*******************************************************************/ /****** ROUTINES USED FOR COMMUNUCATION ********/ diff --git a/ITS/AliCascadeVertex.cxx b/ITS/AliCascadeVertex.cxx index fe759f15b8a..cdb05085b20 100644 --- a/ITS/AliCascadeVertex.cxx +++ b/ITS/AliCascadeVertex.cxx @@ -20,10 +20,11 @@ //------------------------------------------------------------------------- #include #include +#include #include "AliCascadeVertex.h" -#include "AliV0vertex.h" #include "AliITStrackV2.h" +#include "AliV0vertex.h" ClassImp(AliCascadeVertex) diff --git a/ITS/AliCascadeVertexer.cxx b/ITS/AliCascadeVertexer.cxx index 29977eb9cd4..ac76ea36fa8 100644 --- a/ITS/AliCascadeVertexer.cxx +++ b/ITS/AliCascadeVertexer.cxx @@ -18,15 +18,16 @@ // // Origin: Christian Kuhn, IReS, Strasbourg, christian.kuhn@ires.in2p3.fr //------------------------------------------------------------------------- +#include #include -#include #include -#include +#include +#include #include "AliCascadeVertex.h" #include "AliCascadeVertexer.h" -#include "AliV0vertex.h" #include "AliITStrackV2.h" +#include "AliV0vertex.h" ClassImp(AliCascadeVertexer) diff --git a/ITS/AliV0vertex.cxx b/ITS/AliV0vertex.cxx index 20ff34d2a11..f663e2f8520 100644 --- a/ITS/AliV0vertex.cxx +++ b/ITS/AliV0vertex.cxx @@ -20,6 +20,7 @@ //------------------------------------------------------------------------- #include #include +#include #include "AliV0vertex.h" #include "AliITStrackV2.h" diff --git a/ITS/AliV0vertexer.cxx b/ITS/AliV0vertexer.cxx index ae44cabf57f..207648f6853 100644 --- a/ITS/AliV0vertexer.cxx +++ b/ITS/AliV0vertexer.cxx @@ -18,14 +18,15 @@ // // Origin: Iouri Belikov, IReS, Strasbourg, Jouri.Belikov@cern.ch //------------------------------------------------------------------------- +#include #include -#include +#include #include -#include "Riostream.h" +#include +#include "AliITStrackV2.h" #include "AliV0vertex.h" #include "AliV0vertexer.h" -#include "AliITStrackV2.h" ClassImp(AliV0vertexer) diff --git a/MUON/AliMUONDigitizer.cxx b/MUON/AliMUONDigitizer.cxx index 85f14baeb1d..e998b3fbf8d 100644 --- a/MUON/AliMUONDigitizer.cxx +++ b/MUON/AliMUONDigitizer.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.11 2002/10/23 07:24:56 alibrary +Introducing Riostream.h + Revision 1.10 2002/03/13 07:55:04 jchudoba Correction of the errourness last commit. @@ -40,23 +43,23 @@ Revision 1.1 2001/07/27 15:41:01 jchudoba merging/digitization classes */ -#include -#include -#include -#include #include +#include +#include +#include +#include +#include -#include "AliMUONDigitizer.h" -#include "AliMUONConstants.h" -#include "AliMUONChamber.h" -#include "AliMUONHitMapA1.h" #include "AliMUON.h" +#include "AliMUONChamber.h" +#include "AliMUONConstants.h" +#include "AliMUONDigit.h" +#include "AliMUONDigitizer.h" #include "AliMUONHit.h" +#include "AliMUONHitMapA1.h" #include "AliMUONPadHit.h" -#include "AliMUONDigit.h" #include "AliMUONTransientDigit.h" #include "AliRun.h" -#include "AliPDG.h" #include "AliRunDigitizer.h" ClassImp(AliMUONDigitizer) diff --git a/MUON/AliMUONMerger.cxx b/MUON/AliMUONMerger.cxx index eeea21a8893..d4a2121f6e4 100644 --- a/MUON/AliMUONMerger.cxx +++ b/MUON/AliMUONMerger.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.9 2002/03/13 07:04:11 jchudoba +Connect only MUON branches when reading the event to speed up digitisation. + Revision 1.8 2002/02/22 12:14:21 morsch Validate pad hit before digitization. @@ -42,23 +45,23 @@ AliMUONMerger prototype to be called by the merge manager. */ -#include -#include -#include #include +#include +#include +#include +#include -#include "AliMUONMerger.h" -#include "AliMUONConstants.h" -#include "AliMUONChamber.h" #include "AliHitMap.h" -#include "AliMUONHitMapA1.h" #include "AliMUON.h" +#include "AliMUONChamber.h" +#include "AliMUONConstants.h" +#include "AliMUONDigit.h" #include "AliMUONHit.h" +#include "AliMUONHitMapA1.h" +#include "AliMUONMerger.h" #include "AliMUONPadHit.h" -#include "AliMUONDigit.h" #include "AliMUONTransientDigit.h" #include "AliRun.h" -#include "AliPDG.h" ClassImp(AliMUONMerger) diff --git a/MUON/AliMUONv0.cxx b/MUON/AliMUONv0.cxx index 9e7d985555c..6f51ccd43e1 100644 --- a/MUON/AliMUONv0.cxx +++ b/MUON/AliMUONv0.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.24 2002/11/21 17:01:56 alibrary +Removing AliMCProcess and AliMC + Revision 1.23 2002/10/23 07:24:57 alibrary Introducing Riostream.h @@ -91,11 +94,12 @@ Gammas and neutrons are also scored in the stepmanager // Manager and hits classes for set:MUON version 0 // ///////////////////////////////////////////////////////// -#include +#include +#include +#include #include #include -#include -#include +#include #include "AliMUONv0.h" #include "AliMUONChamber.h" diff --git a/MUON/AliMUONv1.cxx b/MUON/AliMUONv1.cxx index 33958284bf9..a04ebd21728 100644 --- a/MUON/AliMUONv1.cxx +++ b/MUON/AliMUONv1.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.38 2002/11/21 17:01:56 alibrary +Removing AliMCProcess and AliMC + Revision 1.37 2002/10/23 07:24:57 alibrary Introducing Riostream.h @@ -169,11 +172,12 @@ Log messages included. // Manager and hits classes for set:MUON version 0 // ///////////////////////////////////////////////////////// -#include +#include +#include +#include #include #include -#include -#include +#include #include "AliMUONv1.h" #include "AliRun.h" diff --git a/RICH/AliRICH.cxx b/RICH/AliRICH.cxx index d8e50af2793..6ee2d786693 100644 --- a/RICH/AliRICH.cxx +++ b/RICH/AliRICH.cxx @@ -15,6 +15,9 @@ /* $Log$ + Revision 1.64 2002/11/21 22:54:07 alibrary + Removing AliMC and AliMCProcess + Revision 1.63 2002/11/04 09:02:52 morsch Further corrcetions on Fresnel and Grid losses. @@ -181,48 +184,48 @@ // Manager and hits classes for set:RICH // //////////////////////////////////////////////// -#include -#include -#include -#include -#include -#include -#include +#include + +#include #include +#include +#include +#include #include -#include #include -#include #include #include -#include +#include +#include +#include +#include +#include +#include #include -#include - -#include -#include +#include +#include +#include +#include "AliConst.h" +#include "AliMagF.h" +#include "AliPoints.h" #include "AliRICH.h" -#include "AliSegmentation.h" -#include "AliRICHSegmentationV0.h" -#include "AliRICHHit.h" #include "AliRICHCerenkov.h" -#include "AliRICHSDigit.h" +#include "AliRICHClusterFinder.h" #include "AliRICHDigit.h" -#include "AliRICHTransientDigit.h" +#include "AliRICHDigitizer.h" +#include "AliRICHHit.h" +#include "AliRICHHitMapA1.h" +#include "AliRICHMerger.h" #include "AliRICHRawCluster.h" #include "AliRICHRecHit1D.h" #include "AliRICHRecHit3D.h" -#include "AliRICHHitMapA1.h" -#include "AliRICHClusterFinder.h" -#include "AliRICHMerger.h" -#include "AliRICHDigitizer.h" +#include "AliRICHSDigit.h" +#include "AliRICHSegmentationV0.h" +#include "AliRICHTransientDigit.h" #include "AliRun.h" #include "AliRunDigitizer.h" -#include "AliMagF.h" -#include "AliConst.h" -#include "AliPDG.h" -#include "AliPoints.h" +#include "AliSegmentation.h" diff --git a/STEER/AliCollisionGeometry.h b/STEER/AliCollisionGeometry.h index 612ce781086..fe4ed3454a1 100644 --- a/STEER/AliCollisionGeometry.h +++ b/STEER/AliCollisionGeometry.h @@ -5,7 +5,7 @@ /* $Id$ */ -#include +#include class AliCollisionGeometry { diff --git a/STEER/AliConfig.cxx b/STEER/AliConfig.cxx index b820e1a3423..0a3a2c2e68c 100644 --- a/STEER/AliConfig.cxx +++ b/STEER/AliConfig.cxx @@ -32,7 +32,7 @@ ClassImp(AliConfig) -AliConfig* AliConfig::fInstance = 0; +AliConfig* AliConfig::fgInstance = 0; //____________________________________________________________________________ AliConfig* AliConfig::Instance () @@ -40,9 +40,9 @@ AliConfig* AliConfig::Instance () // // Instance method for singleton class // - if(!fInstance) fInstance = new AliConfig ("Folders","Alice data exchange"); + if(!fgInstance) fgInstance = new AliConfig ("Folders","Alice data exchange"); - return fInstance; + return fgInstance; } //____________________________________________________________________________ @@ -59,7 +59,7 @@ AliConfig::AliConfig(): // // Default constructor, mainly to keep coding conventions // - fInstance=0; + fgInstance=0; Fatal("ctor", "Constructor should not be called for a singleton\n"); @@ -80,7 +80,7 @@ AliConfig::AliConfig(const AliConfig& conf): // // Copy constructor, mainly to keep coding conventions // - fInstance=0; + fgInstance=0; Fatal("copy ctor", "Copy constructor should not be called for a singleton\n"); @@ -101,7 +101,7 @@ AliConfig::AliConfig(const char *name, const char *title): // // Constructor // - fInstance=this; + fgInstance=this; fDetectorFolder[0] = "Run/Conditions/Calibration" ; fDetectorFolder[1] = "Run/Event/Data" ; @@ -161,38 +161,38 @@ AliConfig::AliConfig(const char *name, const char *title): subfolder = event->AddFolder ("RecData", "Detectors reconstucted data"); - TFolder *run_mc = + TFolder *runMC = fTopFolder->AddFolder ("RunMC", "MonteCarlo run dependent folders"); - TFolder *configuration_mc = - run_mc->AddFolder ("Configuration","MonteCarlo run configuration"); + TFolder *configurationMC = + runMC->AddFolder ("Configuration","MonteCarlo run configuration"); subfolder = - configuration_mc->AddFolder ("Generators","list of generator objects"); + configurationMC->AddFolder ("Generators","list of generator objects"); subfolder = - configuration_mc->AddFolder ("VirtualMC", "the Virtual MC"); + configurationMC->AddFolder ("VirtualMC", "the Virtual MC"); - TFolder *event_mc = - run_mc->AddFolder ("Event", "MonteCarlo event folders"); + TFolder *eventMC = + runMC->AddFolder ("Event", "MonteCarlo event folders"); subfolder = - event_mc->AddFolder ("Header", "MonteCarlo event header"); + eventMC->AddFolder ("Header", "MonteCarlo event header"); // subfolder = - // event_mc->AddFolder ("Kinematics", "MonteCarlo generated particles"); + // eventMC->AddFolder ("Kinematics", "MonteCarlo generated particles"); - TFolder *data_mc = - event_mc->AddFolder ("Data", "MonteCarlo data"); + TFolder *dataMC = + eventMC->AddFolder ("Data", "MonteCarlo data"); subfolder = - data_mc->AddFolder ("Hits", "MonteCarlo Hits") ; + dataMC->AddFolder ("Hits", "MonteCarlo Hits") ; subfolder = - data_mc->AddFolder ("SDigits", "MonteCarlo SDigits") ; + dataMC->AddFolder ("SDigits", "MonteCarlo SDigits") ; subfolder = - data_mc->AddFolder ("TrackReferences", "MonteCarlo track references") ; + dataMC->AddFolder ("TrackReferences", "MonteCarlo track references") ; @@ -311,10 +311,10 @@ void AliConfig::Add (char *list) { char *path; - const char *conf_path = gSystem->Getenv ("ALICE_CONFIG_PATH"); - if (conf_path) { - path = new char[strlen (conf_path)]; - strcpy (path, conf_path); + const char *confPath = gSystem->Getenv ("ALICE_CONFIG_PATH"); + if (confPath) { + path = new char[strlen (confPath)]; + strcpy (path, confPath); } else { const char *alice = gSystem->Getenv ("ALICE_ROOT"); path = new char[strlen (alice) + 32]; diff --git a/STEER/AliConfig.h b/STEER/AliConfig.h index c55ca1b11a5..358a01e7d0e 100644 --- a/STEER/AliConfig.h +++ b/STEER/AliConfig.h @@ -17,6 +17,8 @@ class AliGenerator; class AliModule; class AliTasks; +#include + class AliConfig : public TNamed { public: @@ -38,24 +40,24 @@ private: enum {kFolders=8, kTasks=5}; AliConfig(const char * name, const char * title); - AliConfig(const AliConfig&); + AliConfig(const AliConfig& conf); void AddInFolder (const char * dir, TObject *obj); void AddSubFolder(const char * dir[], TObject *obj); void AddSubTask(const char * dir[], TObject *obj); TObject* FindInFolder (const char *dir, const char *name); AliConfig& operator = (const AliConfig&) {return *this;} - TFolder *fTopFolder; - AliTasks *fTasks; + TFolder *fTopFolder; // Pointer of the top folder + AliTasks *fTasks; // Pointer for the tasks // folders - const char* fPDGFolder ; - const char* fGeneratorFolder ; - const char* fMCFolder ; - const char* fModuleFolder ; - const char** fDetectorFolder ; - const char** fDetectorTask ; - - static AliConfig* fInstance; + const char* fPDGFolder ; // Names of the PDG folders + const char* fGeneratorFolder ; // Names of the Generator folders + const char* fMCFolder ; // Names of MC folders + const char* fModuleFolder ; // Names of Module folders + const char** fDetectorFolder ; // Names of Detector folders + const char** fDetectorTask ; // Names of Detector Task folders + + static AliConfig* fgInstance; // Instance of the singleton ClassDef(AliConfig,1) //Configuration class for AliRun }; // end class AliConfig diff --git a/STEER/AliDebugVolume.cxx b/STEER/AliDebugVolume.cxx index 950a0714a5b..3f439f9ceac 100644 --- a/STEER/AliDebugVolume.cxx +++ b/STEER/AliDebugVolume.cxx @@ -15,6 +15,13 @@ /* $Header$ */ +//----------------------------------------------------------------------- +// +// Class to debug entry and exit from a volume +// +//----------------------------------------------------------------------- + + #include "AliDebugVolume.h" ClassImp(AliDebugVolume) diff --git a/STEER/AliDetector.cxx b/STEER/AliDetector.cxx index 85304fa0a06..53db7289cb9 100644 --- a/STEER/AliDetector.cxx +++ b/STEER/AliDetector.cxx @@ -35,12 +35,12 @@ #include +#include #include #include #include #include #include -#include #include "AliConfig.h" #include "AliDetector.h" diff --git a/STEER/AliDigit.cxx b/STEER/AliDigit.cxx index fc673c15c5a..008f4f0c535 100644 --- a/STEER/AliDigit.cxx +++ b/STEER/AliDigit.cxx @@ -15,6 +15,12 @@ /* $Header$ */ +//------------------------------------------------------------------------ +// +// Main digit class +// +//------------------------------------------------------------------------ + #include "AliDigit.h" ClassImp(AliDigit) diff --git a/STEER/AliDigit.h b/STEER/AliDigit.h index 3365e30de67..d32afa8e6e6 100644 --- a/STEER/AliDigit.h +++ b/STEER/AliDigit.h @@ -13,7 +13,7 @@ #include "TObject.h" class AliDigit : public TObject { -public: +protected: Int_t fTracks[3]; //tracks number making this digit (up to 3) public: diff --git a/STEER/AliDigitNew.cxx b/STEER/AliDigitNew.cxx index decce4de608..59157b54bc9 100644 --- a/STEER/AliDigitNew.cxx +++ b/STEER/AliDigitNew.cxx @@ -15,6 +15,12 @@ /* $Header$ */ +//----------------------------------------------------------------------- +// +// Proposal for a new digitisation abstract class +// +//----------------------------------------------------------------------- + #include "AliDigitNew.h" ClassImp(AliDigitNew) diff --git a/STEER/AliDigitizer.h b/STEER/AliDigitizer.h index d2ed25bba61..bfe10c5ef57 100644 --- a/STEER/AliDigitizer.h +++ b/STEER/AliDigitizer.h @@ -33,14 +33,14 @@ class AliDigitizer: public TTask { {dig.Copy(*this);return *this;} virtual ~AliDigitizer(); - virtual Bool_t Init() {return kTRUE;} + virtual Bool_t Init() const {return kTRUE;} // virtual void Digitize() = 0; protected: Int_t GetNInputStreams() const; void Copy(AliDigitizer &dig) const; - AliRunDigitizer *fManager; + AliRunDigitizer *fManager; // Pointer to the Digitizer manager ClassDef(AliDigitizer,1) // Base class for detector digitizers }; diff --git a/STEER/AliDisplay.cxx b/STEER/AliDisplay.cxx index 8d216142b2d..40c5aae6c79 100644 --- a/STEER/AliDisplay.cxx +++ b/STEER/AliDisplay.cxx @@ -391,7 +391,8 @@ void AliDisplay::ShowTrack(Int_t idx) } //---------------------------------------------------------------------------- -void AliDisplay::HideTrack(Int_t idx) { +void AliDisplay::HideTrack(Int_t idx) const +{ // // Hide track on display // diff --git a/STEER/AliDisplay.h b/STEER/AliDisplay.h index b1b7ac9a0c8..c9205c5ef51 100644 --- a/STEER/AliDisplay.h +++ b/STEER/AliDisplay.h @@ -35,7 +35,7 @@ public: virtual void Clear(Option_t *option=""); TSlider *CutSlider() {return fCutSlider;} virtual void ShowTrack(Int_t trackNumber); // *MENU* - virtual void HideTrack(Int_t trackNumber); // *MENU* + virtual void HideTrack(Int_t trackNumber) const; // *MENU* void Copy(AliDisplay &disp) const; virtual void DisableDetector(const char *name); // *MENU* virtual void DisplayButtons(); diff --git a/STEER/AliESD.cxx b/STEER/AliESD.cxx index 69d69236270..a913837c8e5 100644 --- a/STEER/AliESD.cxx +++ b/STEER/AliESD.cxx @@ -17,6 +17,7 @@ ///////////////////////////////////////////////////////////////////////// // // +// Prototype ESD class // // // ///////////////////////////////////////////////////////////////////////// diff --git a/STEER/AliESD.h b/STEER/AliESD.h index ea933079734..7b5777b21c0 100644 --- a/STEER/AliESD.h +++ b/STEER/AliESD.h @@ -57,7 +57,7 @@ protected: Float_t fPIDprobE; // PID probability for e private: - AliESDTrack(const AliESDTrack &); + AliESDTrack(const AliESDTrack & esdt); AliESDTrack & operator=(const AliESDTrack &) {return (*this);} ClassDef(AliESDTrack,1) //ESDTrack @@ -78,7 +78,7 @@ protected: Float_t fEffectiveMass; // Effective Mass Float_t fEffectiveMassError; // Effective Mass Error private: - AliESDVertex(const AliESDVertex &); + AliESDVertex(const AliESDVertex & esdv); AliESDVertex & operator=(const AliESDVertex &) {return (*this);} ClassDef(AliESDVertex,1) //ESDVertex diff --git a/STEER/AliFieldMap.cxx b/STEER/AliFieldMap.cxx index 8f4b3f3ff2e..b6899b810e0 100644 --- a/STEER/AliFieldMap.cxx +++ b/STEER/AliFieldMap.cxx @@ -15,13 +15,16 @@ /* $Header$ */ +//----------------------------------------------------------------------- // // Author: Andreas Morsch // +//----------------------------------------------------------------------- +#include #include + #include "AliFieldMap.h" -#include "TSystem.h" ClassImp(AliFieldMap) diff --git a/STEER/AliFieldMap.h b/STEER/AliFieldMap.h index bfe0563f571..24adf72622e 100644 --- a/STEER/AliFieldMap.h +++ b/STEER/AliFieldMap.h @@ -9,8 +9,7 @@ // Author: Andreas Morsch // #include -#include -#include +class TVector; class AliFieldMap : public TNamed { @@ -35,25 +34,25 @@ public: return (*fB)(3*(ix*(fZn*fYn)+iy*fZn+iz)+2); } - Bool_t Inside(Float_t x, Float_t y, Float_t z) + Bool_t Inside(Float_t x, Float_t y, Float_t z) const { return (x > fXbeg && x <= fXend && y > fYbeg && y <= fYend && z > fZbeg && z <= fZend); } - Float_t Xmin() {return fXbeg;} - Float_t Xmax() {return fXend;} - Float_t DelX() {return fXdel;} - Float_t DeliX() {return fXdeli;} + Float_t Xmin() const {return fXbeg;} + Float_t Xmax() const {return fXend;} + Float_t DelX() const {return fXdel;} + Float_t DeliX() const {return fXdeli;} - Float_t Ymin() {return fYbeg;} - Float_t Ymax() {return fYend;} - Float_t DelY() {return fYdel;} - Float_t DeliY() {return fYdeli;} + Float_t Ymin() const {return fYbeg;} + Float_t Ymax() const {return fYend;} + Float_t DelY() const {return fYdel;} + Float_t DeliY() const {return fYdeli;} - Float_t Zmin() {return fZbeg;} - Float_t Zmax() {return fZend;} - Float_t DelZ() {return fZdel;} - Float_t DeliZ() {return fZdeli;} + Float_t Zmin() const {return fZbeg;} + Float_t Zmax() const {return fZend;} + Float_t DelZ() const {return fZdel;} + Float_t DeliZ() const {return fZdeli;} void SetLimits(Float_t xmin, Float_t xmax, Float_t ymin, Float_t ymax, Float_t zmin, Float_t zmax) { @@ -61,8 +60,6 @@ public: fZbeg = zmin; fZend = zmax; } void SetWriteEnable(Int_t flag = 1) {fWriteEnable = flag;} - private: - void ReadField(); protected: Float_t fXbeg; // Start of mesh in x @@ -83,6 +80,9 @@ public: Int_t fWriteEnable; // Enable flag for writing of field data. TVector* fB; // Field map + private: + void ReadField(); + ClassDef(AliFieldMap,3) //Class for Field Map }; diff --git a/STEER/AliGausCorr.cxx b/STEER/AliGausCorr.cxx index 016ded2e074..6ac5e6381f9 100644 --- a/STEER/AliGausCorr.cxx +++ b/STEER/AliGausCorr.cxx @@ -26,8 +26,8 @@ #include #include -#include #include + #include "AliGausCorr.h" ClassImp(AliGausCorr) diff --git a/STEER/AliGausCorr.h b/STEER/AliGausCorr.h index eec37dbf1bb..31d9cca054f 100644 --- a/STEER/AliGausCorr.h +++ b/STEER/AliGausCorr.h @@ -9,15 +9,8 @@ class TArrayD; -class AliGausCorr : public TObject { -//////////////////////////////////////////////////////////////////////// -// Class used to generate correlated gaussian numbers with mean -// zero and known covariance matrix. -// Adapted from the Fortran code in Cernlib V122 (corset, corgen) -// F. James, Monte Carlo theory and practice, -// Rep. Prog. Phys. 43 (1980) 1145-1189. -// M.Masera 14.03.2001 19:30 - last mod. 26.02.2002 17:45 -//////////////////////////////////////////////////////////////////////// +class AliGausCorr : public TObject +{ public: // AliGausCorr(); diff --git a/STEER/AliGenEventHeader.h b/STEER/AliGenEventHeader.h index 44c346a4180..33345d1e173 100644 --- a/STEER/AliGenEventHeader.h +++ b/STEER/AliGenEventHeader.h @@ -9,11 +9,6 @@ #include #include -// Event header base class for generator. -// Stores as a minimum the date, run number, event number, number of particles produced -// and the impact parameter -// Author: andreas.morsch@cern.ch - class AliGenEventHeader : public TNamed { public: @@ -22,7 +17,7 @@ class AliGenEventHeader : public TNamed AliGenEventHeader(); virtual ~AliGenEventHeader() {} // Getters - virtual Int_t NProduced() {return fNProduced;} + virtual Int_t NProduced() const {return fNProduced;} virtual void PrimaryVertex(TArrayF &o) const; // Setters diff --git a/STEER/AliGenerator.cxx b/STEER/AliGenerator.cxx index 2e8044aeee8..1e6da896623 100644 --- a/STEER/AliGenerator.cxx +++ b/STEER/AliGenerator.cxx @@ -34,11 +34,11 @@ //End_Html // // /////////////////////////////////////////////////////////////////// -#include "TGenerator.h" +#include +#include "AliCollisionGeometry.h" #include "AliConfig.h" #include "AliGenerator.h" -#include "AliCollisionGeometry.h" #include "AliRun.h" #include "AliStack.h" @@ -382,6 +382,9 @@ void AliGenerator::SetTrack(Int_t done, Int_t parent, Int_t pdg, Float_t tof, TMCProcess mech, Int_t &ntr, Float_t weight, Int_t is) { + // + // Loads one track on the stack + // if (fStack) fStack->SetTrack(done, parent, pdg, pmom, vpos, polar, tof, @@ -398,6 +401,9 @@ void AliGenerator::SetTrack(Int_t done, Int_t parent, Int_t pdg, Double_t polx, Double_t poly, Double_t polz, TMCProcess mech, Int_t &ntr, Float_t weight, Int_t is) { + // + // Loads one track on the stack + // if (fStack) fStack->SetTrack(done, parent, pdg, px, py, pz, e, vx, vy, vz, tof, @@ -411,6 +417,9 @@ void AliGenerator::SetTrack(Int_t done, Int_t parent, Int_t pdg, //_______________________________________________________________________ void AliGenerator:: KeepTrack(Int_t itrack) { + // + // Declare a track permanent on the stack + // if (fStack) fStack->KeepTrack(itrack); else @@ -421,6 +430,9 @@ void AliGenerator:: KeepTrack(Int_t itrack) //_______________________________________________________________________ void AliGenerator:: SetHighWaterMark(Int_t nt) { + // + // Internal function to set the maximum index used in the stack + // if (fStack) fStack->SetHighWaterMark(nt); else diff --git a/STEER/AliGenerator.h b/STEER/AliGenerator.h index d3af8caff9e..1b37afbe237 100644 --- a/STEER/AliGenerator.h +++ b/STEER/AliGenerator.h @@ -12,15 +12,17 @@ // // /////////////////////////////////////////////////////////// -#include "TLorentzVector.h" -#include "TArrayF.h" -#include "TMCProcess.h" -#include "AliCollisionGeometry.h" +#include +#include +#include + #include "AliRndm.h" -class TGenerator; +class AliCollisionGeometry; class AliStack; +class TGenerator; + typedef enum { kNoSmear, kPerEvent, kPerTrack } VertexSmear_t; @@ -78,8 +80,8 @@ class AliGenerator : public TNamed, public AliRndm void SetStack (AliStack *stack) {fStack = stack;} AliStack* GetStack(){return fStack;} // Collision Geometry - virtual Bool_t ProvidesCollisionGeometry() {return kFALSE;} - virtual Bool_t NeedsCollisionGeometry() {return kFALSE;} + virtual Bool_t ProvidesCollisionGeometry() const {return kFALSE;} + virtual Bool_t NeedsCollisionGeometry() const {return kFALSE;} virtual AliCollisionGeometry* CollisionGeometry() {return fCollisionGeometry;} virtual void SetCollisionGeometry(AliCollisionGeometry* geom) {fCollisionGeometry = geom;} protected: diff --git a/STEER/AliGeometry.h b/STEER/AliGeometry.h index eda899fe6e3..a2d9d3ab4e4 100644 --- a/STEER/AliGeometry.h +++ b/STEER/AliGeometry.h @@ -14,11 +14,12 @@ //////////////////////////////////////////////// // --- ROOT system --- -#include "TParticle.h" #include "TNamed.h" -class TVector3; -class TMatrix; + class AliRecPoint; +class TMatrix; +class TParticle; +class TVector3; class AliGeometry : public TNamed { diff --git a/STEER/AliHeader.cxx b/STEER/AliHeader.cxx index a59bb54a993..b8e8e47ca41 100644 --- a/STEER/AliHeader.cxx +++ b/STEER/AliHeader.cxx @@ -15,6 +15,12 @@ /* $Header$ */ +//----------------------------------------------------------------------- +// +// Simulation event header class +// +//----------------------------------------------------------------------- + #include #include "AliHeader.h" diff --git a/STEER/AliHit.cxx b/STEER/AliHit.cxx index 22cf0f06ded..b7e4a0193ce 100644 --- a/STEER/AliHit.cxx +++ b/STEER/AliHit.cxx @@ -15,6 +15,12 @@ /* $Header$ */ +//----------------------------------------------------------------------- +// +// Base Hit class for all detectors +// +//----------------------------------------------------------------------- + #include "TParticle.h" #include "AliHit.h" diff --git a/STEER/AliKalmanTrack.cxx b/STEER/AliKalmanTrack.cxx index d6e0b53d536..03160822632 100644 --- a/STEER/AliKalmanTrack.cxx +++ b/STEER/AliKalmanTrack.cxx @@ -25,7 +25,7 @@ ClassImp(AliKalmanTrack) -Double_t AliKalmanTrack::fConvConst; +Double_t AliKalmanTrack::fgConvConst; //_______________________________________________________________________ AliKalmanTrack::AliKalmanTrack(): @@ -34,7 +34,10 @@ AliKalmanTrack::AliKalmanTrack(): fMass(0.13957), fN(0) { - if (fConvConst==0) + // + // Default constructor + // + if (fgConvConst==0) Fatal("AliKalmanTrack()","The magnetic field has not been set !\n"); } @@ -46,7 +49,10 @@ AliKalmanTrack::AliKalmanTrack(const AliKalmanTrack &t): fMass(t.fMass), fN(t.fN) { - if (fConvConst==0) + // + // Copy constructor + // + if (fgConvConst==0) Fatal("AliKalmanTrack(const AliKalmanTrack&)", "The magnetic field has not been set !\n"); } diff --git a/STEER/AliKalmanTrack.h b/STEER/AliKalmanTrack.h index dd187572ea4..e586fd57a0a 100644 --- a/STEER/AliKalmanTrack.h +++ b/STEER/AliKalmanTrack.h @@ -44,13 +44,13 @@ public: Int_t PropagateTo(Double_t /*xr*/, Double_t /*x0*/, Double_t /*rho*/) {return 0;} virtual Int_t Update(const AliCluster*, Double_t /*chi2*/, UInt_t) {return 0;} - static void SetConvConst(Double_t cc) {fConvConst=cc;} - Double_t GetConvConst() const {return fConvConst;} + static void SetConvConst(Double_t cc) {fgConvConst=cc;} + Double_t GetConvConst() const {return fgConvConst;} static void SetMagneticField(Double_t f) {// f - Magnetic field in T - fConvConst=100/0.299792458/f; + fgConvConst=100/0.299792458/f; } - Double_t GetMagneticField() const {return 100/0.299792458/fConvConst;} + Double_t GetMagneticField() const {return 100/0.299792458/fgConvConst;} protected: void SetChi2(Double_t chi2) {fChi2=chi2;} @@ -63,7 +63,7 @@ private: Double_t fMass; // mass hypothesis Int_t fN; // number of associated clusters - static Double_t fConvConst; //conversion constant cm -> GeV/c + static Double_t fgConvConst; //conversion constant cm -> GeV/c ClassDef(AliKalmanTrack,1) // Reconstructed track }; diff --git a/STEER/AliLegoGenerator.cxx b/STEER/AliLegoGenerator.cxx index 14d580084f6..95e879fe522 100644 --- a/STEER/AliLegoGenerator.cxx +++ b/STEER/AliLegoGenerator.cxx @@ -15,6 +15,12 @@ /* $Header$ */ +//------------------------------------------------------------------------ +// +// Generic Lego generator code +// +//------------------------------------------------------------------------ + #include "AliLegoGenerator.h" #include "AliRun.h" diff --git a/STEER/AliLegoGeneratorEta.cxx b/STEER/AliLegoGeneratorEta.cxx index 74db157b643..2d3fc91d375 100644 --- a/STEER/AliLegoGeneratorEta.cxx +++ b/STEER/AliLegoGeneratorEta.cxx @@ -15,6 +15,12 @@ /* $Header$ */ +//------------------------------------------------------------------------ +// +// Lego generator in Eta bins +// +//------------------------------------------------------------------------ + #include "AliLegoGeneratorEta.h" #include "AliRun.h" diff --git a/STEER/AliLegoGeneratorPhiZ.cxx b/STEER/AliLegoGeneratorPhiZ.cxx index 946a9a7558c..24a3807e285 100644 --- a/STEER/AliLegoGeneratorPhiZ.cxx +++ b/STEER/AliLegoGeneratorPhiZ.cxx @@ -15,6 +15,12 @@ /* $Header$ */ +//------------------------------------------------------------------------- +// +// Lego generator in Phi - Z bins +// +//------------------------------------------------------------------------- + #include "AliLegoGeneratorPhiZ.h" #include "AliRun.h" diff --git a/STEER/AliLegoGeneratorXYZ.cxx b/STEER/AliLegoGeneratorXYZ.cxx index 62a04355e26..d3ae6bd7a3a 100644 --- a/STEER/AliLegoGeneratorXYZ.cxx +++ b/STEER/AliLegoGeneratorXYZ.cxx @@ -15,6 +15,12 @@ /* $Header$ */ +//------------------------------------------------------------------------- +// +// Lego generator in x - y - z bins +// +//------------------------------------------------------------------------- + #include "AliLegoGeneratorXYZ.h" #include "AliRun.h" diff --git a/STEER/AliMCQA.cxx b/STEER/AliMCQA.cxx index d55f7d4be1b..f7415e091ff 100644 --- a/STEER/AliMCQA.cxx +++ b/STEER/AliMCQA.cxx @@ -17,29 +17,31 @@ /////////////////////////////////////////////////////////////////////////////// // // +// Quality Assurance class // +// Provides standard histograms for every element of the detector // // // /////////////////////////////////////////////////////////////////////////////// #include -#include "TObjArray.h" -#include "TH1.h" -#include "TList.h" -#include "TROOT.h" -#include "TBrowser.h" -#include "TMath.h" -#include "TLorentzVector.h" -#include "TDatabasePDG.h" -#include "TMath.h" -#include "TPad.h" -#include "TExec.h" -#include "TPaveLabel.h" -#include "TCanvas.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "AliMCQA.h" -#include "AliRun.h" #include "AliModule.h" +#include "AliRun.h" ClassImp(AliMCQA) @@ -173,7 +175,11 @@ void AliMCQA::Copy(AliMCQA &) const } //_______________________________________________________________________ -AliMCQA::~AliMCQA() { +AliMCQA::~AliMCQA() +{ + // + // Destructor + // gROOT->GetListOfBrowsables()->Remove(this); if (fQAList) { fQAList->Delete(); diff --git a/STEER/AliMagF.cxx b/STEER/AliMagF.cxx index 41e8085b862..f17dfee92ec 100644 --- a/STEER/AliMagF.cxx +++ b/STEER/AliMagF.cxx @@ -15,6 +15,9 @@ /* $Header$ */ +// +// Basic magnetic field class +// #include "AliMagF.h" diff --git a/STEER/AliMagFC.cxx b/STEER/AliMagFC.cxx index 073ee052e23..b775bec3f5c 100644 --- a/STEER/AliMagFC.cxx +++ b/STEER/AliMagFC.cxx @@ -15,6 +15,12 @@ /* $Header$ */ +//------------------------------------------------------------------------- +// +// Constant magnetic field class +// +//------------------------------------------------------------------------- + #include #include "AliMagFC.h" diff --git a/STEER/AliMagFDM.cxx b/STEER/AliMagFDM.cxx index 350ebb7cb53..056aed15f01 100644 --- a/STEER/AliMagFDM.cxx +++ b/STEER/AliMagFDM.cxx @@ -15,6 +15,12 @@ /* $Header$ */ +//------------------------------------------------------------------------- +// +// Field with Magnetic Field map +// +//------------------------------------------------------------------------- + #include #include "TSystem.h" @@ -109,7 +115,7 @@ void AliMagFDM::Field(Float_t *xfi, Float_t *b) // Main routine to compute the field in a point // const Double_t keps=0.1E-06; - const Double_t PI2=2.*TMath::Pi(); + const Double_t kPI2=2.*TMath::Pi(); const Double_t kone=1; const Int_t kiip=33; @@ -200,10 +206,10 @@ if ((kfZbg/100 0 ) {ph0=PI2/2 - ph0;} - if (xL3[0] < 0 && yyp < 0 ) {ph0=PI2/2 + ph0;} - if (xL3[0] > 0 && yyp < 0 ) {ph0=PI2 - ph0;} - if (ph0 > PI2) { ph0=ph0 - PI2;} + if (xL3[0] < 0 && yyp > 0 ) {ph0=kPI2/2 - ph0;} + if (xL3[0] < 0 && yyp < 0 ) {ph0=kPI2/2 + ph0;} + if (xL3[0] > 0 && yyp < 0 ) {ph0=kPI2 - ph0;} + if (ph0 > kPI2) { ph0=ph0 - kPI2;} if (kcphi==777) { printf("xL3[0] %e, xL3[1] %e, xL3[2] %e, yyp %e, r0 %e, ph0 %e\n",xL3[0],xL3[1],xL3[2],yyp,r0,ph0); } @@ -370,7 +376,7 @@ if ((kfZbg/100 #include +#include #include "AliFieldMap.h" #include "AliMagFMaps.h" diff --git a/STEER/AliMergeCombi.cxx b/STEER/AliMergeCombi.cxx index 61308c8e844..b7936f34c45 100644 --- a/STEER/AliMergeCombi.cxx +++ b/STEER/AliMergeCombi.cxx @@ -18,8 +18,8 @@ //////////////////////////////////////////////////////////////////////// // // AliMergeCombi.cxx -// -// returns combinations of input event numbers +// class to +// return combinations of input event numbers // //////////////////////////////////////////////////////////////////////// @@ -58,6 +58,9 @@ AliMergeCombi::~AliMergeCombi() //_______________________________________________________________________ Bool_t AliMergeCombi::Combination(Int_t /* evNumber */ [], Int_t delta[]) { + // + // Combination method + // delta[0] = 1; for (Int_t i=1; i // --- AliRoot header files --- diff --git a/STEER/AliModule.cxx b/STEER/AliModule.cxx index d616526ec29..705084d411b 100644 --- a/STEER/AliModule.cxx +++ b/STEER/AliModule.cxx @@ -33,7 +33,8 @@ // // /////////////////////////////////////////////////////////////////////////////// #include -#include "TSystem.h" +#include +#include #include "AliModule.h" #include "AliRun.h" @@ -173,7 +174,7 @@ void AliModule::Disable() } //_______________________________________________________________________ -Int_t AliModule::DistancetoPrimitive(Int_t, Int_t) +Int_t AliModule::DistancetoPrimitive(Int_t, Int_t) const { // // Return distance from mouse pointer to object @@ -225,7 +226,7 @@ void AliModule::AliMaterial(Int_t imat, const char* name, Float_t a, //_______________________________________________________________________ void AliModule::AliGetMaterial(Int_t imat, char* name, Float_t &a, Float_t &z, Float_t &dens, Float_t &radl, - Float_t &absl) + Float_t &absl) const { // // Store the parameters for a material diff --git a/STEER/AliModule.h b/STEER/AliModule.h index 2829ca88497..16c6305f0cf 100644 --- a/STEER/AliModule.h +++ b/STEER/AliModule.h @@ -52,7 +52,7 @@ public: Float_t absl, Float_t *buf=0, Int_t nwbuf=0) const; virtual void AliGetMaterial(Int_t imat, char* name, Float_t &a, Float_t &z, Float_t &dens, Float_t &radl, - Float_t &absl); + Float_t &absl) const; virtual void AliMixture(Int_t imat, const char *name, Float_t *a, Float_t *z, Float_t dens, Int_t nlmat, Float_t *wmat) const; @@ -83,7 +83,7 @@ public: virtual void CreateGeometry() {} virtual void CreateMaterials() {} virtual void Disable(); - virtual Int_t DistancetoPrimitive(Int_t px, Int_t py); + virtual Int_t DistancetoPrimitive(Int_t px, Int_t py) const; virtual void Enable(); virtual void PreTrack(){} virtual void PostTrack(){} @@ -109,7 +109,7 @@ public: virtual Float_t GetTimeGate() const {return 1.e10;} virtual void StepManager() {} virtual void DisableStepManager() {fEnable = kFALSE;} - virtual Bool_t StepManagerIsEnabled() {return fEnable;} + virtual Bool_t StepManagerIsEnabled() const {return fEnable;} virtual void SetBufferSize(Int_t) {} virtual Float_t ZMin() const; virtual Float_t ZMax() const; diff --git a/STEER/AliPDG.h b/STEER/AliPDG.h index a395d3accc3..b4cbd84f23d 100644 --- a/STEER/AliPDG.h +++ b/STEER/AliPDG.h @@ -5,7 +5,6 @@ /* $Id$ */ -#include "TPDGCode.h" #include "TObject.h" class AliPDG : public TObject { diff --git a/STEER/AliPoints.cxx b/STEER/AliPoints.cxx index 18e9a927f6e..f877b4d8eed 100644 --- a/STEER/AliPoints.cxx +++ b/STEER/AliPoints.cxx @@ -116,7 +116,7 @@ Int_t AliPoints::DistancetoPrimitive(Int_t px, Int_t py) } //_______________________________________________________________________ -void AliPoints::DumpParticle() +void AliPoints::DumpParticle() const { // // Dump particle corresponding to this point diff --git a/STEER/AliPoints.h b/STEER/AliPoints.h index 69f1b0bd379..74e883fd75f 100644 --- a/STEER/AliPoints.h +++ b/STEER/AliPoints.h @@ -22,7 +22,7 @@ public: TParticle *GetParticle() const; virtual const Text_t *GetName() const; virtual void InspectParticle(); // *MENU* - virtual void DumpParticle(); // *MENU* + virtual void DumpParticle() const; // *MENU* virtual Text_t *GetObjectInfo(Int_t px, Int_t py) const; AliPoints & operator=(const AliPoints &pts) {pts.Copy(*this); return (*this);} diff --git a/STEER/AliRndm.cxx b/STEER/AliRndm.cxx index 7dccd41ed2b..04237891a5d 100644 --- a/STEER/AliRndm.cxx +++ b/STEER/AliRndm.cxx @@ -17,6 +17,7 @@ /////////////////////////////////////////////////////////////////////////////// // // +// Wrapper for the root random number generator // // // /////////////////////////////////////////////////////////////////////////////// diff --git a/STEER/AliRndm.h b/STEER/AliRndm.h index 75ad8a0713f..04d98780568 100644 --- a/STEER/AliRndm.h +++ b/STEER/AliRndm.h @@ -19,7 +19,7 @@ class AliRndm { public: AliRndm(); - AliRndm(const AliRndm &); + AliRndm(const AliRndm &rnd); virtual ~AliRndm() {fRandom=sRandom=0;} AliRndm & operator=(const AliRndm& rn) {rn.Copy(*this); return (*this);} diff --git a/STEER/AliRun.cxx b/STEER/AliRun.cxx index 7bbf4fd2682..093bf1ac985 100644 --- a/STEER/AliRun.cxx +++ b/STEER/AliRun.cxx @@ -51,9 +51,7 @@ #include "TFile.h" #include "TFolder.h" #include "TGeometry.h" -#include "TKey.h" #include "TNode.h" -#include "TObjectTable.h" #include "TParticle.h" #include "TRandom3.h" #include "TROOT.h" @@ -63,10 +61,8 @@ #include "AliConfig.h" #include "AliDetector.h" #include "AliDisplay.h" -#include "AliGenEventHeader.h" #include "AliGenerator.h" #include "AliHeader.h" -#include "AliHit.h" #include "AliLego.h" #include "AliLegoGenerator.h" #include "AliMCQA.h" @@ -412,7 +408,7 @@ void AliRun::CleanDetectors() } //_______________________________________________________________________ -Int_t AliRun::DistancetoPrimitive(Int_t, Int_t) +Int_t AliRun::DistancetoPrimitive(Int_t, Int_t) const { // // Return the distance from the mouse to the AliRun object @@ -1691,14 +1687,17 @@ void AliRun::BeginPrimary() //_______________________________________________________________________ void AliRun::PreTrack() { - TObjArray &dets = *fModules; - AliModule *module; - - for(Int_t i=0; i<=fNdets; i++) - if((module = dynamic_cast(dets[i]))) - module->PreTrack(); - - fMCQA->PreTrack(); + // + // Method called before each track + // + TObjArray &dets = *fModules; + AliModule *module; + + for(Int_t i=0; i<=fNdets; i++) + if((module = dynamic_cast(dets[i]))) + module->PreTrack(); + + fMCQA->PreTrack(); } //_______________________________________________________________________ @@ -1732,12 +1731,15 @@ void AliRun::Stepping() //_______________________________________________________________________ void AliRun::PostTrack() { - TObjArray &dets = *fModules; - AliModule *module; - - for(Int_t i=0; i<=fNdets; i++) - if((module = dynamic_cast(dets[i]))) - module->PostTrack(); + // + // Called after a track has been trasported + // + TObjArray &dets = *fModules; + AliModule *module; + + for(Int_t i=0; i<=fNdets; i++) + if((module = dynamic_cast(dets[i]))) + module->PostTrack(); } //_______________________________________________________________________ @@ -1820,18 +1822,22 @@ void AliRun::FinishEvent() //_______________________________________________________________________ void AliRun::Field(const Double_t* x, Double_t *b) const { - Float_t xfloat[3]; - for (Int_t i=0; i<3; i++) xfloat[i] = x[i]; - - if (Field()) { - Float_t bfloat[3]; - Field()->Field(xfloat,bfloat); - for (Int_t j=0; j<3; j++) b[j] = bfloat[j]; - } - else { - printf("No mag field defined!\n"); - b[0]=b[1]=b[2]=0.; - } + // + // Returns the magnetic field at point x[3] + // Units are kGauss + // + Float_t xfloat[3]; + for (Int_t i=0; i<3; i++) xfloat[i] = x[i]; + + if (Field()) { + Float_t bfloat[3]; + Field()->Field(xfloat,bfloat); + for (Int_t j=0; j<3; j++) b[j] = bfloat[j]; + } + else { + printf("No mag field defined!\n"); + b[0]=b[1]=b[2]=0.; + } } diff --git a/STEER/AliRun.h b/STEER/AliRun.h index 5f5a96a1f9b..ec389affca3 100644 --- a/STEER/AliRun.h +++ b/STEER/AliRun.h @@ -5,13 +5,13 @@ /* $Id$ */ -#include #include #include #include #include #include #include + class TBranch; class TBrowser; class TDatabasePDG; @@ -35,7 +35,6 @@ class AliMagF; class AliModule; class AliStack; - enum {kKeepBit=1, kDaughtersBit=2, kDoneBit=4}; @@ -60,7 +59,7 @@ public: TObjArray *Modules() const {return fModules;} Int_t CurrentTrack() const; AliDisplay *Display() { return fDisplay;} - virtual Int_t DistancetoPrimitive(Int_t px, Int_t py); + virtual Int_t DistancetoPrimitive(Int_t px, Int_t py) const; virtual void DumpPart (Int_t i) const; virtual void DumpPStack () const; virtual AliMagF *Field() const {return fField;} diff --git a/STEER/AliRunDigitizer.cxx b/STEER/AliRunDigitizer.cxx index e62af697088..88903a72cff 100644 --- a/STEER/AliRunDigitizer.cxx +++ b/STEER/AliRunDigitizer.cxx @@ -96,13 +96,11 @@ #include "TFile.h" #include "TList.h" -#include "TParticle.h" #include "TTree.h" // AliROOT includes #include "AliDigitizer.h" -#include "AliHeader.h" #include "AliMergeCombi.h" #include "AliRun.h" #include "AliRunDigitizer.h" @@ -255,6 +253,9 @@ void AliRunDigitizer::AddDigitizer(AliDigitizer *digitizer) //_______________________________________________________________________ void AliRunDigitizer::SetInputStream(Int_t i, const char *inputFile) { + // + // Sets the name of the input file + // if (i > fInputStreams->GetLast()) { Error("SetInputStream","Input stream number too high"); return; @@ -362,8 +363,8 @@ Bool_t AliRunDigitizer::InitGlobal() //_______________________________________________________________________ void AliRunDigitizer::SetOutputFile(TString fn) -// the output will be to separate file, not to the signal file { + // the output will be to separate file, not to the signal file fOutputFileName = fn; (static_cast(fInputStreams->At(0)))->ChangeMode("READ"); InitOutputGlobal(); diff --git a/STEER/AliRunDigitizer.h b/STEER/AliRunDigitizer.h index e4e562c9fbe..a3613221429 100644 --- a/STEER/AliRunDigitizer.h +++ b/STEER/AliRunDigitizer.h @@ -27,7 +27,7 @@ class TTree; class AliDigitizer; class AliMergeCombi; -const Int_t kMaxStreamsToMerge = 4; +static const Int_t kMaxStreamsToMerge = 4; class AliRunDigitizer: public TTask { @@ -47,7 +47,7 @@ public: void SetFirstOutputEventNr(Int_t i) {fEvent = i;} void SetNrOfEventsToWrite(Int_t i) {fNrOfEventsToWrite = i;} void SetCopyTreesFromInput(Int_t i) {fCopyTreesFromInput = i;} - Int_t GetCopyTreesFromInput() {return fCopyTreesFromInput;} + Int_t GetCopyTreesFromInput() const {return fCopyTreesFromInput;} Int_t GetOutputEventNr() const {return fEvent;} void SetCombinationFileName(TString fn) {fCombinationFileName = fn;} TString GetCombinationFileName() const {return fCombinationFileName;} diff --git a/STEER/AliStack.h b/STEER/AliStack.h index 903278b0c36..fc2f419064a 100644 --- a/STEER/AliStack.h +++ b/STEER/AliStack.h @@ -6,9 +6,6 @@ /* $Id$ */ #include -#include -#include -#include #include class AliHeader; diff --git a/STEER/AliStream.cxx b/STEER/AliStream.cxx index ff3f9b289ad..113fb1c1e2b 100644 --- a/STEER/AliStream.cxx +++ b/STEER/AliStream.cxx @@ -133,10 +133,10 @@ Bool_t AliStream::NextEventInStream(Int_t &serialNr) //_______________________________________________________________________ void AliStream::ChangeMode(Option_t* option) -// set the mode to READ or UPDATE, reopen file with the new mode -// only change from UPDATE to READ have sense in the current scheme, -// other changes are possible but not usefull { + // set the mode to READ or UPDATE, reopen file with the new mode + // only change from UPDATE to READ have sense in the current scheme, + // other changes are possible but not usefull fMode = option; if (fCurrentFile) { fCurrentFile->Close(); @@ -148,6 +148,9 @@ void AliStream::ChangeMode(Option_t* option) //_______________________________________________________________________ Bool_t AliStream::OpenNextFile() { + // + // Open the next file in the series + // if (++fCurrentFileIndex > fFileNames->GetLast()) { cerr<<"No more files in the stream"<GetLast() < 0) return kFALSE; if (!fCurrentFile) { if (!OpenNextFile()) return kFALSE; @@ -197,10 +203,10 @@ Bool_t AliStream::ImportgAlice() //_______________________________________________________________________ TString AliStream::GetFileName(const Int_t order) const -// returns name of the order-th file -// returns empty string if such file does not exist -// first file in the input stream is 0 { + // returns name of the order-th file + // returns empty string if such file does not exist + // first file in the input stream is 0 TString fileName(""); if (order > fFileNames->GetLast()) return fileName; TObjString *fileNameStored = dynamic_cast(fFileNames->At(order)); diff --git a/STEER/AliStream.h b/STEER/AliStream.h index 3969cf62c27..215c7b54b4d 100644 --- a/STEER/AliStream.h +++ b/STEER/AliStream.h @@ -15,10 +15,10 @@ // --- ROOT system --- #include "TNamed.h" +#include "TObjArray.h" #include "TString.h" class TFile; -class TObjArray; // --- AliRoot header files --- @@ -27,7 +27,7 @@ class AliStream: public TNamed { public: AliStream(); AliStream(Option_t *option); - AliStream(const AliStream&); + AliStream(const AliStream& str); AliStream & operator=(const AliStream& str) {str.Copy(*this); return (*this);} virtual ~AliStream(); @@ -43,9 +43,9 @@ public: private: void Copy(AliStream& str) const; - Int_t fLastEventSerialNr; - Int_t fLastEventNr; - Int_t fCurrentFileIndex; + Int_t fLastEventSerialNr; // Serial number of the last event + Int_t fLastEventNr; // Number of the last event + Int_t fCurrentFileIndex; // Index of the current file Int_t fEvents; //! nr. of events in the current file TString fMode; // = 0 for READONLY, = 1 for READWRITE TFile *fCurrentFile; //! pointer to current open file diff --git a/STEER/AliTrackMap.cxx b/STEER/AliTrackMap.cxx index c5b8a8cf523..886ff0f5ac3 100644 --- a/STEER/AliTrackMap.cxx +++ b/STEER/AliTrackMap.cxx @@ -34,13 +34,8 @@ #include -#include "TTree.h" -#include "TROOT.h" - #include "AliTrackMap.h" -#include "AliRun.h" - ClassImp(AliTrackMap) //_______________________________________________________________________ diff --git a/STEER/AliTrackMapper.cxx b/STEER/AliTrackMapper.cxx index fe360f3ca43..c765d2a71a6 100644 --- a/STEER/AliTrackMapper.cxx +++ b/STEER/AliTrackMapper.cxx @@ -28,9 +28,7 @@ #include #include "TTree.h" -#include "TROOT.h" #include "TFile.h" -#include "TBenchmark.h" #include "TStopwatch.h" #include "AliDetector.h" @@ -90,7 +88,7 @@ void AliTrackMapper::CreateMap(Int_t nEvents, Int_t firstEventNr, } //_______________________________________________________________________ -Int_t AliTrackMapper::CreateMap(Int_t eventNr, TFile* fileMap) +Int_t AliTrackMapper::CreateMap(Int_t eventNr, TFile* fileMap) const { // // create an AliTrackMap for a given event diff --git a/STEER/AliTrackMapper.h b/STEER/AliTrackMapper.h index 1d5fb723dd6..a5459d14dad 100644 --- a/STEER/AliTrackMapper.h +++ b/STEER/AliTrackMapper.h @@ -19,8 +19,7 @@ // --- ROOT system --- -#include "TString.h" -#include "TFile.h" +class TFile; // --- AliRoot header files --- @@ -34,7 +33,7 @@ public: void CreateMap(Int_t nEvents, Int_t firstEventNr, const char* fnMap = "trackMap.root", const char* fnHits ="rfio:galice.root"); - Int_t CreateMap(Int_t eventNr, TFile* fileMap); + Int_t CreateMap(Int_t eventNr, TFile* fileMap) const; void SetDebug(Int_t level) {fDEBUG = level;} void CheckTrackMap(Int_t eventNr, const char* fnMap = "trackMap.root"); AliTrackMap* LoadTrackMap(Int_t eventNr, const char* fnMap, TFile* &fileMap); @@ -42,7 +41,7 @@ public: private: - Int_t fDEBUG; + Int_t fDEBUG; // Debug flag ClassDef(AliTrackMapper,0) // methods to create AliTrackMap }; diff --git a/STEER/AliTrackReference.cxx b/STEER/AliTrackReference.cxx index 979b80d1cff..2c209bece66 100644 --- a/STEER/AliTrackReference.cxx +++ b/STEER/AliTrackReference.cxx @@ -15,9 +15,13 @@ /* $Header$ */ +//---------------------------------------------------------------------- +// Class containing the kinematic information of tracks at various +// points in the simulation to check the reconstruction +// Origin: M.Ivanov +//---------------------------------------------------------------------- + #include "AliTrackReference.h" -#include "TParticle.h" -#include "AliRun.h" ClassImp(AliTrackReference) diff --git a/STEER/AliTrackReference.h b/STEER/AliTrackReference.h index 731cf9e712c..02f93b2d633 100644 --- a/STEER/AliTrackReference.h +++ b/STEER/AliTrackReference.h @@ -14,7 +14,7 @@ public: virtual Int_t GetTrack() const {return fTrack;} virtual void SetTrack(Int_t track) {fTrack=track;} virtual void SetLength(Float_t length){fLength=length;} - virtual Float_t GetLength(){return fLength;} + virtual Float_t GetLength() const {return fLength;} virtual Float_t X() const {return fX;} virtual Float_t Y() const {return fY;} virtual Float_t Z() const {return fZ;} diff --git a/STEER/AliTracker.cxx b/STEER/AliTracker.cxx index 1a66a3c5112..d53c66c21af 100644 --- a/STEER/AliTracker.cxx +++ b/STEER/AliTracker.cxx @@ -17,9 +17,10 @@ //------------------------------------------------------------------------- // Implementation of the AliTracker class -// -// Origin: Iouri Belikov, CERN, Jouri.Belikov@cern.ch +// Origin +// Iouri Belikov, CERN, Jouri.Belikov@cern.ch //------------------------------------------------------------------------- + #include #include "AliTracker.h" diff --git a/TPC/AliSimDigits.cxx b/TPC/AliSimDigits.cxx index 0b5f2637413..479df5748ac 100644 --- a/TPC/AliSimDigits.cxx +++ b/TPC/AliSimDigits.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.7 2002/10/23 07:17:33 alibrary +Introducing Riostream.h + Revision 1.6 2002/01/21 17:15:23 kowal2 Better protection. @@ -418,9 +421,9 @@ TClonesArray * AliSimDigits::GenerTPCClonesArray(TClonesArray * arr) dig.fSignal= amp; dig.fPadRow =fSegmentID; dig.fSector =fSegmentID; - dig.fTracks[0]= GetTrackID(row,col,0); - dig.fTracks[1]= GetTrackID(row,col,1); - dig.fTracks[2]= GetTrackID(row,col,2); + dig.GetTracks()[0]= GetTrackID(row,col,0); + dig.GetTracks()[1]= GetTrackID(row,col,1); + dig.GetTracks()[2]= GetTrackID(row,col,2); TClonesArray &ldigits = *digits; new(ldigits[index++]) AliTPCdigit(dig); } diff --git a/TPC/AliTPCv2.cxx b/TPC/AliTPCv2.cxx index 94e6eacba45..ceaff3ddea8 100644 --- a/TPC/AliTPCv2.cxx +++ b/TPC/AliTPCv2.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.44 2002/11/21 22:43:32 alibrary +Removing AliMC and AliMCProcess + Revision 1.43 2002/10/14 14:57:43 hristov Merging the VirtualMC branch to the main development branch (HEAD) @@ -148,21 +151,21 @@ Introduction of the Copyright and cvs Log // // // // /////////////////////////////////////////////////////////////////////////////// + #include #include +#include -#include "AliTPCv2.h" -#include "AliTPCDigitsArray.h" -#include "AliRun.h" #include "AliConst.h" -#include "AliPDG.h" +#include "AliRun.h" +#include "AliTPCDigitsArray.h" #include "AliTPCParam.h" #include "AliTPCParamSR.h" #include "AliTPCTrackHitsV2.h" +#include "AliTPCv2.h" #include "TLorentzVector.h" - ClassImp(AliTPCv2) //_____________________________________________________________________________ diff --git a/TPC/AliTPCv3.cxx b/TPC/AliTPCv3.cxx index 74971618ad8..45f09dec50d 100644 --- a/TPC/AliTPCv3.cxx +++ b/TPC/AliTPCv3.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.31 2002/11/21 22:43:33 alibrary +Removing AliMC and AliMCProcess + Revision 1.30 2002/10/14 14:57:43 hristov Merging the VirtualMC branch to the main development branch (HEAD) @@ -134,17 +137,19 @@ Introduction of the Copyright and cvs Log /////////////////////////////////////////////////////////////////////////////// #include + +#include +#include +#include #include -#include "AliTPCv3.h" -#include "AliRun.h" + #include "AliConst.h" +#include "AliRun.h" #include "AliTPCDigitsArray.h" #include "AliTPCParam.h" #include "AliTPCParamSR.h" -#include "AliPDG.h" -#include -#include "TLorentzVector.h" #include "AliTPCTrackHitsV2.h" +#include "AliTPCv3.h" ClassImp(AliTPCv3) //_____________________________________________________________________________ diff --git a/ZDC/AliGenZDC.cxx b/ZDC/AliGenZDC.cxx index 96b9f0574dc..b797c95ac14 100644 --- a/ZDC/AliGenZDC.cxx +++ b/ZDC/AliGenZDC.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.12 2002/11/21 20:05:22 alibrary +Removing AliMC and AliMCProcess + Revision 1.11 2001/11/11 17:27:50 hristov Minor corrections @@ -53,15 +56,15 @@ Introduction of the Copyright and cvs Log */ #include -#include +#include #include +#include +#include +#include #include -#include "TDatabasePDG.h" -#include "TMCProcess.h" -#include "AliGenZDC.h" #include "AliConst.h" -#include "AliPDG.h" +#include "AliGenZDC.h" #include "AliRun.h" ClassImp(AliGenZDC) -- 2.39.3