From 94de381804dbc3c6cc154b06fc58284dc8266705 Mon Sep 17 00:00:00 2001 From: fca Date: Mon, 2 Oct 2000 21:28:20 +0000 Subject: [PATCH] Removal of useless dependecies via forward declarations --- CASTOR/AliCASTOR.cxx | 5 ++ EVGEN/AliGenBox.cxx | 4 ++ EVGEN/AliGenDoubleScan.cxx | 4 ++ EVGEN/AliGenExtFile.cxx | 4 ++ EVGEN/AliGenHIJINGpara.cxx | 4 ++ EVGEN/AliGenHijing.cxx | 5 ++ EVGEN/AliGenParam.cxx | 4 ++ EVGEN/AliGenScan.cxx | 4 ++ FMD/AliFMD.cxx | 6 ++ FMD/AliFMDv0.cxx | 5 ++ FMD/AliFMDv1.cxx | 4 ++ ITS/AliITS.cxx | 4 ++ ITS/AliITS.h | 1 + ITS/AliITSmodule.h | 2 +- ITS/AliITSsimulationSDD.cxx | 2 + ITS/AliITSv1.cxx | 4 ++ ITS/AliITSv3.cxx | 4 ++ ITS/AliITSv5.cxx | 4 ++ MUON/AliMUON.cxx | 15 +++-- MUON/AliMUON.h | 2 +- MUON/AliMUONDisplay.cxx | 9 ++- MUON/AliMUONEventReconstructor.cxx | 12 +++- MUON/AliMUONHitForRec.cxx | 9 ++- MUON/AliMUONHitMapA1.cxx | 9 ++- MUON/AliMUONHitMapA1.h | 6 +- MUON/AliMUONPoints.cxx | 6 ++ MUON/AliMUONSegmentationV0.h | 20 +++--- MUON/AliMUONSegmentationV01.cxx | 12 +++- MUON/AliMUONSegmentationV01.h | 6 +- MUON/AliMUONSegmentationV1.h | 12 ++-- MUON/AliMUONTrackParam.cxx | 7 ++ MUON/AliMUONTrackReconstructor.cxx | 27 ++++---- MUON/AliMUONTriggerLut.cxx | 7 ++ MUON/AliMUONv0.cxx | 4 ++ MUON/AliMUONv1.cxx | 7 ++ MUON/MUONLinkDef.h | 2 +- MUON/Makefile | 3 +- PHOS/AliPHOS.cxx | 1 + PHOS/AliPHOSGeometry.cxx | 4 +- PHOS/AliPHOSGeometry.h | 4 +- PHOS/AliPHOSIndexToObject.cxx | 2 + PHOS/AliPHOSv0.cxx | 2 + PHOS/AliPHOSv1.cxx | 2 + PHOS/AliPHOSv3.cxx | 1 + PHOS/AliPHOSv4.cxx | 3 + PHOS/Makefile | 2 +- PMD/AliPMD.cxx | 5 ++ PMD/AliPMDv0.cxx | 4 ++ PMD/AliPMDv1.cxx | 4 ++ PMD/AliPMDv2.cxx | 4 ++ RICH/AliRICH.cxx | 10 +++ RICH/AliRICHClusterFinder.cxx | 51 ++++++++++++--- RICH/AliRICHDetect.cxx | 10 ++- RICH/AliRICHDisplay.cxx | 16 +++-- RICH/AliRICHPatRec.cxx | 10 ++- RICH/AliRICHPoints.cxx | 5 ++ RICH/AliRICHResponseV0.cxx | 4 ++ RICH/RICHLinkDef.h | 2 +- START/AliSTART.cxx | 7 +- START/AliSTARTv0.cxx | 4 ++ START/AliSTARTv1.cxx | 1 + START/AliSTARTvertex.cxx | 5 ++ STEER/AliDetector.cxx | 19 ++++-- STEER/AliDetector.h | 16 ++--- STEER/AliDigitNew.h | 2 +- STEER/AliDisplay.cxx | 5 ++ STEER/AliDisplay.h | 8 +-- STEER/AliGenerator.cxx | 100 +++++++++++++++++++++++++++++ STEER/AliGenerator.h | 45 +++++-------- STEER/AliGeometry.h | 16 ++--- STEER/AliHeader.cxx | 5 +- STEER/AliHeader.h | 2 +- STEER/AliHit.h | 4 +- STEER/AliHitMap.h | 4 +- STEER/AliLego.cxx | 5 ++ STEER/AliLego.h | 3 +- STEER/AliMC.h | 4 +- STEER/AliMagF.cxx | 4 +- STEER/AliMagF.h | 3 +- STEER/AliMagFCM.h | 1 + STEER/AliMagFDM.cxx | 4 +- STEER/AliModule.cxx | 13 +++- STEER/AliModule.h | 32 +++++---- STEER/AliPoints.cxx | 4 ++ STEER/AliPoints.h | 8 +-- STEER/AliRecPoint.cxx | 14 +++- STEER/AliRecPoint.h | 25 +++----- STEER/AliRun.cxx | 40 +++++++++--- STEER/AliRun.h | 47 +++++++------- STEER/AliSegmentation.h | 22 +++---- STEER/Makefile | 7 +- STRUCT/AliABSO.cxx | 4 ++ STRUCT/AliABSOv0.cxx | 4 ++ STRUCT/AliBODY.cxx | 5 ++ STRUCT/AliDIPOv1.cxx | 5 ++ STRUCT/AliDIPOv2.cxx | 5 ++ STRUCT/AliFRAMEv0.cxx | 4 ++ STRUCT/AliFRAMEv1.cxx | 4 ++ STRUCT/AliHALL.cxx | 5 ++ STRUCT/AliMAG.cxx | 5 ++ STRUCT/AliPIPEv0.cxx | 4 ++ STRUCT/AliPIPEv1.cxx | 4 ++ STRUCT/AliPIPEv3.cxx | 5 ++ STRUCT/AliSHIL.cxx | 4 ++ STRUCT/AliSHILv0.cxx | 4 ++ TGeant3/AliGeant3.cxx | 5 ++ TGeant3/TGeant3.cxx | 4 ++ TOF/AliTOF.cxx | 7 ++ TOF/AliTOFD.cxx | 17 +++-- TOF/AliTOFv0.cxx | 5 ++ TOF/AliTOFv1.cxx | 6 ++ TOF/AliTOFv2.cxx | 6 ++ TOF/AliTOFv3.cxx | 5 ++ TOF/AliTOFv4.cxx | 5 ++ TPC/AliTPC.cxx | 32 +++++---- TPC/AliTPCv2.cxx | 4 ++ TPC/AliTPCv3.cxx | 4 ++ TRD/AliTRD.cxx | 7 ++ TRD/AliTRDclusterizer.cxx | 7 +- TRD/AliTRDclusterizerV0.cxx | 12 ++-- TRD/AliTRDclusterizerV1.cxx | 4 ++ TRD/AliTRDdigitizer.cxx | 13 ++-- TRD/AliTRDdigitsManager.cxx | 5 ++ TRD/AliTRDgeometry.cxx | 22 ++++--- TRD/AliTRDgeometry.h | 31 ++++----- TRD/AliTRDgeometryFull.cxx | 4 ++ TRD/AliTRDgeometryHole.cxx | 4 ++ TRD/AliTRDsegmentArray.cxx | 5 ++ ZDC/AliGenZDC.cxx | 14 ++-- ZDC/AliZDC.cxx | 4 ++ ZDC/AliZDCv1.cxx | 12 ++-- 131 files changed, 866 insertions(+), 310 deletions(-) diff --git a/CASTOR/AliCASTOR.cxx b/CASTOR/AliCASTOR.cxx index 780e6e899e5..5d5ba7fe596 100644 --- a/CASTOR/AliCASTOR.cxx +++ b/CASTOR/AliCASTOR.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.7 2000/01/19 17:16:41 fca +Introducing a list of lists of hits -- more hits allowed for detector now + Revision 1.6 1999/09/29 09:24:07 fca Introduction of the Copyright and cvs Log @@ -45,6 +48,8 @@ Introduction of the Copyright and cvs Log #include "AliCASTOR.h" #include #include +#include "TGeometry.h" +#include "AliMagF.h" #include "AliRun.h" #include "AliMC.h" #include "AliConst.h" diff --git a/EVGEN/AliGenBox.cxx b/EVGEN/AliGenBox.cxx index 1613e15b838..10fee115dfb 100644 --- a/EVGEN/AliGenBox.cxx +++ b/EVGEN/AliGenBox.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.2 2000/07/11 18:24:55 fca +Coding convention corrections + few minor bug fixes + Revision 1.1 2000/06/09 20:22:58 morsch Same class as previously in AliSimpleGen.cxx All coding rule violations except RS3 corrected (AM) @@ -60,6 +63,7 @@ Introduction of the Copyright and cvs Log #include "AliRun.h" #include "AliConst.h" #include "AliPDG.h" +#include "AliMC.h" ClassImp(AliGenBox) diff --git a/EVGEN/AliGenDoubleScan.cxx b/EVGEN/AliGenDoubleScan.cxx index c554d72263b..3224846770d 100644 --- a/EVGEN/AliGenDoubleScan.cxx +++ b/EVGEN/AliGenDoubleScan.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.2 2000/06/09 20:37:51 morsch +All coding rule violations except RS3 corrected + Revision 1.1 2000/02/23 16:25:14 morsch First commit of this file @@ -22,6 +25,7 @@ First commit of this file #include "AliGenDoubleScan.h" #include "AliRun.h" +#include "AliMC.h" ClassImp(AliGenDoubleScan) diff --git a/EVGEN/AliGenExtFile.cxx b/EVGEN/AliGenExtFile.cxx index 610664f6918..5854e886d42 100644 --- a/EVGEN/AliGenExtFile.cxx +++ b/EVGEN/AliGenExtFile.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.10 2000/07/11 18:24:55 fca +Coding convention corrections + few minor bug fixes + Revision 1.9 2000/06/14 15:20:09 morsch Include clean-up (IH) @@ -39,6 +42,7 @@ Introduction of the Copyright and cvs Log #include "AliRun.h" #include +#include #include #include diff --git a/EVGEN/AliGenHIJINGpara.cxx b/EVGEN/AliGenHIJINGpara.cxx index 3efb3a7627d..c2a60c03247 100644 --- a/EVGEN/AliGenHIJINGpara.cxx +++ b/EVGEN/AliGenHIJINGpara.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.2 2000/07/11 18:24:55 fca +Coding convention corrections + few minor bug fixes + Revision 1.1 2000/06/09 20:20:30 morsch Same class as previously in AliSimpleGen.cxx All coding rule violations except RS3 corrected (AM) @@ -42,6 +45,7 @@ All coding rule violations except RS3 corrected (AM) #include "AliGenHIJINGpara.h" #include "AliRun.h" +#include "AliMC.h" #include "AliConst.h" #include "AliPDG.h" diff --git a/EVGEN/AliGenHijing.cxx b/EVGEN/AliGenHijing.cxx index 252f7da66d3..3845f6d30ad 100644 --- a/EVGEN/AliGenHijing.cxx +++ b/EVGEN/AliGenHijing.cxx @@ -15,6 +15,10 @@ /* $Log$ +Revision 1.6 2000/09/11 13:23:37 morsch +Write last seed to file (fortran lun 50) and reed back from same lun using calls to +luget_hijing and luset_hijing. + Revision 1.5 2000/09/07 16:55:40 morsch fHijing->Initialize(); after change of parameters. (Dmitri Yurevitch Peressounko) @@ -36,6 +40,7 @@ AliGenerator interface class to HIJING using THijing (test version) #include "AliGenHijing.h" #include "AliGenHijingEventHeader.h" #include "AliRun.h" +#include "AliMC.h" #include #include diff --git a/EVGEN/AliGenParam.cxx b/EVGEN/AliGenParam.cxx index ed86d4d5c5e..14639cab020 100644 --- a/EVGEN/AliGenParam.cxx +++ b/EVGEN/AliGenParam.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.22 2000/09/12 14:14:55 morsch +Call fDecayer->ForceDecay() at the beginning of Generate(). + Revision 1.21 2000/09/08 15:39:01 morsch Handle the case fForceDecay=all during the generation, i.e. select all secondaries. @@ -59,6 +62,7 @@ Introduction of the Copyright and cvs Log #include "AliDecayerPythia.h" #include "AliGenMUONlib.h" #include "AliRun.h" +#include "AliMC.h" #include "AliPythia.h" #include #include diff --git a/EVGEN/AliGenScan.cxx b/EVGEN/AliGenScan.cxx index c3272cfe1ef..ca69cb926d2 100644 --- a/EVGEN/AliGenScan.cxx +++ b/EVGEN/AliGenScan.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.5 2000/06/09 20:37:20 morsch +All coding rule violations except RS3 corrected + Revision 1.4 1999/11/03 17:43:20 fca New version from G.Martinez & A.Morsch @@ -25,6 +28,7 @@ Introduction of the Copyright and cvs Log #include "AliGenScan.h" #include "AliRun.h" +#include "AliMC.h" ClassImp(AliGenScan) diff --git a/FMD/AliFMD.cxx b/FMD/AliFMD.cxx index fbb5a8d529d..f655458a986 100644 --- a/FMD/AliFMD.cxx +++ b/FMD/AliFMD.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.7 2000/01/19 17:16:47 fca +Introducing a list of lists of hits -- more hits allowed for detector now + Revision 1.6 1999/09/29 09:24:14 fca Introduction of the Copyright and cvs Log @@ -44,6 +47,9 @@ Introduction of the Copyright and cvs Log #include #include +#include + +#include "AliMC.h" #include "AliRun.h" #include "AliFMD.h" diff --git a/FMD/AliFMDv0.cxx b/FMD/AliFMDv0.cxx index a8f428f8156..f4580c2ce17 100644 --- a/FMD/AliFMDv0.cxx +++ b/FMD/AliFMDv0.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.7 1999/09/29 09:24:14 fca +Introduction of the Copyright and cvs Log + */ /////////////////////////////////////////////////////////////////////////////// @@ -39,6 +42,8 @@ $Log$ #include "AliRun.h" #include "AliFMDv0.h" #include "AliMC.h" +#include "AliMagF.h" + #include "stdlib.h" ClassImp(AliFMDv0) diff --git a/FMD/AliFMDv1.cxx b/FMD/AliFMDv1.cxx index d2dd9353c37..1990b266800 100644 --- a/FMD/AliFMDv1.cxx +++ b/FMD/AliFMDv1.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.9 2000/05/10 21:56:07 fca +Avoid clashes with ITS and add supports + Revision 1.7 1999/09/29 09:24:14 fca Introduction of the Copyright and cvs Log @@ -42,6 +45,7 @@ Introduction of the Copyright and cvs Log #include "AliRun.h" #include "AliFMDv1.h" #include "AliMC.h" +#include "AliMagF.h" #include "stdlib.h" ClassImp(AliFMDv1) diff --git a/ITS/AliITS.cxx b/ITS/AliITS.cxx index 9169e5b128f..9841ae5f2da 100644 --- a/ITS/AliITS.cxx +++ b/ITS/AliITS.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.20 2000/10/02 16:31:39 barbera +General code clean-up + Revision 1.9.2.14 2000/10/02 15:43:51 barbera General code clean-up (e.g., printf -> cout) @@ -125,6 +128,7 @@ the AliITS class. #include "AliITSmodule.h" #include "AliITSRecPoint.h" #include "AliITSRawCluster.h" +#include "AliMC.h" const Int_t AliITS::fgkNTYPES=3; diff --git a/ITS/AliITS.h b/ITS/AliITS.h index 2f2ef676535..f2ec4a7ee9e 100644 --- a/ITS/AliITS.h +++ b/ITS/AliITS.h @@ -11,6 +11,7 @@ #include "AliDetector.h" +#include "TObjArray.h" class TObjArray; class TString; diff --git a/ITS/AliITSmodule.h b/ITS/AliITSmodule.h index 4e14951805c..e65a776a6fb 100644 --- a/ITS/AliITSmodule.h +++ b/ITS/AliITSmodule.h @@ -10,7 +10,7 @@ class AliITS; class AliITShit; -class TArrayI; +#include "TArrayI.h" class AliITSmodule:public TObject{ diff --git a/ITS/AliITSsimulationSDD.cxx b/ITS/AliITSsimulationSDD.cxx index 2d702cb1ceb..28241607025 100644 --- a/ITS/AliITSsimulationSDD.cxx +++ b/ITS/AliITSsimulationSDD.cxx @@ -20,6 +20,8 @@ #include #include +#include +#include #include #include #include diff --git a/ITS/AliITSv1.cxx b/ITS/AliITSv1.cxx index 27c52f873fc..4aefeb46a19 100644 --- a/ITS/AliITSv1.cxx +++ b/ITS/AliITSv1.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.19 2000/07/10 16:07:19 fca +Release version of ITS code + Revision 1.14.2.2 2000/05/19 10:09:21 nilsen fix for bug with HP and Sun unix + fix for event display in ITS-working branch @@ -75,6 +78,7 @@ Introduction of the Copyright and cvs Log #include "AliMC.h" +#include "AliMagF.h" #include "AliConst.h" #include "AliITShit.h" diff --git a/ITS/AliITSv3.cxx b/ITS/AliITSv3.cxx index 345dcdac272..fe39aa8018c 100644 --- a/ITS/AliITSv3.cxx +++ b/ITS/AliITSv3.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.17 2000/07/10 16:07:19 fca +Release version of ITS code + Revision 1.11.4.4 2000/05/19 10:09:51 nilsen fix for bug with HP and Sun unix + fix for event display in ITS-working branch @@ -77,6 +80,7 @@ Introduction of the Copyright and cvs Log #include #include "AliMC.h" +#include "AliMagF.h" #include "AliConst.h" #include "AliITShit.h" diff --git a/ITS/AliITSv5.cxx b/ITS/AliITSv5.cxx index 810bf025a6b..a4b7ee77264 100644 --- a/ITS/AliITSv5.cxx +++ b/ITS/AliITSv5.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.23 2000/10/02 16:35:23 barbera +Forward declarations added + Revision 1.14.4.12 2000/10/02 16:04:03 barbera Forward declarations added @@ -76,6 +79,7 @@ Introduction of the Copyright and cvs Log #include #include "AliRun.h" +#include "AliMC.h" #include "TSystem.h" #if ALIITSPRINTGEOM==1 #include "../TGeant3/TGeant3.h" diff --git a/MUON/AliMUON.cxx b/MUON/AliMUON.cxx index d07d1f94e66..f51948f7b55 100644 --- a/MUON/AliMUON.cxx +++ b/MUON/AliMUON.cxx @@ -14,6 +14,12 @@ **************************************************************************/ /* $Log$ +Revision 1.30 2000/10/02 16:58:29 egangler +Cleaning of the code : +-> coding conventions +-> void Streamers +-> some useless includes removed or replaced by "class" statement + Revision 1.29 2000/07/28 13:49:38 morsch SetAcceptance defines inner and outer chamber radii according to angular acceptance. Can be used for simple acceptance studies. @@ -132,6 +138,7 @@ Log message added #include #include #include +#include #include #include #include @@ -1019,8 +1026,8 @@ void AliMUON::Digitise(Int_t nev,Int_t bgrEvent,Option_t *option,Option_t *opt,T if (mHit->fParticle == kMuonPlus || mHit->fParticle == kMuonMinus) { - xhit[nch][nmuon[nch]]=mHit->fX; - yhit[nch][nmuon[nch]]=mHit->fY; + xhit[nch][nmuon[nch]]=mHit->X(); + yhit[nch][nmuon[nch]]=mHit->Y(); nmuon[nch]++; if (nmuon[nch] >2) printf("nmuon %d\n",nmuon[nch]); } @@ -1138,8 +1145,8 @@ void AliMUON::Digitise(Int_t nev,Int_t bgrEvent,Option_t *option,Option_t *opt,T iChamber = &(pMUON->Chamber(nch)); Int_t rmin = (Int_t)iChamber->RInner(); Int_t rmax = (Int_t)iChamber->ROuter(); - Float_t xbgr=mHit->fX; - Float_t ybgr=mHit->fY; + Float_t xbgr=mHit->X(); + Float_t ybgr=mHit->Y(); Bool_t cond=kFALSE; for (Int_t imuon =0; imuon < nmuon[nch]; imuon++) { diff --git a/MUON/AliMUON.h b/MUON/AliMUON.h index 8c8b245334f..fcd45a6f4a2 100644 --- a/MUON/AliMUON.h +++ b/MUON/AliMUON.h @@ -24,7 +24,7 @@ class AliMUONRawCluster; class AliMUONClusterFinderVS; class AliMUONReconstHit; class TVector; -class TObjArray; +#include "TObjArray.h" class TFile; class TTree; diff --git a/MUON/AliMUONDisplay.cxx b/MUON/AliMUONDisplay.cxx index a560e2c71cf..bf69b800c4f 100644 --- a/MUON/AliMUONDisplay.cxx +++ b/MUON/AliMUONDisplay.cxx @@ -15,6 +15,10 @@ /* $Log$ +Revision 1.6 2000/07/03 11:54:57 morsch +AliMUONSegmentation and AliMUONHitMap have been replaced by AliSegmentation and AliHitMap in STEER +The methods GetPadIxy and GetPadXxy of AliMUONSegmentation have changed name to GetPadI and GetPadC. + Revision 1.5 2000/06/28 15:16:35 morsch (1) Client code adapted to new method signatures in AliMUONSegmentation (see comments there) to allow development of slat-muon chamber simulation and reconstruction code in the MUON @@ -119,6 +123,7 @@ it is now really the Z position of the chambers. #include #include #include +#include #include #include @@ -1123,11 +1128,11 @@ void AliMUONDisplay::LoadHits(Int_t chamber) points->SetMarkerColor(kRed); points->SetMarkerStyle(5); points->SetMarkerSize(1.); - points->SetParticle(mHit->fTrack); + points->SetParticle(mHit->Track()); points->SetHitIndex(hit); points->SetTrackIndex(track); points->SetDigitIndex(-1); - points->SetPoint(0,mHit->fX,mHit->fY,zpos); + points->SetPoint(0,mHit->X(),mHit->Y(),zpos); } nhold+=nhits; } diff --git a/MUON/AliMUONEventReconstructor.cxx b/MUON/AliMUONEventReconstructor.cxx index d687b063c65..b087050b33d 100644 --- a/MUON/AliMUONEventReconstructor.cxx +++ b/MUON/AliMUONEventReconstructor.cxx @@ -15,6 +15,12 @@ /* $Log$ +Revision 1.12 2000/10/02 16:58:29 egangler +Cleaning of the code : +-> coding conventions +-> void Streamers +-> some useless includes removed or replaced by "class" statement + Revision 1.11 2000/09/22 09:16:33 hristov Casting needed on DEC @@ -95,6 +101,7 @@ Addition of files for track reconstruction in C++ #include #include +#include #include "AliMUONEventReconstructor.h" #include "AliMUON.h" @@ -105,6 +112,7 @@ Addition of files for track reconstruction in C++ #include "AliMUONTrack.h" #include "AliMUONChamber.h" #include "AliMUONTrackHit.h" +#include "AliMagF.h" #include "AliRun.h" #include "TParticle.h" @@ -551,8 +559,8 @@ AliMUONHitForRec* AliMUONEventReconstructor::NewHitForRecFromGEANT(AliMUONHit* H // only if hit is efficient (keep track for checking ????) if (gRandom->Rndm() > fEfficiency) return NULL; // only if radius between RMin and RMax - bendCoor = Hit->fY; - nonBendCoor = Hit->fX; + bendCoor = Hit->Y(); + nonBendCoor = Hit->X(); radius = TMath::Sqrt((bendCoor * bendCoor) + (nonBendCoor * nonBendCoor)); if ((radius < fRMin[chamber]) || (radius > fRMax[chamber])) return NULL; // new AliMUONHitForRec from GEANT hit and increment number of AliMUONHitForRec's diff --git a/MUON/AliMUONHitForRec.cxx b/MUON/AliMUONHitForRec.cxx index d2abe2dabb0..cd421c68ee2 100644 --- a/MUON/AliMUONHitForRec.cxx +++ b/MUON/AliMUONHitForRec.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.3 2000/06/25 13:06:39 hristov +Inline functions moved from *.cxx to *.h files instead of forward declarations + Revision 1.2 2000/06/15 07:58:48 morsch Code from MUON-dev joined @@ -52,9 +55,9 @@ AliMUONHitForRec::AliMUONHitForRec(AliMUONHit* Ghit) // which are taken from the coordinates of the GEANT hit, // the track number (GEANT and not TH), // and the chamber number (0...). - fBendingCoor = Ghit->fY; - fNonBendingCoor = Ghit->fX; - fZ = Ghit->fZ; + fBendingCoor = Ghit->Y(); + fNonBendingCoor = Ghit->X(); + fZ = Ghit->Z(); // fTrack = Ghit->fTrack; ????????? fChamberNumber = Ghit->fChamber - 1; // other fields will be updated in diff --git a/MUON/AliMUONHitMapA1.cxx b/MUON/AliMUONHitMapA1.cxx index b1007ac4d6c..8ab453c05a7 100644 --- a/MUON/AliMUONHitMapA1.cxx +++ b/MUON/AliMUONHitMapA1.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.4 2000/07/13 16:19:44 fca +Mainly coding conventions + some small bug fixes + Revision 1.3 2000/07/03 11:54:57 morsch AliMUONSegmentation and AliMUONHitMap have been replaced by AliSegmentation and AliHitMap in STEER The methods GetPadIxy and GetPadXxy of AliMUONSegmentation have changed name to GetPadI and GetPadC. @@ -76,7 +79,7 @@ void AliMUONHitMapA1::Clear(const char *) memset(fHitMap,0,sizeof(int)*fMaxIndex); } -Int_t AliMUONHitMapA1::CheckedIndex(Int_t ix, Int_t iy) +Int_t AliMUONHitMapA1::CheckedIndex(Int_t ix, Int_t iy) const { // Return checked indices ix, iy Int_t index=2*fNpy*(ix+fNpx)+(iy+fNpy); @@ -125,13 +128,13 @@ void AliMUONHitMapA1::FlagHit(Int_t ix, Int_t iy) -TMath::Abs(fHitMap[CheckedIndex(ix, iy)]); } -Int_t AliMUONHitMapA1::GetHitIndex(Int_t ix, Int_t iy) +Int_t AliMUONHitMapA1::GetHitIndex(Int_t ix, Int_t iy) const { // Get absolute value of contents of hit cell ix,iy return TMath::Abs(fHitMap[CheckedIndex(ix, iy)])-1; } -TObject* AliMUONHitMapA1::GetHit(Int_t ix, Int_t iy) +TObject* AliMUONHitMapA1::GetHit(Int_t ix, Int_t iy) const { // Get pointer to object at hit cell ix, iy // Force crash if index does not exist ! (Manu) diff --git a/MUON/AliMUONHitMapA1.h b/MUON/AliMUONHitMapA1.h index 7840ac05d0b..bc3c50d418a 100644 --- a/MUON/AliMUONHitMapA1.h +++ b/MUON/AliMUONHitMapA1.h @@ -29,9 +29,9 @@ public AliHitMap // Delete a single hit virtual void DeleteHit(Int_t ix, Int_t iy); // Get index of hit in the list of digits - virtual Int_t GetHitIndex(Int_t ix, Int_t iy); + virtual Int_t GetHitIndex(Int_t ix, Int_t iy) const; // Get pointer to digit - virtual TObject* GetHit(Int_t ix, Int_t iy); + virtual TObject* GetHit(Int_t ix, Int_t iy) const; // Flag a hit as used virtual void FlagHit(Int_t ix, Int_t iy); // Test hit status @@ -41,7 +41,7 @@ public AliHitMap private: // Check index - Int_t CheckedIndex(Int_t ix, Int_t iy); + Int_t CheckedIndex(Int_t ix, Int_t iy) const; private: AliSegmentation *fSegmentation; // Chamber segmentation Int_t fNpx; // Maximum number of pads in x diff --git a/MUON/AliMUONPoints.cxx b/MUON/AliMUONPoints.cxx index fc9fd6c463a..2a6a6ac090d 100644 --- a/MUON/AliMUONPoints.cxx +++ b/MUON/AliMUONPoints.cxx @@ -14,6 +14,10 @@ **************************************************************************/ /* $Log$ +Revision 1.4 2000/07/03 11:54:57 morsch +AliMUONSegmentation and AliMUONHitMap have been replaced by AliSegmentation and AliHitMap in STEER +The methods GetPadIxy and GetPadXxy of AliMUONSegmentation have changed name to GetPadI and GetPadC. + Revision 1.3 2000/06/27 10:13:01 morsch Obsolete global variables removed from file. @@ -55,6 +59,8 @@ Log messages included #include "AliMUONRawCluster.h" +#include +#include #include #include #include diff --git a/MUON/AliMUONSegmentationV0.h b/MUON/AliMUONSegmentationV0.h index 34182e039a8..8e1ac07a11c 100644 --- a/MUON/AliMUONSegmentationV0.h +++ b/MUON/AliMUONSegmentationV0.h @@ -45,17 +45,17 @@ public AliSegmentation { // Get member data // // Pad size in x - virtual Float_t Dpx(){return fDpx;} + virtual Float_t Dpx() const {return fDpx;} // Pad size in y - virtual Float_t Dpy(){return fDpy;} + virtual Float_t Dpy() const {return fDpy;} // Pad size in x by Sector - virtual Float_t Dpx(Int_t) {return fDpx;} + virtual Float_t Dpx(Int_t) const {return fDpx;} // Pad size in y by Secto - virtual Float_t Dpy(Int_t) {return fDpy;} + virtual Float_t Dpy(Int_t) const {return fDpy;} // Maximum number of Pads in x - virtual Int_t Npx(){return fNpx;} + virtual Int_t Npx() const {return fNpx;} // Maximum number of Pads in y - virtual Int_t Npy(){return fNpy;} + virtual Int_t Npy() const {return fNpy;} // Set pad position virtual void SetPad(Int_t ix, Int_t iy); // Set hit position @@ -86,13 +86,13 @@ dummy); // // Current Pad during Integration // x-coordinaten - virtual Int_t Ix(){return fIx;} + virtual Int_t Ix() const {return fIx;} // y-coordinate - virtual Int_t Iy(){return fIy;} + virtual Int_t Iy() const {return fIy;} // current sector - virtual Int_t ISector(){return 1;} + virtual Int_t ISector() const {return 1;} // calculate sector from pad coordinates - virtual Int_t Sector(Int_t ix, Int_t iy) {return 1;} + virtual Int_t Sector(Int_t ix, Int_t iy) const {return 1;} // // Signal Generation Condition during Stepping virtual Int_t SigGenCond(Float_t x, Float_t y, Float_t z); diff --git a/MUON/AliMUONSegmentationV01.cxx b/MUON/AliMUONSegmentationV01.cxx index 32fd4a1f0e4..de2f89c1932 100644 --- a/MUON/AliMUONSegmentationV01.cxx +++ b/MUON/AliMUONSegmentationV01.cxx @@ -15,6 +15,12 @@ /* $Log$ +Revision 1.6 2000/10/02 16:58:29 egangler +Cleaning of the code : +-> coding conventions +-> void Streamers +-> some useless includes removed or replaced by "class" statement + Revision 1.5 2000/07/13 16:19:44 fca Mainly coding conventions + some small bug fixes @@ -74,14 +80,14 @@ AliMUONSegmentationV01::AliMUONSegmentationV01() (*fCorr)[2]=0; } -Float_t AliMUONSegmentationV01::Dpx(Int_t isec) +Float_t AliMUONSegmentationV01::Dpx(Int_t isec) const { // // Returns x-pad size for given sector isec - return fDpxD[isec]; + return fDpxD.At(isec); } -Float_t AliMUONSegmentationV01::Dpy(Int_t isec) +Float_t AliMUONSegmentationV01::Dpy(Int_t isec) const { // // Returns y-pad size for given sector isec diff --git a/MUON/AliMUONSegmentationV01.h b/MUON/AliMUONSegmentationV01.h index 1918e261073..9f039be9ddd 100644 --- a/MUON/AliMUONSegmentationV01.h +++ b/MUON/AliMUONSegmentationV01.h @@ -51,11 +51,11 @@ public AliMUONSegmentationV0 { // Get member data // // Pad size in x by Sector - virtual Float_t Dpx(Int_t isec); + virtual Float_t Dpx(Int_t isec) const; // Pad size in y by Sector - virtual Float_t Dpy(Int_t isec); + virtual Float_t Dpy(Int_t isec) const; // Max number of Pads in x - virtual Int_t Npx(){return fNpxS[fNsec-1][1]+1;} + virtual Int_t Npx() const {return fNpxS[fNsec-1][1]+1;} // virtual void SetPad(Int_t ix,Int_t iy); // diff --git a/MUON/AliMUONSegmentationV1.h b/MUON/AliMUONSegmentationV1.h index f768e7c5984..9593a060f5a 100644 --- a/MUON/AliMUONSegmentationV1.h +++ b/MUON/AliMUONSegmentationV1.h @@ -39,17 +39,17 @@ public AliSegmentation { // Get member data // // Pad size in x - virtual Float_t Dpx(){return fDpx;} + virtual Float_t Dpx() const {return fDpx;} // Pad size in y - virtual Float_t Dpy(){return fDpy;} + virtual Float_t Dpy() const {return fDpy;} // Pad size in x by Sector - virtual Float_t Dpx(Int_t i){return fDpx;} + virtual Float_t Dpx(Int_t i) const {return fDpx;} // Pad size in y by Sector - virtual Float_t Dpy(Int_t i){return fDpy;} + virtual Float_t Dpy(Int_t i)const {return fDpy;} // Maximum number of Pads in x - virtual Int_t Npx(){return fNpx;} + virtual Int_t Npx() const {return fNpx;} // Maximum number of Pads in y - virtual Int_t Npy(){return fNpy;} + virtual Int_t Npy() const {return fNpy;} // // Get the zone of segmentation virtual Int_t GetZone(Float_t X, Float_t Y); diff --git a/MUON/AliMUONTrackParam.cxx b/MUON/AliMUONTrackParam.cxx index 07dfee39412..1558622b982 100644 --- a/MUON/AliMUONTrackParam.cxx +++ b/MUON/AliMUONTrackParam.cxx @@ -15,6 +15,12 @@ /* $Log$ +Revision 1.7 2000/10/02 16:58:29 egangler +Cleaning of the code : +-> coding conventions +-> void Streamers +-> some useless includes removed or replaced by "class" statement + Revision 1.6 2000/09/19 09:49:50 gosset AliMUONEventReconstructor package * track extrapolation independent from reco_muon.F, use of AliMagF... @@ -68,6 +74,7 @@ Addition of files for track reconstruction in C++ #include "AliMUONTrackParam.h" #include "AliMUONChamber.h" #include "AliRun.h" +#include "AliMagF.h" ClassImp(AliMUONTrackParam) // Class implementation in ROOT context diff --git a/MUON/AliMUONTrackReconstructor.cxx b/MUON/AliMUONTrackReconstructor.cxx index 45131480324..b90a8486f2d 100644 --- a/MUON/AliMUONTrackReconstructor.cxx +++ b/MUON/AliMUONTrackReconstructor.cxx @@ -14,6 +14,9 @@ **************************************************************************/ /* $Log$ +Revision 1.2 2000/06/15 07:58:49 morsch +Code from MUON-dev joined + Revision 1.1.2.7 2000/06/09 22:06:29 morsch Some coding rule violations corrected. Will soon be obsolete. @@ -735,12 +738,12 @@ void trackf_read_fit(Int_t &ievr, Int_t &nev, Int_t &nhittot1, Int_t *izch, Doub { if (mHit->fChamber > 10) continue; TClonesArray *fPartArray = gAlice->Particles(); - Int_t ftrack = mHit->fTrack; + Int_t ftrack = mHit->Track(); Int_t id = ((TParticle*) fPartArray->UncheckedAt(ftrack))->GetPdgCode(); if (id==kMuonPlus||id==kMuonMinus) { - xgeant[nhittot1] = mHit->fY; - ygeant[nhittot1] = mHit->fX; + xgeant[nhittot1] = mHit->Y(); + ygeant[nhittot1] = mHit->X(); izch[nhittot1] = mHit->fChamber; // printf("id %d ch %d x %f y %f\n",id,izch[nhittot1],xgeant[nhittot1],ygeant[nhittot1]); nhittot1++; @@ -792,7 +795,7 @@ void trackf_read_geant(Int_t *itypg, Double_t *xtrg, Double_t *ytrg, Double_t *p if (mHit->fChamber > 10) continue; TClonesArray *fPartArray = gAlice->Particles(); TParticle *particle; - Int_t ftrack = mHit->fTrack; + Int_t ftrack = mHit->Track(); Int_t id = ((TParticle*) fPartArray->UncheckedAt(ftrack))->GetPdgCode(); // if (id==kMuonPlus||id==kMuonMinus) { @@ -800,8 +803,8 @@ void trackf_read_geant(Int_t *itypg, Double_t *xtrg, Double_t *ytrg, Double_t *p // inversion de x et y car le champ est inverse dans le programme tracking xtrg[maxidg] = 0; ytrg[maxidg] = 0; - xgeant[maxidg] = mHit->fY; // x-pos of hit - ygeant[maxidg] = mHit->fX; // y-pos of hit + xgeant[maxidg] = mHit->Y(); // x-pos of hit + ygeant[maxidg] = mHit->X(); // y-pos of hit clsize1[maxidg] = 0; // cluster size on 1-st cathode clsize2[maxidg] = 0; // cluster size on 2-nd cathode cx[maxidg] = mHit->fCyHit; // Px/P of hit @@ -891,8 +894,8 @@ void trackf_read_geant(Int_t *itypg, Double_t *xtrg, Double_t *ytrg, Double_t *p // inversion de x et y car le champ est inverse dans le programme tracking !!!! xtrg[maxidg] = 0; // only for reconstructed point ytrg[maxidg] = 0; // only for reconstructed point - xgeant[maxidg] = mHit->fY; // x-pos of hit - ygeant[maxidg] = mHit->fX; // y-pos of hit + xgeant[maxidg] = mHit->Y(); // x-pos of hit + ygeant[maxidg] = mHit->X(); // y-pos of hit clsize1[maxidg] = 0; // cluster size on 1-st cathode clsize2[maxidg] = 0; // cluster size on 2-nd cathode cx[maxidg] = mHit->fCyHit; // Px/P of hit @@ -901,7 +904,7 @@ void trackf_read_geant(Int_t *itypg, Double_t *xtrg, Double_t *ytrg, Double_t *p izch[maxidg] = mHit->fChamber; // chamber number ptotg[maxidg] = mHit->fPTot; // P of hit - Int_t ftrack = mHit->fTrack; + Int_t ftrack = mHit->Track(); Int_t id1 = ftrack; // track number Int_t idum = track+1; @@ -1001,13 +1004,13 @@ void trackf_read_spoint(Int_t *itypg, Double_t *xtrg, Double_t *ytrg, Double_t * AliMUONHit* mHit; mHit=(AliMUONHit*) (pMUONhits->UncheckedAt(ihit)); Int_t id = (Int_t) mHit->fParticle; - xgeant[mpoi] = mHit->fY; - ygeant[mpoi] = mHit->fX; + xgeant[mpoi] = mHit->Y(); + ygeant[mpoi] = mHit->X(); if (id == kMuonPlus) itypg[mpoi]=5; if (id == kMuonMinus) itypg[mpoi]=6; TParticle *particle; particle = (TParticle*) - (fPartArray->UncheckedAt(mHit->fTrack)); + (fPartArray->UncheckedAt(mHit->Track())); TParticle* particleM=(TParticle*) (fPartArray->UncheckedAt(particle->GetFirstMother())); Int_t iparent=particleM->GetPdgCode(); diff --git a/MUON/AliMUONTriggerLut.cxx b/MUON/AliMUONTriggerLut.cxx index 303758ce191..08385bb0005 100644 --- a/MUON/AliMUONTriggerLut.cxx +++ b/MUON/AliMUONTriggerLut.cxx @@ -14,6 +14,12 @@ **************************************************************************/ /* $Log$ +Revision 1.4 2000/10/02 16:58:29 egangler +Cleaning of the code : +-> coding conventions +-> void Streamers +-> some useless includes removed or replaced by "class" statement + Revision 1.3 2000/06/25 16:47:43 pcrochet pow replaced by TMath::Power @@ -27,6 +33,7 @@ pow replaced by TMath::Power #include "AliMUONPoints.h" #include "TMath.h" #include "TFile.h" +#include "TROOT.h" #include "TH3.h" #include diff --git a/MUON/AliMUONv0.cxx b/MUON/AliMUONv0.cxx index bf39510e3b4..c3855637489 100644 --- a/MUON/AliMUONv0.cxx +++ b/MUON/AliMUONv0.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.11 2000/06/27 07:31:07 morsch +fChambers = 0; deleted from constructor. + Revision 1.10 2000/06/26 14:02:38 morsch Add class AliMUONConstants with MUON specific constants using static memeber data and access methods. @@ -57,6 +60,7 @@ Gammas and neutrons are also scored in the stepmanager #include "AliMUONChamber.h" #include "AliRun.h" #include "AliMC.h" +#include "AliMagF.h" #include "AliMUONHit.h" #include "AliMUONPadHit.h" #include "AliCallf77.h" diff --git a/MUON/AliMUONv1.cxx b/MUON/AliMUONv1.cxx index 7ef9c849976..37518608b9f 100644 --- a/MUON/AliMUONv1.cxx +++ b/MUON/AliMUONv1.cxx @@ -15,6 +15,12 @@ /* $Log$ +Revision 1.6 2000/10/02 17:20:45 egangler +Cleaning of the code (continued ) : +-> coding conventions +-> void Streamers +-> some useless includes removed or replaced by "class" statement + Revision 1.5 2000/06/28 15:16:35 morsch (1) Client code adapted to new method signatures in AliMUONSegmentation (see comments there) to allow development of slat-muon chamber simulation and reconstruction code in the MUON @@ -58,6 +64,7 @@ Log messages included. #include "AliMUONv1.h" #include "AliRun.h" #include "AliMC.h" +#include "AliMagF.h" #include "AliCallf77.h" #include "AliConst.h" #include "AliMUONChamber.h" diff --git a/MUON/MUONLinkDef.h b/MUON/MUONLinkDef.h index 82aa277d5fa..08859ecbf30 100644 --- a/MUON/MUONLinkDef.h +++ b/MUON/MUONLinkDef.h @@ -2,7 +2,7 @@ #pragma link off all globals; #pragma link off all classes; #pragma link off all functions; -#pragma link C++ class AliMUON; +#pragma link C++ class AliMUON-; #pragma link C++ class AliMUONv0; #pragma link C++ class AliMUONv1; #pragma link C++ class AliMUONHit; diff --git a/MUON/Makefile b/MUON/Makefile index 7263061f661..8449ee32a5e 100644 --- a/MUON/Makefile +++ b/MUON/Makefile @@ -36,7 +36,8 @@ SRCS = AliMUONChamber.cxx AliMUONChamberTrigger.cxx \ # C++ Headers -HDRS = $(SRCS:.cxx=.h) MUONLinkDef.h +HDRS = $(SRCS:.cxx=.h) $(ROOTSYS)/include/TTree.h \ + $(ROOTSYS)/include/TMatrix.h MUONLinkDef.h # Library dictionary diff --git a/PHOS/AliPHOS.cxx b/PHOS/AliPHOS.cxx index 6999a967027..deb0b5bd236 100644 --- a/PHOS/AliPHOS.cxx +++ b/PHOS/AliPHOS.cxx @@ -34,6 +34,7 @@ #include "AliPHOS.h" #include "AliMC.h" #include "AliRun.h" +#include "AliMagF.h" ClassImp(AliPHOS) diff --git a/PHOS/AliPHOSGeometry.cxx b/PHOS/AliPHOSGeometry.cxx index 105bf524526..b32b8441cd6 100644 --- a/PHOS/AliPHOSGeometry.cxx +++ b/PHOS/AliPHOSGeometry.cxx @@ -173,7 +173,7 @@ void AliPHOSGeometry::ImpactOnEmc(const Double_t theta, const Double_t phi, Int_ } //____________________________________________________________________________ -void AliPHOSGeometry::GetGlobal(const AliRecPoint* RecPoint, TVector3 & gpos, TMatrix & gmat) +void AliPHOSGeometry::GetGlobal(const AliRecPoint* RecPoint, TVector3 & gpos, TMatrix & gmat) const { // Calculates the ALICE global coordinates of a RecPoint and the error matrix @@ -214,7 +214,7 @@ void AliPHOSGeometry::GetGlobal(const AliRecPoint* RecPoint, TVector3 & gpos, TM } //____________________________________________________________________________ -void AliPHOSGeometry::GetGlobal(const AliRecPoint* RecPoint, TVector3 & gpos) +void AliPHOSGeometry::GetGlobal(const AliRecPoint* RecPoint, TVector3 & gpos) const { // Calculates the ALICE global coordinates of a RecPoint diff --git a/PHOS/AliPHOSGeometry.h b/PHOS/AliPHOSGeometry.h index 88fbffc7800..ad0b7a0729d 100644 --- a/PHOS/AliPHOSGeometry.h +++ b/PHOS/AliPHOSGeometry.h @@ -46,8 +46,8 @@ public: virtual ~AliPHOSGeometry(void) ; static AliPHOSGeometry * GetInstance(const Text_t* name, const Text_t* title="") ; static AliPHOSGeometry * GetInstance() ; - virtual void GetGlobal(const AliRecPoint* RecPoint, TVector3 & gpos, TMatrix & gmat) ; - virtual void GetGlobal(const AliRecPoint* RecPoint, TVector3 & gpos) ; + virtual void GetGlobal(const AliRecPoint* RecPoint, TVector3 & gpos, TMatrix & gmat) const; + virtual void GetGlobal(const AliRecPoint* RecPoint, TVector3 & gpos) const; AliPHOSGeometry & operator = (const AliPHOSGeometry & rvalue) const { // assignement operator requested by coding convention diff --git a/PHOS/AliPHOSIndexToObject.cxx b/PHOS/AliPHOSIndexToObject.cxx index d09474e4844..d58a4ae9fc4 100644 --- a/PHOS/AliPHOSIndexToObject.cxx +++ b/PHOS/AliPHOSIndexToObject.cxx @@ -24,6 +24,8 @@ // --- ROOT system --- +#include "TTree.h" + // --- Standard library --- // --- AliRoot header files --- diff --git a/PHOS/AliPHOSv0.cxx b/PHOS/AliPHOSv0.cxx index eea59f33c62..685d1de932f 100644 --- a/PHOS/AliPHOSv0.cxx +++ b/PHOS/AliPHOSv0.cxx @@ -29,6 +29,7 @@ #include "TBRIK.h" #include "TNode.h" #include "TRandom.h" +#include "TGeometry.h" // --- Standard library --- @@ -43,6 +44,7 @@ #include "AliPHOSv0.h" #include "AliRun.h" #include "AliConst.h" +#include "AliMC.h" ClassImp(AliPHOSv0) diff --git a/PHOS/AliPHOSv1.cxx b/PHOS/AliPHOSv1.cxx index 905d764f84a..cfb83c0a32c 100644 --- a/PHOS/AliPHOSv1.cxx +++ b/PHOS/AliPHOSv1.cxx @@ -27,6 +27,7 @@ #include "TBRIK.h" #include "TNode.h" #include "TRandom.h" +#include "TTree.h" // --- Standard library --- @@ -44,6 +45,7 @@ #include "AliPHOSReconstructioner.h" #include "AliRun.h" #include "AliConst.h" +#include "AliMC.h" ClassImp(AliPHOSv1) diff --git a/PHOS/AliPHOSv3.cxx b/PHOS/AliPHOSv3.cxx index ac85d4eeb0f..80a25f1d81b 100644 --- a/PHOS/AliPHOSv3.cxx +++ b/PHOS/AliPHOSv3.cxx @@ -44,6 +44,7 @@ #include "AliPHOSDigit.h" #include "AliRun.h" #include "AliConst.h" +#include "AliMC.h" ClassImp(AliPHOSv3) diff --git a/PHOS/AliPHOSv4.cxx b/PHOS/AliPHOSv4.cxx index 77c1c3a56b9..edd162fbbcc 100644 --- a/PHOS/AliPHOSv4.cxx +++ b/PHOS/AliPHOSv4.cxx @@ -29,6 +29,8 @@ #include "TBRIK.h" #include "TNode.h" #include "TParticle.h" +#include "TTree.h" +#include "TGeometry.h" // --- Standard library --- @@ -39,6 +41,7 @@ #include "AliPHOSv4.h" #include "AliRun.h" #include "AliConst.h" +#include "AliMC.h" ClassImp(AliPHOSv4) diff --git a/PHOS/Makefile b/PHOS/Makefile index 33d1dd0c365..588aa7c5b07 100644 --- a/PHOS/Makefile +++ b/PHOS/Makefile @@ -24,7 +24,7 @@ SRCS = AliPHOS.cxx AliPHOSv0.cxx AliPHOSv1.cxx AliPHOSv2.cxx \ # C++ Headers -HDRS = $(SRCS:.cxx=.h) PHOSLinkDef.h +HDRS = $(SRCS:.cxx=.h) $(ROOTSYS)/include/TTree.h PHOSLinkDef.h # Library dictionary diff --git a/PMD/AliPMD.cxx b/PMD/AliPMD.cxx index c253c9b88e7..f6558b2d22b 100644 --- a/PMD/AliPMD.cxx +++ b/PMD/AliPMD.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.6 2000/01/19 17:17:06 fca +Introducing a list of lists of hits -- more hits allowed for detector now + Revision 1.5 1999/09/29 09:24:27 fca Introduction of the Copyright and cvs Log @@ -45,6 +48,8 @@ Introduction of the Copyright and cvs Log #include #include +#include + #include "AliPMD.h" #include "AliRun.h" #include "AliMC.h" diff --git a/PMD/AliPMDv0.cxx b/PMD/AliPMDv0.cxx index 931a85eec46..1b3c23ace76 100644 --- a/PMD/AliPMDv0.cxx +++ b/PMD/AliPMDv0.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.7 1999/10/06 13:05:52 fca +Temporary fix to keep the code working waiting for Y.Viyogi + Revision 1.6 1999/09/29 09:24:28 fca Introduction of the Copyright and cvs Log @@ -35,6 +38,7 @@ Introduction of the Copyright and cvs Log #include "AliRun.h" #include "AliMC.h" #include "AliConst.h" +#include "AliMagF.h" static Float_t smod2[3], smod3[3], smod4[3]; static Int_t maxbox, kdet; diff --git a/PMD/AliPMDv1.cxx b/PMD/AliPMDv1.cxx index 3b26be22f30..57cf4847da7 100644 --- a/PMD/AliPMDv1.cxx +++ b/PMD/AliPMDv1.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.8 2000/06/09 10:31:36 hristov +sqrt changed to TMath::Sqrt + Revision 1.7 1999/11/03 18:01:40 fca Remove non orthogonal unused matrix @@ -38,6 +41,7 @@ Introduction of the Copyright and cvs Log #include "AliPMDv1.h" #include "AliRun.h" #include "AliMC.h" +#include "AliMagF.h" #include "AliConst.h" static Int_t maxbox, kdet; diff --git a/PMD/AliPMDv2.cxx b/PMD/AliPMDv2.cxx index 411f4744933..cc6b04f1ffb 100644 --- a/PMD/AliPMDv2.cxx +++ b/PMD/AliPMDv2.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.6 1999/09/29 09:24:28 fca +Introduction of the Copyright and cvs Log + */ /////////////////////////////////////////////////////////////////////////////// @@ -31,6 +34,7 @@ $Log$ #include "AliPMDv2.h" #include "AliRun.h" #include "AliMC.h" +#include "AliMagF.h" #include "AliConst.h" static Float_t smod1[3], smod2[3], smod3[3], smod4[3]; diff --git a/RICH/AliRICH.cxx b/RICH/AliRICH.cxx index 1184ac732fa..f126e4e2d82 100644 --- a/RICH/AliRICH.cxx +++ b/RICH/AliRICH.cxx @@ -15,6 +15,12 @@ /* $Log$ + Revision 1.24 2000/10/02 15:43:17 jbarbosa + Fixed forward declarations. + Fixed honeycomb density. + Fixed cerenkov storing. + New electronics. + Revision 1.23 2000/09/13 10:42:14 hristov Minor corrections for HP, DEC and Sun; strings.h included @@ -56,6 +62,9 @@ #include #include #include +#include +#include + #include #include @@ -72,6 +81,7 @@ #include "AliRICHClusterFinder.h" #include "AliRun.h" #include "AliMC.h" +#include "AliMagF.h" #include "AliConst.h" #include "AliPDG.h" #include "AliPoints.h" diff --git a/RICH/AliRICHClusterFinder.cxx b/RICH/AliRICHClusterFinder.cxx index 4aaec3bbe4b..9c2ac5e84b2 100644 --- a/RICH/AliRICHClusterFinder.cxx +++ b/RICH/AliRICHClusterFinder.cxx @@ -15,6 +15,9 @@ /* $Log$ + Revision 1.5 2000/10/02 15:45:58 jbarbosa + Fixed forward declarations. + Revision 1.4 2000/06/12 19:01:29 morsch Clean-up bug in Centered() corrected. @@ -1126,12 +1129,42 @@ AliRICHClusterFinder& AliRICHClusterFinder::operator=(const AliRICHClusterFinder } - - - - - - - - - +//______________________________________________________________________________ +void AliRICHClusterFinder::Streamer(TBuffer &R__b) +{ + // Stream an object of class AliRICHClusterFinder. + + if (R__b.IsReading()) { + Version_t R__v = R__b.ReadVersion(); if (R__v) { } + TObject::Streamer(R__b); + R__b >> fSegmentation; + R__b >> fResponse; + R__b >> fRawClusters; + R__b >> fHitMap; + R__b >> fCogCorr; + R__b >> fDigits; + R__b >> fNdigits; + R__b >> fChamber; + R__b >> fNRawClusters; + R__b >> fNperMax; + R__b >> fDeclusterFlag; + R__b >> fClusterSize; + R__b >> fNPeaks; + } else { + R__b.WriteVersion(AliRICHClusterFinder::IsA()); + TObject::Streamer(R__b); + R__b << fSegmentation; + R__b << fResponse; + R__b << fRawClusters; + R__b << fHitMap; + R__b << fCogCorr; + R__b << fDigits; + R__b << fNdigits; + R__b << fChamber; + R__b << fNRawClusters; + R__b << fNperMax; + R__b << fDeclusterFlag; + R__b << fClusterSize; + R__b << fNPeaks; + } +} diff --git a/RICH/AliRICHDetect.cxx b/RICH/AliRICHDetect.cxx index 3cba63e9329..8836c99ecfd 100644 --- a/RICH/AliRICHDetect.cxx +++ b/RICH/AliRICHDetect.cxx @@ -15,6 +15,9 @@ /* $Log$ + Revision 1.5 2000/06/30 16:30:28 dibari + Disabled writing to rechits. + Revision 1.4 2000/06/15 15:46:59 jbarbosa Corrected compilation errors on HP-UX (replaced pow with TMath::Power) @@ -37,6 +40,7 @@ #include "AliRICHDigit.h" #include "AliRun.h" #include "TParticle.h" +#include "TTree.h" #include "TMath.h" #include "TRandom.h" @@ -155,9 +159,9 @@ void AliRICHDetect::Detect() //printf("Aqui vou eu\n"); Int_t nch = mHit->fChamber; //printf("Aqui fui eu\n"); - trackglob[0] = mHit->fX; - trackglob[1] = mHit->fY; - trackglob[2] = mHit->fZ; + trackglob[0] = mHit->X(); + trackglob[1] = mHit->Y(); + trackglob[2] = mHit->Z(); cx=trackglob[0]; cy=trackglob[2]; diff --git a/RICH/AliRICHDisplay.cxx b/RICH/AliRICHDisplay.cxx index ac84d52faf6..5f4483967c2 100644 --- a/RICH/AliRICHDisplay.cxx +++ b/RICH/AliRICHDisplay.cxx @@ -15,6 +15,9 @@ /* $Log$ + Revision 1.6 2000/10/02 15:46:38 jbarbosa + Fixed forward declarations. + Revision 1.5 2000/06/30 16:49:34 dibari Different call for ring drawing. @@ -57,6 +60,7 @@ #include #include #include +#include #include #include #include @@ -990,7 +994,7 @@ void AliRICHDisplay::LoadHits(Int_t chamber) fPhits->AddAt(points,npoints); mHit = (AliRICHHit*)pRICHhits->UncheckedAt(hit); TParticle *current = - (TParticle*)(*gAlice->Particles())[mHit->fTrack]; + (TParticle*)(*gAlice->Particles())[mHit->Track()]; if (current->GetPdgCode() == 50000050) { points->SetMarkerColor(kBlue); } else if (current->GetPdgCode() == 50000051) { @@ -1000,11 +1004,11 @@ void AliRICHDisplay::LoadHits(Int_t chamber) } points->SetMarkerStyle(5); points->SetMarkerSize(1.); - points->SetParticle(mHit->fTrack); + points->SetParticle(mHit->Track()); points->SetHitIndex(hit); points->SetTrackIndex(track); points->SetDigitIndex(-1); - points->SetPoint(hit,mHit->fX, mHit->fY, mHit->fZ); + points->SetPoint(hit,mHit->X(), mHit->Y(), mHit->Z()); npoints++; } } @@ -1050,9 +1054,9 @@ void AliRICHDisplay::LoadCerenkovs(Int_t chamber) for (Int_t hit=0;hitUncheckedAt(hit); - (*xp)(npoints)=mCerenkov->fX; - (*yp)(npoints)=mCerenkov->fY; - (*zp)(npoints)=mCerenkov->fZ; + (*xp)(npoints)=mCerenkov->X(); + (*yp)(npoints)=mCerenkov->Y(); + (*zp)(npoints)=mCerenkov->Z(); (*ptrk)(npoints)=Float_t(mCerenkov->GetTrack()); (*phit)(npoints)=Float_t(hit); npoints++; diff --git a/RICH/AliRICHPatRec.cxx b/RICH/AliRICHPatRec.cxx index 2baf0e1729b..24d9675b988 100644 --- a/RICH/AliRICHPatRec.cxx +++ b/RICH/AliRICHPatRec.cxx @@ -15,6 +15,9 @@ /* $Log$ + Revision 1.5 2000/10/02 15:50:25 jbarbosa + Fixed forward declarations. + Revision 1.4 2000/06/30 16:33:43 dibari Several changes (ring drawing, fiducial selection, etc.) @@ -52,6 +55,7 @@ #include #include #include +#include ClassImp(AliRICHPatRec) @@ -202,9 +206,9 @@ Int_t AliRICHPatRec::TrackParam(Int_t itr, Int_t &ich) AliRICHHit* mHit=(AliRICHHit*)pRICH->FirstHit(-1); if(mHit==0) return 1; ich = mHit->fChamber-1; - trackglob[0] = mHit->fX; - trackglob[1] = mHit->fY; - trackglob[2] = mHit->fZ; + trackglob[0] = mHit->X(); + trackglob[1] = mHit->Y(); + trackglob[2] = mHit->Z(); pX = mHit->fMomX; pY = mHit->fMomY; pZ = mHit->fMomZ; diff --git a/RICH/AliRICHPoints.cxx b/RICH/AliRICHPoints.cxx index 82ef4e0d60a..8d209a971dd 100644 --- a/RICH/AliRICHPoints.cxx +++ b/RICH/AliRICHPoints.cxx @@ -15,6 +15,9 @@ /* $Log$ + Revision 1.4 2000/10/02 15:50:43 jbarbosa + Fixed forward declarations. + Revision 1.3 2000/06/12 15:26:36 jbarbosa Cleaned up version. @@ -40,12 +43,14 @@ // // /////////////////////////////////////////////////////////////////////////////// #include +#include #include #include #include #include #include +#include "TParticle.h" #include "AliRICHDisplay.h" #include "AliRICHPoints.h" #include "AliRun.h" diff --git a/RICH/AliRICHResponseV0.cxx b/RICH/AliRICHResponseV0.cxx index 410882e3d6f..9dcc7d5e95c 100644 --- a/RICH/AliRICHResponseV0.cxx +++ b/RICH/AliRICHResponseV0.cxx @@ -15,11 +15,15 @@ /* $Log$ + Revision 1.1 2000/06/12 15:29:37 jbarbosa + Cleaned up version. + */ #include "AliRICHResponseV0.h" #include "AliRICHSegmentation.h" #include "AliRun.h" +#include "AliMC.h" #include #include diff --git a/RICH/RICHLinkDef.h b/RICH/RICHLinkDef.h index ec1d7f5ae0e..04275da0b9a 100644 --- a/RICH/RICHLinkDef.h +++ b/RICH/RICHLinkDef.h @@ -29,7 +29,7 @@ #pragma link C++ class AliRICHHitMap; #pragma link C++ class AliRICHHitMapA1; #pragma link C++ class AliRICHTresholdMap; -#pragma link C++ class AliRICHClusterFinder; +#pragma link C++ class AliRICHClusterFinder-; #pragma link C++ class AliRICHPatRec; #endif diff --git a/START/AliSTART.cxx b/START/AliSTART.cxx index aafe78dd17c..03fb3479509 100755 --- a/START/AliSTART.cxx +++ b/START/AliSTART.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.9 2000/07/13 16:41:29 fca +New START corrected for coding conventions + Revision 1.8 2000/03/27 17:24:25 alla Modifing geometry @@ -271,8 +274,8 @@ void AliSTART::Hit2digit(Int_t evnum) startHit = (AliSTARThit*)fHits->UncheckedAt(hit); pmt=startHit->fPmt; e=startHit->fEtot; - x=startHit->fX; - y=startHit->fY; + x=startHit->X(); + y=startHit->Y(); volume = startHit->fVolume; if(volume==1){ timeright = startHit->fTime; diff --git a/START/AliSTARTv0.cxx b/START/AliSTARTv0.cxx index f4db1dc8135..d3019e06730 100755 --- a/START/AliSTARTv0.cxx +++ b/START/AliSTARTv0.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.8 2000/07/13 16:41:29 fca +New START corrected for coding conventions + Revision 1.7 2000/01/21 15:45:23 fca New Version from Alla @@ -47,6 +50,7 @@ Introduction of the Copyright and cvs Log #include "AliSTARTv0.h" #include "AliRun.h" #include "AliMC.h" +#include "AliMagF.h" #include "AliSTARThit.h" #include diff --git a/START/AliSTARTv1.cxx b/START/AliSTARTv1.cxx index 396466df125..79a103593b2 100755 --- a/START/AliSTARTv1.cxx +++ b/START/AliSTARTv1.cxx @@ -35,6 +35,7 @@ #include "AliSTARTv1.h" #include "AliRun.h" #include "AliMC.h" +#include "AliMagF.h" #include "AliSTARThit.h" #include diff --git a/START/AliSTARTvertex.cxx b/START/AliSTARTvertex.cxx index d9b3509a8c9..3abdf994bcf 100644 --- a/START/AliSTARTvertex.cxx +++ b/START/AliSTARTvertex.cxx @@ -14,11 +14,16 @@ **************************************************************************/ /* $Log$ +Revision 1.2 2000/07/13 16:41:29 fca +New START corrected for coding conventions + Revision 1.1 2000/03/24 17:46:58 alla Vertex reconstruction */ #include +#include + #include "AliSTARTvertex.h" #include "AliSTARTdigit.h" #include "AliSTARThit.h" diff --git a/STEER/AliDetector.cxx b/STEER/AliDetector.cxx index 1af996719c0..444deba7615 100644 --- a/STEER/AliDetector.cxx +++ b/STEER/AliDetector.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.6 2000/07/12 08:56:25 fca +Coding convention correction and warning removal + Revision 1.5 1999/09/29 09:24:29 fca Introduction of the Copyright and cvs Log @@ -37,14 +40,16 @@ Introduction of the Copyright and cvs Log //End_Html // // /////////////////////////////////////////////////////////////////////////////// -#include "AliDetector.h" -#include "AliRun.h" -#include "AliHit.h" -#include "AliPoints.h" #include #include #include +#include +#include "TBrowser.h" +#include "AliDetector.h" +#include "AliRun.h" +#include "AliHit.h" +#include "AliPoints.h" // Static variables for the hit iterator routines static Int_t sMaxIterHit=0; static Int_t sCurIterHit=0; @@ -219,9 +224,9 @@ void AliDetector::LoadPoints(Int_t) } else { fp = coor[trk]; } - fp[3*ntrk[trk] ] = ahit->fX; - fp[3*ntrk[trk]+1] = ahit->fY; - fp[3*ntrk[trk]+2] = ahit->fZ; + fp[3*ntrk[trk] ] = ahit->X(); + fp[3*ntrk[trk]+1] = ahit->Y(); + fp[3*ntrk[trk]+2] = ahit->Z(); ntrk[trk]++; } // diff --git a/STEER/AliDetector.h b/STEER/AliDetector.h index f451cdfe6dc..114a320bed2 100644 --- a/STEER/AliDetector.h +++ b/STEER/AliDetector.h @@ -6,7 +6,7 @@ /* $Id$ */ #include -#include +class AliHit; class AliDetector : public AliModule { @@ -20,12 +20,12 @@ public: // Inline functions void Copy(AliDetector &det) const; - virtual int GetNdigits() {return fNdigits;} - virtual int GetNhits() {return fNhits;} - TClonesArray *Digits() {return fDigits;} - TClonesArray *Hits() {return fHits;} - TObjArray *Points() {return fPoints;} - Int_t GetIshunt() {return fIshunt;} + virtual int GetNdigits() const {return fNdigits;} + virtual int GetNhits() const {return fNhits;} + TClonesArray *Digits() const {return fDigits;} + TClonesArray *Hits() const {return fHits;} + TObjArray *Points() const {return fPoints;} + Int_t GetIshunt() const {return fIshunt;} void SetIshunt(Int_t ishunt) {fIshunt=ishunt;} AliDetector &operator=(const AliDetector &det) {det.Copy(*this); return (*this);} @@ -40,7 +40,7 @@ public: virtual void ResetPoints(); virtual void SetTreeAddress(); virtual void SetTimeGate(Float_t gate) {fTimeGate=gate;} - virtual Float_t GetTimeGate() {return fTimeGate;} + virtual Float_t GetTimeGate() const {return fTimeGate;} virtual void StepManager() {} virtual void DrawModule() {} virtual AliHit* FirstHit(Int_t track); diff --git a/STEER/AliDigitNew.h b/STEER/AliDigitNew.h index bec71f741db..593eb0136ce 100644 --- a/STEER/AliDigitNew.h +++ b/STEER/AliDigitNew.h @@ -10,7 +10,7 @@ //////////////////////////////////////////////// #include "TObject.h" -#include "TClonesArray.h" +class TClonesArray; typedef TClonesArray DigitsList ; diff --git a/STEER/AliDisplay.cxx b/STEER/AliDisplay.cxx index f4491f269be..01ab9780c6d 100644 --- a/STEER/AliDisplay.cxx +++ b/STEER/AliDisplay.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.9 2000/07/13 16:19:09 fca +Mainly coding conventions + some small bug fixes + Revision 1.8 2000/07/11 18:24:59 fca Coding convention corrections + few minor bug fixes @@ -64,6 +67,8 @@ Introduction of the Copyright and cvs Log #include "AliDisplay.h" #include "AliPoints.h" #include "TParticle.h" +#include "AliGeometry.h" +#include "TGeometry.h" static const Float_t kptcutmax = 2; static const Float_t ketacutmax = 1.5; diff --git a/STEER/AliDisplay.h b/STEER/AliDisplay.h index d670b948eba..1fe233f72b5 100644 --- a/STEER/AliDisplay.h +++ b/STEER/AliDisplay.h @@ -31,7 +31,7 @@ public: AliDisplay(Int_t size); AliDisplay(const AliDisplay &disp); virtual ~AliDisplay(); - virtual Bool_t AllViews() {return fDrawAllViews;} + virtual Bool_t AllViews() const {return fDrawAllViews;} virtual void Clear(Option_t *option=""); TSlider *CutSlider() {return fCutSlider;} virtual void ShowTrack(Int_t trackNumber); // *MENU* @@ -50,11 +50,11 @@ public: virtual void EnableDetector(const char *name); // *MENU* TSlider *EtaSlider() {return fEtaSlider;} virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py); - Int_t GetZoomMode() {return fZoomMode;} + Int_t GetZoomMode() const {return fZoomMode;} virtual void LoadPoints(); - TPad *Pad() {return fPad;} + TPad *Pad() const {return fPad;} virtual void Paint(Option_t *option=""); - Float_t PTcut() {return fPTcut;} + Float_t PTcut() const {return fPTcut;} virtual void SetDrawHits(Bool_t draw=kTRUE) {fDrawHits=draw;} // *MENU* virtual void SetDrawParticles(Bool_t draw=kTRUE) {fDrawParticles=draw;} // *MENU* virtual void SetPTcut(Float_t ptcut=1.5); // *MENU* diff --git a/STEER/AliGenerator.cxx b/STEER/AliGenerator.cxx index 981e5583185..8b0f9e697ad 100644 --- a/STEER/AliGenerator.cxx +++ b/STEER/AliGenerator.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.7 2000/07/12 08:56:25 fca +Coding convention correction and warning removal + Revision 1.6 2000/07/11 18:24:59 fca Coding convention corrections + few minor bug fixes @@ -154,4 +157,101 @@ void AliGenerator::Init() // } +//_______________________________________________________________________ +void AliGenerator::SetOrigin(Float_t ox, Float_t oy, Float_t oz) +{ + // + // Set the vertex for the generated tracks + // + fOrigin[0]=ox; + fOrigin[1]=oy; + fOrigin[2]=oz; +} + +//_______________________________________________________________________ +void AliGenerator::SetOrigin(const TLorentzVector &o) +{ + // + // Set the vertex for the generated tracks + // + fOrigin[0]=o[0]; + fOrigin[1]=o[1]; + fOrigin[2]=o[2]; +} + +//_______________________________________________________________________ +void AliGenerator::SetSigma(Float_t sx, Float_t sy, Float_t sz) +{ + // + // Set the spread of the vertex + // + fOsigma[0]=sx; + fOsigma[1]=sy; + fOsigma[2]=sz; +} + +//_______________________________________________________________________ +void AliGenerator::SetMomentumRange(Float_t pmin, Float_t pmax) +{ + // + // Set the momentum range for the generated particles + // + fPMin = pmin; + fPMax = pmax; + SetBit(kMomentumRange); +} + +//_______________________________________________________________________ +void AliGenerator::SetPtRange(Float_t ptmin, Float_t ptmax) +{ + // + // Set the Pt range for the generated particles + // + fPtMin = ptmin; + fPtMax = ptmax; + SetBit(kPtRange); +} + +//_______________________________________________________________________ +void AliGenerator::SetPhiRange(Float_t phimin, Float_t phimax) +{ + // + // Set the Phi range for the generated particles + // + fPhiMin = TMath::Pi()*phimin/180; + fPhiMax = TMath::Pi()*phimax/180; SetBit(kPhiRange); +} + +//_______________________________________________________________________ +void AliGenerator::SetYRange(Float_t ymin=-100, Float_t ymax=100) +{ + // + // Set the Rapidity range for the generated particles + // + fYMin=ymin; + fYMax=ymax; + SetBit(kYRange); +} + +//_______________________________________________________________________ +void AliGenerator::SetVRange(Float_t vxmin, Float_t vxmax, + Float_t vymin, Float_t vymax, + Float_t vzmin, Float_t vzmax) +{ + // + // Set the vertex range for the generated particles + // + fVMin[0]=vxmin; fVMin[1]=vymin; fVMin[2]=vzmin; + fVMax[0]=vxmax; fVMax[1]=vymax; fVMax[2]=vzmax; + SetBit(kVertexRange); +} +//_______________________________________________________________________ +void AliGenerator::SetThetaRange(Float_t thetamin, Float_t thetamax) +{ + // + // Set the theta range for the generated particles + // + fThetaMin = TMath::Pi()*thetamin/180; + fThetaMax = TMath::Pi()*thetamax/180; SetBit(kThetaRange); +} diff --git a/STEER/AliGenerator.h b/STEER/AliGenerator.h index d52dae8a3a0..d773e9dbe86 100644 --- a/STEER/AliGenerator.h +++ b/STEER/AliGenerator.h @@ -28,34 +28,19 @@ class AliGenerator : public TNamed virtual ~AliGenerator(); virtual void Init(); void Copy(AliGenerator &gen) const; - virtual void SetOrigin(Float_t ox, Float_t oy, Float_t oz) - {fOrigin[0]=ox;fOrigin[1]=oy;fOrigin[2]=oz;} - virtual void SetOrigin(const TLorentzVector &o) - {fOrigin[0]=o[0];fOrigin[1]=o[1];fOrigin[2]=o[2];} - virtual void SetSigma(Float_t sx, Float_t sy, Float_t sz) - {fOsigma[0]=sx;fOsigma[1]=sy;fOsigma[2]=sz;} - virtual void SetMomentumRange(Float_t pmin=0, Float_t pmax=1.e10) - {fPMin = pmin; fPMax = pmax; SetBit(kMomentumRange);} - virtual void SetPtRange(Float_t ptmin=0, Float_t ptmax=1.e10) - {fPtMin = ptmin; fPtMax = ptmax; SetBit(kPtRange);} - virtual void SetPhiRange(Float_t phimin=-180., Float_t phimax=180) - {fPhiMin = TMath::Pi()*phimin/180; - fPhiMax = TMath::Pi()*phimax/180; SetBit(kPhiRange);} - virtual void SetYRange(Float_t ymin=-100, Float_t ymax=100) - {fYMin=ymin; fYMax=ymax; SetBit(kYRange);} + virtual void SetOrigin(Float_t ox, Float_t oy, Float_t oz); + virtual void SetOrigin(const TLorentzVector &o); + virtual void SetSigma(Float_t sx, Float_t sy, Float_t sz); + virtual void SetMomentumRange(Float_t pmin=0, Float_t pmax=1.e10); + virtual void SetPtRange(Float_t ptmin=0, Float_t ptmax=1.e10); + virtual void SetPhiRange(Float_t phimin=-180., Float_t phimax=180); + virtual void SetYRange(Float_t ymin=-100, Float_t ymax=100); virtual void SetVRange(Float_t vxmin, Float_t vxmax, Float_t vymin, Float_t vymax, - Float_t vzmin, Float_t vzmax) - { - fVMin[0]=vxmin; fVMin[1]=vymin; fVMin[2]=vzmin; - fVMax[0]=vxmax; fVMax[1]=vymax; fVMax[2]=vzmax; - SetBit(kVertexRange); - } + Float_t vzmin, Float_t vzmax); virtual void SetNumberParticles(Int_t npart=100) {fNpart=npart;} - virtual Int_t NumberParticles() {return fNpart;} - virtual void SetThetaRange(Float_t thetamin=0, Float_t thetamax=180) - {fThetaMin = TMath::Pi()*thetamin/180; - fThetaMax = TMath::Pi()*thetamax/180; SetBit(kThetaRange);} + virtual Int_t NumberParticles() const {return fNpart;} + virtual void SetThetaRange(Float_t thetamin=0, Float_t thetamax=180); virtual void Generate()=0; virtual void SetParentWeight(Float_t wgt) {fParentWeight=wgt;} virtual void SetChildWeight(Float_t wgt) {fChildWeight=wgt;} @@ -70,10 +55,10 @@ class AliGenerator : public TNamed // Getters - virtual void GetOrigin(Float_t &ox, Float_t &oy, Float_t &oz) - {ox=fOrigin[0];oy=fOrigin[1];oz=fOrigin[2];} - virtual void GetOrigin(TLorentzVector &o) - {o[0]=fOrigin[0];o[1]=fOrigin[1];o[2]=fOrigin[2];o[3]=0;} + virtual void GetOrigin(Float_t &ox, Float_t &oy, Float_t &oz) const + {ox=fOrigin.At(0);oy=fOrigin.At(1);oz=fOrigin.At(2);} + virtual void GetOrigin(TLorentzVector &o) const + {o[0]=fOrigin.At(0);o[1]=fOrigin.At(1);o[2]=fOrigin.At(2);o[3]=0;} protected: static TGenerator* fgMCEvGen; // Pointer to the generator @@ -103,7 +88,7 @@ protected: enum {kThetaRange=1, kVertexRange=2, kPhiRange=4, kPtRange=8, kYRange=32, kMomentumRange=16}; - ClassDef(AliGenerator,1) + ClassDef(AliGenerator,1) // Base class for event generators }; #endif diff --git a/STEER/AliGeometry.h b/STEER/AliGeometry.h index 943f53a414d..24cb14116dc 100644 --- a/STEER/AliGeometry.h +++ b/STEER/AliGeometry.h @@ -16,14 +16,8 @@ // --- ROOT system --- #include "TNamed.h" -#include "TVector3.h" - -// --- Standard library --- - -// --- AliRoot header files --- - -#include "AliRecPoint.h" - +class TVector3; +class TMatrix; class AliRecPoint; class AliGeometry : public TNamed { @@ -33,14 +27,14 @@ public: AliGeometry() ; // ctor virtual ~AliGeometry() ; // dtor - virtual void GetGlobal(const AliRecPoint * p, TVector3 & pos, TMatrix & mat) = 0 ; - virtual void GetGlobal(const AliRecPoint * p, TVector3 & pos) = 0 ; + virtual void GetGlobal(const AliRecPoint * p, TVector3 & pos, TMatrix & mat) const = 0; + virtual void GetGlobal(const AliRecPoint * p, TVector3 & pos) const = 0; protected: AliGeometry(const Text_t* name, const Text_t* title) : TNamed (name,title) {} - ClassDef(AliGeometry,1) // description , version 1 + ClassDef(AliGeometry,1) // Base class for detector geometry }; diff --git a/STEER/AliHeader.cxx b/STEER/AliHeader.cxx index 7119f6194d7..84a0f80f5d7 100644 --- a/STEER/AliHeader.cxx +++ b/STEER/AliHeader.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.3 2000/07/12 08:56:25 fca +Coding convention correction and warning removal + Revision 1.2 1999/09/29 09:24:29 fca Introduction of the Copyright and cvs Log @@ -61,7 +64,7 @@ void AliHeader::Reset(Int_t run, Int_t event) fEvent=event; } -void AliHeader::Dump() +void AliHeader::Print(const char *) { // // Dumps header content diff --git a/STEER/AliHeader.h b/STEER/AliHeader.h index 69ce3af32d0..efaab925ff8 100644 --- a/STEER/AliHeader.h +++ b/STEER/AliHeader.h @@ -30,7 +30,7 @@ public: virtual void SetEvent(Int_t event) {fEvent = event;} virtual Int_t GetEvent() const {return fEvent;} - virtual void Dump(); + virtual void Print(const char *opt=0); protected: Int_t fRun; //Run number diff --git a/STEER/AliHit.h b/STEER/AliHit.h index 9413cea319f..720f07b4525 100644 --- a/STEER/AliHit.h +++ b/STEER/AliHit.h @@ -8,7 +8,7 @@ #include "TObject.h" class AliHit : public TObject { -public: +protected: Int_t fTrack; // Track number Float_t fX; // X position of the hit Float_t fY; // Y position of the hit @@ -23,7 +23,7 @@ public: virtual Float_t X() const {return fX;} virtual Float_t Y() const {return fY;} virtual Float_t Z() const {return fZ;} - virtual Float_t Track() const {return fTrack;} + virtual Int_t Track() const {return fTrack;} ClassDef(AliHit,1) //Base class for all Alice hits }; diff --git a/STEER/AliHitMap.h b/STEER/AliHitMap.h index ed76c1df518..5e45a564163 100644 --- a/STEER/AliHitMap.h +++ b/STEER/AliHitMap.h @@ -24,9 +24,9 @@ public TObject { // Delete a single hit virtual void DeleteHit(Int_t ix, Int_t iy) =0; // Get index of hit in the list of digits - virtual Int_t GetHitIndex(Int_t ix, Int_t iy) =0; + virtual Int_t GetHitIndex(Int_t ix, Int_t iy) const =0; // Get pointer to digit - virtual TObject * GetHit(Int_t ix, Int_t iy) =0; + virtual TObject * GetHit(Int_t ix, Int_t iy) const =0; // Flag a hit as used virtual void FlagHit(Int_t ix, Int_t iy) =0; // Test hit status diff --git a/STEER/AliLego.cxx b/STEER/AliLego.cxx index 254a74c2a13..69bae9843ec 100644 --- a/STEER/AliLego.cxx +++ b/STEER/AliLego.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.17 2000/07/12 08:56:25 fca +Coding convention correction and warning removal + Revision 1.16 2000/05/26 08:35:03 fca Move the check on z after z has been retrieved @@ -79,11 +82,13 @@ Introduction of the Copyright and cvs Log ////////////////////////////////////////////////////////////// #include "TMath.h" + #include "AliLego.h" #include "AliLegoGenerator.h" #include "AliRun.h" #include "AliConst.h" #include "AliMC.h" +#include "TH2.h" ClassImp(AliLego) diff --git a/STEER/AliLego.h b/STEER/AliLego.h index 1257505b169..ca23ae9c8f3 100644 --- a/STEER/AliLego.h +++ b/STEER/AliLego.h @@ -13,7 +13,8 @@ // // /////////////////////////////////////////////////////////////////////////////// -#include +#include "TNamed.h" +class TH2F; class AliLegoGenerator; diff --git a/STEER/AliMC.h b/STEER/AliMC.h index 4de033072cb..080405c7069 100644 --- a/STEER/AliMC.h +++ b/STEER/AliMC.h @@ -14,7 +14,7 @@ /////////////////////////////////////////////////////////////////////////////// #include -#include +class TLorentzVector; class AliMC; class AliDecayer; @@ -204,7 +204,7 @@ class AliMC : public TNamed AliMC(const AliMC &) {} AliMC & operator=(const AliMC &) {return (*this);} - ClassDef(AliMC,1) //Geometry Interface Class + ClassDef(AliMC,1) //Virtual MonteCarlo Interface }; #endif diff --git a/STEER/AliMagF.cxx b/STEER/AliMagF.cxx index b03e5844d23..6e2a523172d 100644 --- a/STEER/AliMagF.cxx +++ b/STEER/AliMagF.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.6 2000/07/11 18:24:59 fca +Coding convention corrections + few minor bug fixes + Revision 1.5 2000/06/09 19:55:18 morsch Introduce new class AliMagFDM - Galina Chabratova @@ -30,7 +33,6 @@ Introduction of the Copyright and cvs Log #include "AliMagF.h" -#include "TSystem.h" #include #include diff --git a/STEER/AliMagF.h b/STEER/AliMagF.h index 15b7001671a..57a9e3c0824 100644 --- a/STEER/AliMagF.h +++ b/STEER/AliMagF.h @@ -6,7 +6,6 @@ /* $Id$ */ #include "TNamed.h" -#include "TVector.h" enum Field_t {kUndef=1, kConst=1, kConMesh=2, kDipoMap=3}; @@ -18,7 +17,7 @@ public: const Float_t factor, const Float_t fmax); virtual ~AliMagF() {} virtual void Field(Float_t *x, Float_t *b); - virtual Int_t Type() {return fType;} + virtual Int_t Type() const {return fType;} virtual Float_t Max() const {return fMax;} virtual Int_t Map() const {return fMap;} virtual Int_t Integ() const {return fInteg;} diff --git a/STEER/AliMagFCM.h b/STEER/AliMagFCM.h index 613f2d9ec9a..99395f5f6c9 100644 --- a/STEER/AliMagFCM.h +++ b/STEER/AliMagFCM.h @@ -6,6 +6,7 @@ /* $Id$ */ #include "AliMagF.h" +#include "TVector.h" class AliMagFCM : public AliMagF { diff --git a/STEER/AliMagFDM.cxx b/STEER/AliMagFDM.cxx index a677ee44a31..b418a99d294 100644 --- a/STEER/AliMagFDM.cxx +++ b/STEER/AliMagFDM.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.3 2000/07/13 16:19:09 fca +Mainly coding conventions + some small bug fixes + Revision 1.2 2000/07/12 08:56:25 fca Coding convention correction and warning removal @@ -312,7 +315,6 @@ if ((kfdZbg/100 +#include +#include +#include "TSystem.h" + #include "AliModule.h" #include "AliRun.h" #include "AliHit.h" #include "AliPoints.h" -#include -#include -#include +#include "AliMagF.h" +#include "AliMC.h" ClassImp(AliModule) diff --git a/STEER/AliModule.h b/STEER/AliModule.h index 72448c2e6fd..d8d7b977cb4 100644 --- a/STEER/AliModule.h +++ b/STEER/AliModule.h @@ -5,14 +5,14 @@ /* $Id$ */ -#include -#include -#include -#include -#include -#include -#include -#include +#include "TNamed.h" +#include "TAttLine.h" +#include "TAttMarker.h" + +//#include +class TClonesArray; +class TBrowser; +class TArrayI; class AliModule : public TNamed , public TAttLine, public TAttMarker { public: @@ -24,15 +24,15 @@ public: virtual ~AliModule(); // Inline functions - virtual int GetNdigits() {return 0;} - virtual int GetNhits() {return 0;} + virtual int GetNdigits() const {return 0;} + virtual int GetNhits() const {return 0;} virtual TArrayI *GetIdtmed() const {return fIdtmed;} virtual TList *Histograms() const {return fHistograms;} virtual TList *Nodes() const {return fNodes;} - virtual TClonesArray *Digits() {return 0;} - virtual TClonesArray *Hits() {return 0;} - virtual TObjArray *Points() {return 0;} - virtual Int_t GetIshunt() {return 0;} + virtual TClonesArray *Digits() const {return 0;} + virtual TClonesArray *Hits() const {return 0;} + virtual TObjArray *Points() const {return 0;} + virtual Int_t GetIshunt() const {return 0;} virtual void SetIshunt(Int_t) {} virtual Bool_t IsActive() const {return fActive;} virtual Bool_t IsFolder() const {return kTRUE;} @@ -87,10 +87,8 @@ public: virtual void ResetPoints() {} virtual void SetTreeAddress() {} virtual void SetTimeGate(Float_t) {} - virtual Float_t GetTimeGate() {return 1.e10;} + virtual Float_t GetTimeGate() const {return 1.e10;} virtual void StepManager() {} - //virtual AliHit* FirstHit(Int_t) {return 0;} - //virtual AliHit* NextHit() {return 0;} virtual void SetBufferSize(Int_t) {} virtual void SetEuclidFile(char *material,char *geometry=0); virtual void ReadEuclid(const char *filnam, char *topvol); diff --git a/STEER/AliPoints.cxx b/STEER/AliPoints.cxx index 9f5f9199d17..4b97767cc8b 100644 --- a/STEER/AliPoints.cxx +++ b/STEER/AliPoints.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.5 2000/07/11 18:24:59 fca +Coding convention corrections + few minor bug fixes + Revision 1.4 1999/09/29 09:24:29 fca Introduction of the Copyright and cvs Log @@ -38,6 +41,7 @@ Introduction of the Copyright and cvs Log #include "AliDetector.h" #include "TPad.h" #include "TView.h" +#include "TParticle.h" ClassImp(AliPoints) diff --git a/STEER/AliPoints.h b/STEER/AliPoints.h index c3c7aa9dfe2..0c1ff01e2b0 100644 --- a/STEER/AliPoints.h +++ b/STEER/AliPoints.h @@ -6,8 +6,8 @@ /* $Id$ */ #include "TPolyMarker3D.h" -#include "AliDetector.h" -#include "TParticle.h" +class AliDetector; +class TParticle; class AliPoints : public TPolyMarker3D { public: @@ -18,8 +18,8 @@ public: void Copy(AliPoints &pts) const; virtual Int_t DistancetoPrimitive(Int_t px, Int_t py); virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py); - AliDetector *GetDetector() {return fDetector;} - Int_t GetIndex() {return fIndex;} + AliDetector *GetDetector() const {return fDetector;} + Int_t GetIndex() const {return fIndex;} TParticle *GetParticle() const; virtual const Text_t *GetName() const; virtual void InspectParticle(); // *MENU* diff --git a/STEER/AliRecPoint.cxx b/STEER/AliRecPoint.cxx index 13cc66c2c2d..e03649a69c2 100644 --- a/STEER/AliRecPoint.cxx +++ b/STEER/AliRecPoint.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.5 2000/07/11 18:24:59 fca +Coding convention corrections + few minor bug fixes + Revision 1.4 2000/05/16 08:30:02 fca Using automatic streamer for c arrays @@ -33,7 +36,10 @@ Y.Schutz new classes for reconstruction //-*-C++-*- //_________________________________________________________________________ -// Base Class of Cluster (empty cxx needed by Root) +// Base Class for reconstructed space points +// usually coming from the clusterisation algorithms +// run on the digits +// //*-- Author : Yves Schutz SUBATECH ////////////////////////////////////////////////////////////////////////////// @@ -46,6 +52,8 @@ Y.Schutz new classes for reconstruction // --- AliRoot header files --- #include "AliRecPoint.h" +#include "AliGeometry.h" +#include "AliDigitNew.h" ClassImp(AliRecPoint) @@ -169,7 +177,7 @@ void AliRecPoint::GetCovarianceMatrix(TMatrix & mat) } //____________________________________________________________________________ -void AliRecPoint::GetLocalPosition(TVector3 & pos) +void AliRecPoint::GetLocalPosition(TVector3 & pos) const { // returns the position of the cluster in the local reference system of the sub-detector @@ -187,7 +195,7 @@ AliRecPoint & AliRecPoint::operator= (const AliRecPoint &recp) //____________________________________________________________________________ -void AliRecPoint::GetGlobalPosition(TVector3 & gpos, TMatrix & gmat) +void AliRecPoint::GetGlobalPosition(TVector3 & gpos, TMatrix & gmat) const { // returns the position of the cluster in the global reference system of ALICE // and the uncertainty on this position diff --git a/STEER/AliRecPoint.h b/STEER/AliRecPoint.h index 1b6f1565c26..daf0a5df0fc 100644 --- a/STEER/AliRecPoint.h +++ b/STEER/AliRecPoint.h @@ -13,25 +13,20 @@ // // //////////////////////////////////////////////// -// --- ROOT system --- - -#include "TObject.h" -#include "TVector3.h" -#include "TMatrix.h" -#include "TClonesArray.h" - // --- Standard library --- #include "assert.h" #include "iostream.h" -// --- AliRoot header files --- +// --- ROOT system --- -#include "AliDigitNew.h" -#include "AliGeometry.h" -//#include "AliTrack.h" +#include "TObject.h" +#include "TVector3.h" +class TMatrix; +// --- AliRoot header files --- +class AliDigitNew; class AliGeometry; class AliRecPoint : public TObject { @@ -47,11 +42,11 @@ public: void Copy(AliRecPoint &recp) const; virtual void GetCovarianceMatrix(TMatrix & mat) ; virtual AliGeometry * GetGeom() const { return fGeom; } - virtual void GetGlobalPosition(TVector3 & gpos, TMatrix & gmat) ; // return the global position in ALICE + virtual void GetGlobalPosition(TVector3 & gpos, TMatrix & gmat) const ; // return global position in ALICE virtual int * GetDigitsList(void) const { return fDigitsList ; } // virtual int * GetTracksList(void) const { return fTracksList ; } - virtual Float_t GetEnergy() {return fAmp; } - virtual void GetLocalPosition(TVector3 & pos) ; + virtual Float_t GetEnergy() const {return fAmp; } + virtual void GetLocalPosition(TVector3 & pos) const ; virtual Int_t GetDigitsMultiplicity(void) const { return fMulDigit ; } Int_t GetIndexInList() const { return fIndexInList ; } virtual Int_t GetMaximumDigitMultiplicity() const { return fMaxDigit; } @@ -76,7 +71,7 @@ protected: Int_t * fDigitsList ; //[fMulDigit] list of digit's indexes from which the point was reconstructed Int_t * fTracksList ; //[fMulTrack] list of tracks to which the point was assigned - ClassDef(AliRecPoint,1) + ClassDef(AliRecPoint,1) // Base class for reconstructed space points }; diff --git a/STEER/AliRun.cxx b/STEER/AliRun.cxx index e38ab486c48..d61ca9145f0 100644 --- a/STEER/AliRun.cxx +++ b/STEER/AliRun.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.41 2000/07/13 16:19:09 fca +Mainly coding conventions + some small bug fixes + Revision 1.40 2000/07/12 08:56:25 fca Coding convention correction and warning removal @@ -106,6 +109,10 @@ Introduction of the Copyright and cvs Log // // /////////////////////////////////////////////////////////////////////////////// +#include +#include +#include + #include #include #include @@ -113,6 +120,10 @@ Introduction of the Copyright and cvs Log #include #include #include +#include +#include +#include +#include "TBrowser.h" #include "TParticle.h" #include "AliRun.h" @@ -122,11 +133,10 @@ Introduction of the Copyright and cvs Log #include "AliMagFC.h" #include "AliMagFCM.h" #include "AliMagFDM.h" +#include "AliHit.h" + +#include "AliDetector.h" -#include -#include -#include - AliRun *gAlice; static AliHeader *gAliHeader; @@ -369,7 +379,7 @@ Int_t AliRun::DistancetoPrimitive(Int_t, Int_t) } //_____________________________________________________________________________ -void AliRun::DumpPart (Int_t i) +void AliRun::DumpPart (Int_t i) const { // // Dumps particle i in the stack @@ -379,7 +389,7 @@ void AliRun::DumpPart (Int_t i) } //_____________________________________________________________________________ -void AliRun::DumpPStack () +void AliRun::DumpPStack () const { // // Dumps the particle stack @@ -672,7 +682,7 @@ void AliRun::EnergySummary() } //_____________________________________________________________________________ -AliModule *AliRun::GetModule(const char *name) +AliModule *AliRun::GetModule(const char *name) const { // // Return pointer to detector from name @@ -681,7 +691,7 @@ AliModule *AliRun::GetModule(const char *name) } //_____________________________________________________________________________ -AliDetector *AliRun::GetDetector(const char *name) +AliDetector *AliRun::GetDetector(const char *name) const { // // Return pointer to detector from name @@ -690,7 +700,7 @@ AliDetector *AliRun::GetDetector(const char *name) } //_____________________________________________________________________________ -Int_t AliRun::GetModuleID(const char *name) +Int_t AliRun::GetModuleID(const char *name) const { // // Return galice internal detector identifier from name @@ -843,7 +853,7 @@ void AliRun::GetNextTrack(Int_t &mtrack, Int_t &ipart, Float_t *pmom, } //_____________________________________________________________________________ -Int_t AliRun::GetPrimary(Int_t track) +Int_t AliRun::GetPrimary(Int_t track) const { // // return number of primary that has generated track @@ -1458,6 +1468,16 @@ void AliRun::RunLego(const char *setup,Int_t ntheta,Float_t themin, SetGenerator(gen); } +//_____________________________________________________________________________ +void AliRun::SetConfigFunction(const char * config) +{ + // + // Set the signature of the function contained in Config.C to configure + // the run + // + fConfigFunction=config; +} + //_____________________________________________________________________________ void AliRun::SetCurrentTrack(Int_t track) { diff --git a/STEER/AliRun.h b/STEER/AliRun.h index 75914ec58c8..27964858751 100644 --- a/STEER/AliRun.h +++ b/STEER/AliRun.h @@ -5,24 +5,26 @@ /* $Id$ */ -#include -#include -#include +class TBrowser; +class TList; +class TTree; +class TGeometry; +class TDatabasePDG; +#include +#include #include -#include -#include -#include -#include "AliDetector.h" +class AliDetector; +class AliModule; +class AliMagF; +class AliMC; +class AliLego; +class AliDisplay; #include "AliHeader.h" -#include "AliMagF.h" -#include "AliMC.h" #include "AliGenerator.h" -class AliLego; enum {kKeepBit=1, kDaughtersBit=2, kDoneBit=4}; -class AliDisplay; class AliRun : public TNamed { public: @@ -44,8 +46,8 @@ public: Int_t CurrentTrack() const {return fCurrent;} AliDisplay *Display() { return fDisplay;} virtual Int_t DistancetoPrimitive(Int_t px, Int_t py); - virtual void DumpPart (Int_t i); - virtual void DumpPStack (); + virtual void DumpPart (Int_t i) const; + virtual void DumpPStack () const; virtual AliMagF *Field() const {return fField;} virtual void FillTree(); virtual void FinishPrimary(); @@ -58,13 +60,12 @@ public: Int_t GetRunNumber() const {return fRun;} void SetRunNumber(Int_t run) {fRun=run;} Int_t GetDebug() const {return fDebug;} - AliModule *GetModule(const char *name); - AliDetector *GetDetector(const char *name); - Int_t GetModuleID(const char *name); + AliModule *GetModule(const char *name) const; + AliDetector *GetDetector(const char *name) const; + Int_t GetModuleID(const char *name) const; virtual Int_t GetEvent(Int_t event); virtual void SetEvent(Int_t event) {fEvent=event;} - virtual void SetConfigFunction(const char * config="Config();") - {fConfigFunction=config;} + virtual void SetConfigFunction(const char * config="Config();"); virtual const char *GetConfigFunction() const {return fConfigFunction.Data();} TGeometry *GetGeometry(); @@ -72,8 +73,8 @@ public: virtual void GetNextTrack(Int_t &mtrack, Int_t &ipart, Float_t *pmom, Float_t &e, Float_t *vpos, Float_t *polar, Float_t &tof); - Int_t GetNtrack() {return fNtrack;} - virtual Int_t GetPrimary(Int_t track); + Int_t GetNtrack() const {return fNtrack;} + virtual Int_t GetPrimary(Int_t track) const; virtual void InitMC(const char *setup="Config.C"); virtual void Init(const char *setup="Config.C") {InitMC(setup);} Bool_t IsFolder() const {return kTRUE;} @@ -109,12 +110,12 @@ public: virtual Float_t TrackingZmax() const {return fTrZmax;} virtual Float_t TrackingRmax() const {return fTrRmax;} virtual void TrackingLimits( Float_t rmax=1.e10, Float_t zmax=1.e10) {fTrRmax=rmax; fTrZmax=zmax;} - virtual Int_t DetFromMate(Int_t i) { return (*fImedia)[i];} - virtual AliGenerator* Generator() {return fGenerator;} + virtual Int_t DetFromMate(Int_t i) const { return (*fImedia)[i];} + virtual AliGenerator* Generator() const {return fGenerator;} virtual void SetGenerator(AliGenerator *generator); virtual void ResetGenerator(AliGenerator *generator); virtual void EnergySummary(); - virtual const TDatabasePDG* PDGDB() const {return fPDGDB;} + virtual TDatabasePDG* PDGDB() const {return fPDGDB;} TTree *TreeD() {return fTreeD;} diff --git a/STEER/AliSegmentation.h b/STEER/AliSegmentation.h index cb7b64b5518..929863f5441 100644 --- a/STEER/AliSegmentation.h +++ b/STEER/AliSegmentation.h @@ -38,17 +38,17 @@ public TObject { // Get member data // // Pad size in x - virtual Float_t Dpx() = 0; + virtual Float_t Dpx() const = 0; // Pad size in y - virtual Float_t Dpy() = 0; + virtual Float_t Dpy() const = 0; // Pad size in x by Sector - virtual Float_t Dpx(Int_t) = 0; + virtual Float_t Dpx(Int_t) const = 0; // Pad size in y by Sector - virtual Float_t Dpy(Int_t) = 0; + virtual Float_t Dpy(Int_t) const = 0; // Maximum number of Pads in x - virtual Int_t Npx() = 0; + virtual Int_t Npx() const = 0; // Maximum number of Pads in y - virtual Int_t Npy() = 0; + virtual Int_t Npy() const = 0; // Set pad position virtual void SetPad(Int_t, Int_t) = 0; // Set hit position @@ -75,13 +75,13 @@ public TObject { // // Current pad cursor during disintegration // x-coordinate - virtual Int_t Ix() = 0; + virtual Int_t Ix() const = 0; // y-coordinate - virtual Int_t Iy() = 0; + virtual Int_t Iy() const = 0; // current sector - virtual Int_t ISector() = 0; + virtual Int_t ISector() const = 0; // calculate sector from pad coordinates - virtual Int_t Sector(Int_t ix, Int_t iy) = 0; + virtual Int_t Sector(Int_t ix, Int_t iy) const = 0; // // Signal Generation Condition during Stepping virtual Int_t SigGenCond(Float_t x, Float_t y, Float_t z) = 0; @@ -100,6 +100,6 @@ public TObject { // Get the correction Function virtual TF1* CorrFunc(Int_t) = 0; - ClassDef(AliSegmentation,1) //Segmentation virtual base class + ClassDef(AliSegmentation,1) //Segmentation abstract base class }; #endif diff --git a/STEER/Makefile b/STEER/Makefile index 396a18b1bef..e7e9f89d6b9 100644 --- a/STEER/Makefile +++ b/STEER/Makefile @@ -20,7 +20,7 @@ SRCS = AliDetector.cxx AliHeader.cxx AliMagF.cxx \ # C++ Headers -HDRS = $(SRCS:.cxx=.h) AliPDG.h STEERLinkDef.h +HDRS = $(SRCS:.cxx=.h) AliPDG.h $(ROOTSYS)/include/TH2.h STEERLinkDef.h # Library dictionary @@ -63,12 +63,11 @@ $(DICT): $(HDRS) depend: $(SRCS) -HEADERS = $(filter-out %LinkDef.h,$(HDRS) AliConst.h AliCallf77.h \ - Copyright.h) +HEADERS = $(SRCS:.cxx=.h) AliPDG.h AliConst.h AliCallf77.h TOCLEAN = $(OBJS) *Cint.cxx *Cint.h -CHECKS = $(patsubst %.cxx,check/%.viol,$(SRCS)) +CHECKS = $(patsubst %.cxx,check/%.viol,$(SRCS)) ############################### General Macros ################################ diff --git a/STRUCT/AliABSO.cxx b/STRUCT/AliABSO.cxx index 35fe220c1f4..b7f4b140f8f 100644 --- a/STRUCT/AliABSO.cxx +++ b/STRUCT/AliABSO.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.9 2000/06/11 12:32:12 morsch +Coding rule violations corrected + Revision 1.8 2000/02/23 13:46:04 morsch Detailed composition of insulation material. @@ -49,6 +52,7 @@ Introduction of the Copyright and cvs Log #include "AliABSO.h" #include "AliRun.h" +#include "AliMagF.h" #include "AliConst.h" ClassImp(AliABSO) diff --git a/STRUCT/AliABSOv0.cxx b/STRUCT/AliABSOv0.cxx index 2332d6d3d30..e6710369cc9 100644 --- a/STRUCT/AliABSOv0.cxx +++ b/STRUCT/AliABSOv0.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.6 2000/06/15 09:40:31 morsch +Obsolete typedef keyword removed + Revision 1.5 2000/06/12 19:39:01 morsch New structure of beam pipe and heating jacket. @@ -56,6 +59,7 @@ Standard version of ABSO #include "AliABSOv0.h" #include "AliRun.h" +#include "AliMC.h" #include "AliConst.h" ClassImp(AliABSOv0) diff --git a/STRUCT/AliBODY.cxx b/STRUCT/AliBODY.cxx index 4412b9a4cf1..1a4eaba44e6 100644 --- a/STRUCT/AliBODY.cxx +++ b/STRUCT/AliBODY.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.7 2000/06/11 12:32:51 morsch +Coding rule violations corrected + Revision 1.6 1999/09/29 09:24:30 fca Introduction of the Copyright and cvs Log @@ -42,6 +45,8 @@ Introduction of the Copyright and cvs Log /////////////////////////////////////////////////////////////////////////////// #include "AliRun.h" +#include "AliMC.h" +#include "AliMagF.h" #include "AliBODY.h" ClassImp(AliBODY) diff --git a/STRUCT/AliDIPOv1.cxx b/STRUCT/AliDIPOv1.cxx index a399d10f416..e0acb09da1d 100644 --- a/STRUCT/AliDIPOv1.cxx +++ b/STRUCT/AliDIPOv1.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.7 2000/06/11 12:33:34 morsch +Coding rule violations corrected + Revision 1.6 1999/09/29 09:24:30 fca Introduction of the Copyright and cvs Log @@ -42,6 +45,8 @@ Introduction of the Copyright and cvs Log #include "AliDIPOv1.h" #include "AliRun.h" +#include "AliMC.h" +#include "AliMagF.h" ClassImp(AliDIPOv1) diff --git a/STRUCT/AliDIPOv2.cxx b/STRUCT/AliDIPOv2.cxx index 2490a5bd9d3..a7da06cc2c0 100644 --- a/STRUCT/AliDIPOv2.cxx +++ b/STRUCT/AliDIPOv2.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.12 2000/06/20 10:53:01 morsch +Volume placed outside mother volume (DDIP) corrected (Galina Chabratova) + Revision 1.11 2000/06/11 12:33:46 morsch Coding rule violations corrected @@ -53,6 +56,8 @@ Introduction of the Copyright and cvs Log #include "AliDIPOv2.h" #include "AliRun.h" +#include "AliMC.h" +#include "AliMagF.h" #include "AliConst.h" ClassImp(AliDIPOv2) diff --git a/STRUCT/AliFRAMEv0.cxx b/STRUCT/AliFRAMEv0.cxx index a838d8abd05..c20ce44ae86 100644 --- a/STRUCT/AliFRAMEv0.cxx +++ b/STRUCT/AliFRAMEv0.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.13 2000/06/11 12:34:49 morsch +Coding rule violations corrected + Revision 1.12 2000/02/23 16:25:24 fca AliVMC and AliGeant3 classes introduced ReadEuclid moved from AliRun to AliModule @@ -36,6 +39,7 @@ Introduction of the Copyright and cvs Log #include "AliFRAMEv0.h" #include "AliRun.h" +#include "AliMC.h" #include "TSystem.h" ClassImp(AliFRAMEv0) diff --git a/STRUCT/AliFRAMEv1.cxx b/STRUCT/AliFRAMEv1.cxx index 8b259aa39b3..1b4b68aa93c 100644 --- a/STRUCT/AliFRAMEv1.cxx +++ b/STRUCT/AliFRAMEv1.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.9 2000/06/11 12:35:02 morsch +Coding rule violations corrected + Revision 1.8 2000/02/23 16:25:24 fca AliVMC and AliGeant3 classes introduced ReadEuclid moved from AliRun to AliModule @@ -33,6 +36,7 @@ Introduction of the Copyright and cvs Log #include "AliFRAMEv1.h" #include "AliRun.h" +#include "AliMC.h" #include "TSystem.h" ClassImp(AliFRAMEv1) diff --git a/STRUCT/AliHALL.cxx b/STRUCT/AliHALL.cxx index ccae59db521..01de526a888 100644 --- a/STRUCT/AliHALL.cxx +++ b/STRUCT/AliHALL.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.9 2000/06/13 14:55:26 morsch +Unused variables removed + Revision 1.8 2000/06/11 12:35:41 morsch Coding rule violations corrected @@ -49,6 +52,8 @@ Introduction of the Copyright and cvs Log #include "AliHALL.h" #include "AliRun.h" +#include "AliMC.h" +#include "AliMagF.h" #include "AliConst.h" ClassImp(AliHALL) diff --git a/STRUCT/AliMAG.cxx b/STRUCT/AliMAG.cxx index b79058ab7ee..596528c4509 100644 --- a/STRUCT/AliMAG.cxx +++ b/STRUCT/AliMAG.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.7 2000/06/11 12:35:56 morsch +Coding rule violations corrected + Revision 1.6 1999/09/29 09:24:30 fca Introduction of the Copyright and cvs Log @@ -41,6 +44,8 @@ Introduction of the Copyright and cvs Log #include "AliMAG.h" #include "AliRun.h" +#include "AliMC.h" +#include "AliMagF.h" ClassImp(AliMAG) diff --git a/STRUCT/AliPIPEv0.cxx b/STRUCT/AliPIPEv0.cxx index dd339ee2fbc..3a2ded7d96a 100644 --- a/STRUCT/AliPIPEv0.cxx +++ b/STRUCT/AliPIPEv0.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.8 2000/06/11 12:37:01 morsch +Coding rule violations corrected + Revision 1.7 2000/02/23 16:25:24 fca AliVMC and AliGeant3 classes introduced ReadEuclid moved from AliRun to AliModule @@ -30,6 +33,7 @@ Introduction of the Copyright and cvs Log #include "AliPIPEv0.h" #include "AliRun.h" +#include "AliMC.h" #include "TSystem.h" ClassImp(AliPIPEv0) diff --git a/STRUCT/AliPIPEv1.cxx b/STRUCT/AliPIPEv1.cxx index f43b321dbd3..52dc328a1b6 100644 --- a/STRUCT/AliPIPEv1.cxx +++ b/STRUCT/AliPIPEv1.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.7 2000/06/11 12:37:25 morsch +Coding rule violations corrected + Revision 1.6 1999/09/29 09:24:30 fca Introduction of the Copyright and cvs Log @@ -34,6 +37,7 @@ Introduction of the Copyright and cvs Log #include "AliPIPEv1.h" #include "AliRun.h" +#include "AliMagF.h" #include "AliMC.h" ClassImp(AliPIPEv1) diff --git a/STRUCT/AliPIPEv3.cxx b/STRUCT/AliPIPEv3.cxx index 9b51b75c46c..124011eb2eb 100644 --- a/STRUCT/AliPIPEv3.cxx +++ b/STRUCT/AliPIPEv3.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.7 2000/06/11 12:38:00 morsch +Coding rule violations corrected + Revision 1.6 1999/10/06 19:57:07 fca Correct materials in pipe @@ -37,6 +40,8 @@ Introduction of the Copyright and cvs Log #include "AliPIPEv3.h" #include "AliRun.h" +#include "AliMC.h" +#include "AliMagF.h" ClassImp(AliPIPEv3) diff --git a/STRUCT/AliSHIL.cxx b/STRUCT/AliSHIL.cxx index cc243f90180..5dcec5265cd 100644 --- a/STRUCT/AliSHIL.cxx +++ b/STRUCT/AliSHIL.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.9 2000/06/11 12:38:40 morsch +Coding rule violations corrected + Revision 1.8 2000/02/23 13:48:33 morsch Detailed composition of insulation material. @@ -42,6 +45,7 @@ Introduction of the Copyright and cvs Log #include "AliSHIL.h" #include "AliRun.h" +#include "AliMagF.h" #include "AliConst.h" ClassImp(AliSHIL) diff --git a/STRUCT/AliSHILv0.cxx b/STRUCT/AliSHILv0.cxx index fe29ce0dd6f..62aa193296a 100644 --- a/STRUCT/AliSHILv0.cxx +++ b/STRUCT/AliSHILv0.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.9 2000/09/12 17:00:45 morsch +Overlaps in YMO3 and YMO4 (side-effect from last update only) corrected. + Revision 1.8 2000/09/12 16:11:43 morsch - Bug in volume YGO2 corrected: PCON started with twice the same z-value. - Recesses for chambers added to outer Pb cone. @@ -60,6 +63,7 @@ Standard version of SHIL #include "AliSHILv0.h" #include "AliRun.h" +#include "AliMC.h" #include "AliConst.h" ClassImp(AliSHILv0) diff --git a/TGeant3/AliGeant3.cxx b/TGeant3/AliGeant3.cxx index 7c7363163a3..873ae9184dd 100644 --- a/TGeant3/AliGeant3.cxx +++ b/TGeant3/AliGeant3.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.9 2000/09/12 14:36:17 morsch +In gudcay(): call ForceDecay() before Decay() + Revision 1.8 2000/09/06 14:56:34 morsch gudcay() method implemented. Decays are performed using the AliDecayer interface. The pointer to the instance of AliDecayer @@ -51,6 +54,8 @@ ReadEuclid moved from AliRun to AliModule #include "AliRun.h" #include "TGeant3.h" #include "AliCallf77.h" +#include "AliModule.h" +#include "AliMagF.h" #ifndef WIN32 diff --git a/TGeant3/TGeant3.cxx b/TGeant3/TGeant3.cxx index 49ffe991657..666d9c7eedb 100644 --- a/TGeant3/TGeant3.cxx +++ b/TGeant3/TGeant3.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.36 2000/09/14 07:08:41 fca +Introducing glvolu in the interface + Revision 1.35 2000/09/12 14:27:10 morsch No instance of AliDecayer created to initialize fDecayer. @@ -109,6 +112,7 @@ Introduction of the Copyright and cvs Log #include #include "AliCallf77.h" #include "AliDecayer.h" +#include "TLorentzVector.h" #ifndef WIN32 # define gzebra gzebra_ diff --git a/TOF/AliTOF.cxx b/TOF/AliTOF.cxx index c86060e75c5..19807d7bfd7 100644 --- a/TOF/AliTOF.cxx +++ b/TOF/AliTOF.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.15 2000/05/18 14:33:01 vicinanz +Modified to be full HP compliant + Revision 1.14 2000/05/15 19:32:36 fca Add AddHitList !! @@ -71,7 +74,11 @@ Introduction of the Copyright and cvs Log #include "TNode.h" #include "TObject.h" #include "TRandom.h" +#include "TTree.h" + #include "AliRun.h" +#include "AliMC.h" +#include "AliMagF.h" #include "AliConst.h" diff --git a/TOF/AliTOFD.cxx b/TOF/AliTOFD.cxx index 1deeab7ee59..5afb38a1c25 100644 --- a/TOF/AliTOFD.cxx +++ b/TOF/AliTOFD.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.2 2000/05/18 14:33:01 vicinanz +Modified to be full HP compliant + Revision 1.1 2000/05/10 16:52:18 vicinanz New TOF version with holes for PHOS/RICH @@ -249,7 +252,7 @@ void AliTOFRawSector::WriteSector() for(nRoc=1; nRoc<=14; nRoc++){ AliTOFRoc* currentRoc = (AliTOFRoc*)fRocData->UncheckedAt(nRoc); currentRoc->SetHeader(); - UInt_t RocHeader = currentRoc->Header; + // UInt_t RocHeader = currentRoc->Header; // fprintf(rawfile,RocHeader); } @@ -258,14 +261,14 @@ void AliTOFRawSector::WriteSector() Int_t rocItems = currentRoc->Items; for(Int_t nItem=1; nItem<=rocItems;nItem++){ - UInt_t TimeRow = currentRoc->GetTimeRow(nItem); + // UInt_t TimeRow = currentRoc->GetTimeRow(nItem); // fprintf(rawfile,TimeRow); - UInt_t ChrgRow = currentRoc->GetTimeRow(nItem); + // UInt_t ChrgRow = currentRoc->GetTimeRow(nItem); // fprintf(rawfile,ChrgRow); } } - UInt_t EndOfSector = GlobalCheckSum; + // UInt_t EndOfSector = GlobalCheckSum; // fprintf(rawfile,EndOfSector); } @@ -290,12 +293,12 @@ void AliTOFRawSector::ReadSector() currentRoc->SetHeader(RocHeader); } - UInt_t SCMWord; + // UInt_t SCMWord; // fscanf(rawfile,SCMWord); for(nRoc=1; nRoc<=14; nRoc++){ AliTOFRoc* currentRoc = (AliTOFRoc*)fRocData->UncheckedAt(nRoc); - Int_t Size = currentRoc->SetSize(); + // Int_t Size = currentRoc->SetSize(); Int_t nItems = currentRoc->Items; for(Int_t nrow=0; nrow<=nItems; nrow++){ UInt_t charRow,timeRow; @@ -304,7 +307,7 @@ void AliTOFRawSector::ReadSector() // fscanf(rawfile, timeRow); currentRoc->SetTime(nrow, timeRow); } - Int_t FinalWord; + // Int_t FinalWord; // fscanf(rawfile,FinalWord); } // fscanf(rawfile,GlobalCheckSum); diff --git a/TOF/AliTOFv0.cxx b/TOF/AliTOFv0.cxx index 85324ca1d54..0ed4e16c252 100644 --- a/TOF/AliTOFv0.cxx +++ b/TOF/AliTOFv0.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.16 2000/05/10 16:52:18 vicinanz +New TOF version with holes for PHOS/RICH + Revision 1.14.2.1 2000/05/10 09:37:16 vicinanz New version with Holes for PHOS/RICH @@ -72,9 +75,11 @@ Introduction of the Copyright and cvs Log #include "AliTOFv0.h" #include "TBRIK.h" +#include "TGeometry.h" #include "TNode.h" #include "TObject.h" #include "AliRun.h" +#include "AliMC.h" #include "AliConst.h" ClassImp(AliTOFv0) diff --git a/TOF/AliTOFv1.cxx b/TOF/AliTOFv1.cxx index 937463688d8..9f856101dfc 100644 --- a/TOF/AliTOFv1.cxx +++ b/TOF/AliTOFv1.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.17 2000/06/06 07:52:09 vicinanz +NodeName array dimension enlarged + Revision 1.16 2000/05/10 16:52:18 vicinanz New TOF version with holes for PHOS/RICH @@ -76,9 +79,12 @@ Introduction of the Copyright and cvs Log #include "AliTOFv1.h" #include "TBRIK.h" +#include "TGeometry.h" #include "TNode.h" #include "TObject.h" #include "AliRun.h" +#include "AliMC.h" +#include "AliMagF.h" #include "AliConst.h" diff --git a/TOF/AliTOFv2.cxx b/TOF/AliTOFv2.cxx index cce50d43643..0c89149357b 100644 --- a/TOF/AliTOFv2.cxx +++ b/TOF/AliTOFv2.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.16 2000/05/10 16:52:18 vicinanz +New TOF version with holes for PHOS/RICH + Revision 1.14.2.1 2000/05/10 09:37:16 vicinanz New version with Holes for PHOS/RICH @@ -73,9 +76,12 @@ Introduction of the Copyright and cvs Log #include "AliTOFv2.h" #include "TBRIK.h" +#include "TGeometry.h" #include "TNode.h" #include "TObject.h" #include "AliRun.h" +#include "AliMC.h" +#include "AliMagF.h" #include "AliConst.h" diff --git a/TOF/AliTOFv3.cxx b/TOF/AliTOFv3.cxx index d2faa91491e..03a6a71f2b9 100644 --- a/TOF/AliTOFv3.cxx +++ b/TOF/AliTOFv3.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.16 2000/05/10 16:52:18 vicinanz +New TOF version with holes for PHOS/RICH + Revision 1.14.2.1 2000/05/10 09:37:16 vicinanz New version with Holes for PHOS/RICH @@ -73,9 +76,11 @@ Introduction of the Copyright and cvs Log #include "AliTOFv3.h" #include "TBRIK.h" +#include "TGeometry.h" #include "TNode.h" #include "TObject.h" #include "AliRun.h" +#include "AliMC.h" #include "AliConst.h" diff --git a/TOF/AliTOFv4.cxx b/TOF/AliTOFv4.cxx index c8e467e81b2..2ee2718f294 100644 --- a/TOF/AliTOFv4.cxx +++ b/TOF/AliTOFv4.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.6 2000/05/10 16:52:18 vicinanz +New TOF version with holes for PHOS/RICH + Revision 1.4.2.1 2000/05/10 09:37:16 vicinanz New version with Holes for PHOS/RICH @@ -73,9 +76,11 @@ Introduction of the Copyright and cvs Log #include "AliTOFv4.h" #include "TBRIK.h" +#include "TGeometry.h" #include "TNode.h" #include "TObject.h" #include "AliRun.h" +#include "AliMC.h" #include "AliConst.h" diff --git a/TPC/AliTPC.cxx b/TPC/AliTPC.cxx index db43fe993ff..cfab1bffbcc 100644 --- a/TPC/AliTPC.cxx +++ b/TPC/AliTPC.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.22 2000/07/10 20:57:39 hristov +Update of TPC code and macros by M.Kowalski + Revision 1.19.2.4 2000/06/26 07:39:42 kowal2 Changes to obey the coding rules @@ -92,6 +95,7 @@ Introduction of the Copyright and cvs Log #include #include #include "AliMC.h" +#include "AliMagF.h" #include "AliTPCParamSR.h" @@ -770,14 +774,14 @@ void AliTPC::Hits2Clusters(TFile *of) if (tpcHit->fQ == 0.) continue; //information about track (I.Belikov) sector=tpcHit->fSector; // sector number if(sector != isec) continue; //terminate iteration - ipart=tpcHit->fTrack; + ipart=tpcHit->Track(); particle=(TParticle*)particles->UncheckedAt(ipart); pl=particle->Pz(); pt=particle->Pt(); if(pt < 1.e-9) pt=1.e-9; tanth=pl/pt; tanth = TMath::Abs(tanth); - rpad=TMath::Sqrt(tpcHit->fX*tpcHit->fX + tpcHit->fY*tpcHit->fY); + rpad=TMath::Sqrt(tpcHit->X()*tpcHit->X() + tpcHit->Y()*tpcHit->Y()); ratio=0.001*rpad/pt; // pt must be in MeV/c - historical reason // space-point resolutions @@ -803,15 +807,15 @@ void AliTPC::Hits2Clusters(TFile *of) // smearing --> rotate to the 1 (13) or to the 25 (49) sector, // then the inaccuracy in a X-Y plane is only along Y (pad row)! // - Float_t xprim= tpcHit->fX*cph + tpcHit->fY*sph; - Float_t yprim=-tpcHit->fX*sph + tpcHit->fY*cph; + Float_t xprim= tpcHit->X()*cph + tpcHit->Y()*sph; + Float_t yprim=-tpcHit->X()*sph + tpcHit->Y()*cph; xyz[0]=gRandom->Gaus(yprim,TMath::Sqrt(sigmaRphi)); // y Float_t alpha=(isec < fTPCParam->GetNInnerSector()) ? fTPCParam->GetInnerAngle() : fTPCParam->GetOuterAngle(); Float_t ymax=xprim*TMath::Tan(0.5*alpha); if (TMath::Abs(xyz[0])>ymax) xyz[0]=yprim; - xyz[1]=gRandom->Gaus(tpcHit->fZ,TMath::Sqrt(sigmaZ)); // z - if (TMath::Abs(xyz[1])>fTPCParam->GetZLength()) xyz[1]=tpcHit->fZ; + xyz[1]=gRandom->Gaus(tpcHit->Z(),TMath::Sqrt(sigmaZ)); // z + if (TMath::Abs(xyz[1])>fTPCParam->GetZLength()) xyz[1]=tpcHit->Z(); xyz[2]=tpcHit->fQ; // q xyz[3]=sigmaRphi; // fSigmaY2 xyz[4]=sigmaZ; // fSigmaZ2 @@ -819,7 +823,7 @@ void AliTPC::Hits2Clusters(TFile *of) AliTPCClustersRow *clrow=carray.GetRow(sector,tpcHit->fPadRow); if (!clrow) clrow=carray.CreateRow(sector,tpcHit->fPadRow); - Int_t tracks[3]={tpcHit->fTrack, -1, -1}; + Int_t tracks[3]={tpcHit->Track(), -1, -1}; AliTPCcluster cluster(xyz,tracks); clrow->InsertCluster(&cluster); nclusters++; @@ -906,12 +910,12 @@ void AliTPC::Hits2ExactClustersSector(Int_t isec) if (tpcHit==0) continue; sector=tpcHit->fSector; // sector number if(sector != isec) continue; - ipart=tpcHit->fTrack; + ipart=tpcHit->Track(); if (ipartUncheckedAt(ipart); //find row number - Float_t x[3]={tpcHit->fX,tpcHit->fY,tpcHit->fZ}; + Float_t x[3]={tpcHit->X(),tpcHit->Y(),tpcHit->Z()}; Int_t index[3]={1,isec,0}; Int_t currentrow = fTPCParam->GetPadRow(x,index) ; if (currentrow<0) continue; @@ -1435,7 +1439,7 @@ void AliTPC::MakeSector(Int_t isec,Int_t nrows,TTree *TH, Int_t sector=tpcHit->fSector; // sector number if(sector != isec) continue; - currentTrack = tpcHit->fTrack; // track number + currentTrack = tpcHit->Track(); // track number if(currentTrack != previousTrack){ // store already filled fTrack @@ -1469,7 +1473,7 @@ void AliTPC::MakeSector(Int_t isec,Int_t nrows,TTree *TH, //--------------------------------------------------- - Float_t time = 1.e6*(fTPCParam->GetZLength()-TMath::Abs(tpcHit->fZ)) + Float_t time = 1.e6*(fTPCParam->GetZLength()-TMath::Abs(tpcHit->Z())) /fTPCParam->GetDriftV(); // in microseconds! Float_t attProb = fTPCParam->GetAttCoef()* @@ -1483,9 +1487,9 @@ void AliTPC::MakeSector(Int_t isec,Int_t nrows,TTree *TH, for(Int_t nel=0;nelRndm(0)) < attProb) continue; // electron lost! - xyz[0]=tpcHit->fX; - xyz[1]=tpcHit->fY; - xyz[2]=tpcHit->fZ; + xyz[0]=tpcHit->X(); + xyz[1]=tpcHit->Y(); + xyz[2]=tpcHit->Z(); xyz[3]= (Float_t) (-gasgain*TMath::Log(gRandom->Rndm())); index[0]=1; diff --git a/TPC/AliTPCv2.cxx b/TPC/AliTPCv2.cxx index 0672615646e..b0d719c3851 100644 --- a/TPC/AliTPCv2.cxx +++ b/TPC/AliTPCv2.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.24 2000/08/28 10:02:30 kowal2 +Corrected bug in the StepManager + Revision 1.23 2000/07/10 20:57:39 hristov Update of TPC code and macros by M.Kowalski @@ -87,6 +90,7 @@ Introduction of the Copyright and cvs Log #include "AliTPCv2.h" #include "AliTPCDigitsArray.h" #include "AliRun.h" +#include "AliMC.h" #include "AliConst.h" #include "AliPDG.h" #include "AliTPCParam.h" diff --git a/TPC/AliTPCv3.cxx b/TPC/AliTPCv3.cxx index 05e521d8f29..0fec01b0c02 100644 --- a/TPC/AliTPCv3.cxx +++ b/TPC/AliTPCv3.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.15 2000/07/10 20:57:39 hristov +Update of TPC code and macros by M.Kowalski + Revision 1.14 2000/06/30 12:07:50 kowal2 Updated from the TPC-PreRelease branch @@ -81,6 +84,7 @@ Introduction of the Copyright and cvs Log #include #include "AliTPCv3.h" #include "AliRun.h" +#include "AliMC.h" #include "AliConst.h" #include "AliTPCDigitsArray.h" #include"AliTPCParam.h" diff --git a/TRD/AliTRD.cxx b/TRD/AliTRD.cxx index 12c4551271b..9105866f6ae 100644 --- a/TRD/AliTRD.cxx +++ b/TRD/AliTRD.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.21 2000/06/09 11:10:07 cblume +Compiler warnings and coding conventions, next round + Revision 1.20 2000/06/08 18:32:57 cblume Make code compliant to coding conventions @@ -69,6 +72,8 @@ Introduction of the Copyright and cvs Log #include #include #include +#include +#include #include "AliTRD.h" #include "AliRun.h" @@ -78,6 +83,8 @@ Introduction of the Copyright and cvs Log #include "AliTRDgeometryHole.h" #include "AliTRDgeometryFull.h" #include "AliTRDrecPoint.h" +#include "AliMagF.h" +#include "AliMC.h" ClassImp(AliTRD) diff --git a/TRD/AliTRDclusterizer.cxx b/TRD/AliTRDclusterizer.cxx index f13669d953f..dd2451dd8df 100644 --- a/TRD/AliTRDclusterizer.cxx +++ b/TRD/AliTRDclusterizer.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.4 2000/06/09 11:10:07 cblume +Compiler warnings and coding conventions, next round + Revision 1.3 2000/06/08 18:32:58 cblume Make code compliant to coding conventions @@ -35,8 +38,10 @@ Add new TRD classes // // /////////////////////////////////////////////////////////////////////////////// -#include "AliRun.h" +#include +#include +#include "AliRun.h" #include "AliTRD.h" #include "AliTRDclusterizer.h" diff --git a/TRD/AliTRDclusterizerV0.cxx b/TRD/AliTRDclusterizerV0.cxx index 789ebd61328..48091dee55d 100644 --- a/TRD/AliTRDclusterizerV0.cxx +++ b/TRD/AliTRDclusterizerV0.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.4 2000/06/08 18:32:58 cblume +Make code compliant to coding conventions + Revision 1.3 2000/06/07 16:27:01 cblume Try to remove compiler warnings on Sun and HP @@ -44,6 +47,7 @@ Add new TRD classes /////////////////////////////////////////////////////////////////////////////// #include +#include #include "AliTRDclusterizerV0.h" #include "AliTRDconst.h" @@ -162,10 +166,10 @@ Bool_t AliTRDclusterizerV0::MakeCluster() continue; Float_t pos[3]; - pos[0] = hit->fX; - pos[1] = hit->fY; - pos[2] = hit->fZ; - Int_t track = hit->fTrack; + pos[0] = hit->X(); + pos[1] = hit->Y(); + pos[2] = hit->Z(); + Int_t track = hit->Track(); Int_t detector = hit->GetDetector(); Int_t plane = geo->GetPlane(detector); Int_t sector = geo->GetSector(detector); diff --git a/TRD/AliTRDclusterizerV1.cxx b/TRD/AliTRDclusterizerV1.cxx index 8fd7c711ee4..520c521eb19 100644 --- a/TRD/AliTRDclusterizerV1.cxx +++ b/TRD/AliTRDclusterizerV1.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.7 2000/06/27 13:08:50 cblume +Changed to Copy(TObject &A) to appease the HP-compiler + Revision 1.6 2000/06/09 11:10:07 cblume Compiler warnings and coding conventions, next round @@ -42,6 +45,7 @@ Add new TRD classes /////////////////////////////////////////////////////////////////////////////// #include +#include #include "AliTRDclusterizerV1.h" #include "AliTRDmatrix.h" diff --git a/TRD/AliTRDdigitizer.cxx b/TRD/AliTRDdigitizer.cxx index bf508826e02..6c5c512b820 100644 --- a/TRD/AliTRDdigitizer.cxx +++ b/TRD/AliTRDdigitizer.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.8 2000/06/09 11:10:07 cblume +Compiler warnings and coding conventions, next round + Revision 1.7 2000/06/08 18:32:58 cblume Make code compliant to coding conventions @@ -62,6 +65,8 @@ Add new TRD classes #include #include #include +#include +#include #include "AliTRD.h" #include "AliTRDdigitizer.h" @@ -457,11 +462,11 @@ Bool_t AliTRDdigitizer::MakeDigits() AliTRDhit *hit = (AliTRDhit *) fTRD->Hits()->UncheckedAt(iHit); Float_t pos[3]; - pos[0] = hit->fX; - pos[1] = hit->fY; - pos[2] = hit->fZ; + pos[0] = hit->X(); + pos[1] = hit->Y(); + pos[2] = hit->Z(); Float_t q = hit->GetCharge(); - Int_t track = hit->fTrack; + Int_t track = hit->Track(); Int_t detector = hit->GetDetector(); Int_t plane = fGeo->GetPlane(detector); Int_t sector = fGeo->GetSector(detector); diff --git a/TRD/AliTRDdigitsManager.cxx b/TRD/AliTRDdigitsManager.cxx index b37b097b5e3..606d2a9ed6a 100644 --- a/TRD/AliTRDdigitsManager.cxx +++ b/TRD/AliTRDdigitsManager.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.5 2000/06/09 11:10:07 cblume +Compiler warnings and coding conventions, next round + Revision 1.4 2000/06/08 18:32:58 cblume Make code compliant to coding conventions @@ -36,6 +39,8 @@ Add new class AliTRDdigitsManager // // /////////////////////////////////////////////////////////////////////////////// +#include + #include "AliRun.h" #include "AliTRDdigitsManager.h" diff --git a/TRD/AliTRDgeometry.cxx b/TRD/AliTRDgeometry.cxx index b044a80c841..0988e586630 100644 --- a/TRD/AliTRDgeometry.cxx +++ b/TRD/AliTRDgeometry.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.4 2000/06/08 18:32:58 cblume +Make code compliant to coding conventions + Revision 1.3 2000/06/07 16:25:37 cblume Try to remove compiler warnings on Sun and HP @@ -37,6 +40,7 @@ Add new TRD classes #include "AliTRDgeometry.h" #include "AliTRDrecPoint.h" +#include "AliMC.h" ClassImp(AliTRDgeometry) @@ -290,7 +294,7 @@ void AliTRDgeometry::CreateGeometry(Int_t *idtmed) } //_____________________________________________________________________________ -Bool_t AliTRDgeometry::Local2Global(Int_t idet, Float_t *local, Float_t *global) +Bool_t AliTRDgeometry::Local2Global(Int_t idet, Float_t *local, Float_t *global) const { // // Converts local pad-coordinates (row,col,time) into @@ -307,7 +311,7 @@ Bool_t AliTRDgeometry::Local2Global(Int_t idet, Float_t *local, Float_t *global) //_____________________________________________________________________________ Bool_t AliTRDgeometry::Local2Global(Int_t iplan, Int_t icham, Int_t isect - , Float_t *local, Float_t *global) + , Float_t *local, Float_t *global) const { // // Converts local pad-coordinates (row,col,time) into @@ -358,7 +362,7 @@ Bool_t AliTRDgeometry::Rotate(Int_t d, Float_t *pos, Float_t *rot) } //_____________________________________________________________________________ -Bool_t AliTRDgeometry::RotateBack(Int_t d, Float_t *rot, Float_t *pos) +Bool_t AliTRDgeometry::RotateBack(Int_t d, Float_t *rot, Float_t *pos) const { // // Rotates a chambers from the position of sector 0 into its @@ -379,7 +383,7 @@ Bool_t AliTRDgeometry::RotateBack(Int_t d, Float_t *rot, Float_t *pos) } //_____________________________________________________________________________ -Int_t AliTRDgeometry::GetDetector(Int_t p, Int_t c, Int_t s) +Int_t AliTRDgeometry::GetDetector(Int_t p, Int_t c, Int_t s) const { // // Convert plane / chamber / sector into detector number @@ -390,7 +394,7 @@ Int_t AliTRDgeometry::GetDetector(Int_t p, Int_t c, Int_t s) } //_____________________________________________________________________________ -Int_t AliTRDgeometry::GetPlane(Int_t d) +Int_t AliTRDgeometry::GetPlane(Int_t d) const { // // Reconstruct the plane number from the detector number @@ -401,7 +405,7 @@ Int_t AliTRDgeometry::GetPlane(Int_t d) } //_____________________________________________________________________________ -Int_t AliTRDgeometry::GetChamber(Int_t d) +Int_t AliTRDgeometry::GetChamber(Int_t d) const { // // Reconstruct the chamber number from the detector number @@ -412,7 +416,7 @@ Int_t AliTRDgeometry::GetChamber(Int_t d) } //_____________________________________________________________________________ -Int_t AliTRDgeometry::GetSector(Int_t d) +Int_t AliTRDgeometry::GetSector(Int_t d) const { // // Reconstruct the sector number from the detector number @@ -423,7 +427,7 @@ Int_t AliTRDgeometry::GetSector(Int_t d) } //_____________________________________________________________________________ -void AliTRDgeometry::GetGlobal(const AliRecPoint *p, TVector3 &pos, TMatrix &mat) +void AliTRDgeometry::GetGlobal(const AliRecPoint *p, TVector3 &pos, TMatrix &mat) const { // // Returns the global coordinate and error matrix of a AliTRDrecPoint @@ -435,7 +439,7 @@ void AliTRDgeometry::GetGlobal(const AliRecPoint *p, TVector3 &pos, TMatrix &mat } //_____________________________________________________________________________ -void AliTRDgeometry::GetGlobal(const AliRecPoint *p, TVector3 &pos) +void AliTRDgeometry::GetGlobal(const AliRecPoint *p, TVector3 &pos) const { // // Returns the global coordinate and error matrix of a AliTRDrecPoint diff --git a/TRD/AliTRDgeometry.h b/TRD/AliTRDgeometry.h index 1847b28d2e7..820946990d4 100644 --- a/TRD/AliTRDgeometry.h +++ b/TRD/AliTRDgeometry.h @@ -10,6 +10,7 @@ #include "AliRun.h" #include "AliRecPoint.h" +#include "AliGeometry.h" #include "AliTRDconst.h" @@ -23,10 +24,10 @@ class AliTRDgeometry : public AliGeometry { virtual void CreateGeometry(Int_t *idtmed); virtual Int_t IsVersion() const = 0; virtual void Init(); - virtual Bool_t Local2Global(Int_t d, Float_t *local, Float_t *global); - virtual Bool_t Local2Global(Int_t p, Int_t c, Int_t s, Float_t *local, Float_t *global); + virtual Bool_t Local2Global(Int_t d, Float_t *local, Float_t *global) const; + virtual Bool_t Local2Global(Int_t p, Int_t c, Int_t s, Float_t *local, Float_t *global) const; virtual Bool_t Rotate(Int_t d, Float_t *pos, Float_t *rot); - virtual Bool_t RotateBack(Int_t d, Float_t *rot, Float_t *pos); + virtual Bool_t RotateBack(Int_t d, Float_t *rot, Float_t *pos) const; virtual void SetPHOShole() = 0; virtual void SetRICHhole() = 0; @@ -38,25 +39,25 @@ class AliTRDgeometry : public AliGeometry { virtual Bool_t GetPHOShole() = 0; virtual Bool_t GetRICHhole() = 0; - virtual Int_t GetDetector(Int_t p, Int_t c, Int_t s); - virtual Int_t GetPlane(Int_t d); - virtual Int_t GetChamber(Int_t d); - virtual Int_t GetSector(Int_t d); + virtual Int_t GetDetector(Int_t p, Int_t c, Int_t s) const; + virtual Int_t GetPlane(Int_t d) const; + virtual Int_t GetChamber(Int_t d) const; + virtual Int_t GetSector(Int_t d) const; virtual Int_t GetRowMax(Int_t p, Int_t c, Int_t s) { return fRowMax[p][c][s]; }; virtual Int_t GetColMax(Int_t p) { return fColMax[p]; }; virtual Int_t GetTimeMax() { return fTimeMax; }; - virtual Float_t GetRow0(Int_t p, Int_t c, Int_t s) { return fRow0[p][c][s]; }; - virtual Float_t GetCol0(Int_t p) { return fCol0[p]; }; - virtual Float_t GetTime0(Int_t p) { return fTime0[p]; }; + virtual Float_t GetRow0(Int_t p, Int_t c, Int_t s) const { return fRow0[p][c][s]; }; + virtual Float_t GetCol0(Int_t p) const { return fCol0[p]; }; + virtual Float_t GetTime0(Int_t p) const { return fTime0[p]; }; - virtual Float_t GetRowPadSize() { return fRowPadSize; }; - virtual Float_t GetColPadSize() { return fColPadSize; }; - virtual Float_t GetTimeBinSize() { return fTimeBinSize; }; + virtual Float_t GetRowPadSize() const { return fRowPadSize; }; + virtual Float_t GetColPadSize() const { return fColPadSize; }; + virtual Float_t GetTimeBinSize() const { return fTimeBinSize; }; - virtual void GetGlobal(const AliRecPoint *p, TVector3 &pos, TMatrix &mat); - virtual void GetGlobal(const AliRecPoint *p, TVector3 &pos); + virtual void GetGlobal(const AliRecPoint *p, TVector3 &pos, TMatrix &mat) const; + virtual void GetGlobal(const AliRecPoint *p, TVector3 &pos) const; protected: diff --git a/TRD/AliTRDgeometryFull.cxx b/TRD/AliTRDgeometryFull.cxx index 5e4a5303d69..008f2cf0b62 100644 --- a/TRD/AliTRDgeometryFull.cxx +++ b/TRD/AliTRDgeometryFull.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.3 2000/06/08 18:32:58 cblume +Make code compliant to coding conventions + Revision 1.2 2000/05/08 16:17:27 cblume Merge TRD-develop @@ -36,6 +39,7 @@ Add new TRD classes /////////////////////////////////////////////////////////////////////////////// #include "AliTRDgeometryFull.h" +#include "AliMC.h" ClassImp(AliTRDgeometryFull) diff --git a/TRD/AliTRDgeometryHole.cxx b/TRD/AliTRDgeometryHole.cxx index 73a34d88ae6..366b80721df 100644 --- a/TRD/AliTRDgeometryHole.cxx +++ b/TRD/AliTRDgeometryHole.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.2 2000/06/08 18:32:58 cblume +Make code compliant to coding conventions + Revision 1.1 2000/02/28 19:01:42 cblume Add new TRD classes @@ -27,6 +30,7 @@ Add new TRD classes /////////////////////////////////////////////////////////////////////////////// #include "AliTRDgeometryHole.h" +#include "AliMC.h" ClassImp(AliTRDgeometryHole) diff --git a/TRD/AliTRDsegmentArray.cxx b/TRD/AliTRDsegmentArray.cxx index 401f49b9f0a..4c6973b910a 100644 --- a/TRD/AliTRDsegmentArray.cxx +++ b/TRD/AliTRDsegmentArray.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.4 2000/06/27 13:08:50 cblume +Changed to Copy(TObject &A) to appease the HP-compiler + Revision 1.3 2000/06/08 18:32:58 cblume Make code compliant to coding conventions @@ -35,6 +38,8 @@ Add new TRD classes // // /////////////////////////////////////////////////////////////////////////////// +#include + #include "AliTRD.h" #include "AliTRDgeometry.h" #include "AliTRDsegmentArray.h" diff --git a/ZDC/AliGenZDC.cxx b/ZDC/AliGenZDC.cxx index ac87c05b089..084e1900c0e 100644 --- a/ZDC/AliGenZDC.cxx +++ b/ZDC/AliGenZDC.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.2 2000/07/11 11:12:34 fca +Some syntax corrections for non standard HP aCC + Revision 1.1 2000/07/10 13:58:01 fca New version of ZDC from E.Scomparin & C.Oppedisano @@ -24,9 +27,12 @@ Revision 1.6 1999/09/29 09:24:35 fca Introduction of the Copyright and cvs Log */ +#include + #include #include #include +#include "TDatabasePDG.h" #include "AliGenZDC.h" #include "AliConst.h" @@ -113,8 +119,7 @@ void AliGenZDC::Generate() if((fIpart==kProton) || (fIpart==kNeutron)){ ExtractFermi(fIpart,fPp,fProbintp,fProbintn,ddp); } - if(fIpart==kProton) {mass = 0.93956563;} - if(fIpart==kNeutron) {mass = 0.93827231;} + mass=gAlice->PDGDB()->GetParticle(fIpart)->Mass(); // printf(" pLABx = %f pLABy = %f pLABz = %f \n",pLab[0],pLab[1],pLab[2]); for(i=0; i<=2; i++){ balp[i] = -pLab[i]; @@ -189,12 +194,13 @@ void AliGenZDC::ExtractFermi(Int_t id, Double_t* fPp, Double_t* fProbintp, // Int_t i; Float_t xx = gRandom->Rndm(); + assert ( id==kProton && id==kNeutron ); if(id==kProton){ for(i=0; i<=200; i++){ if((xx>=fProbintp[i-1]) && (xx=fProbintn[i-1]) && (xx #include +#include "TGeometry.h" #include "AliZDC.h" #include "AliRun.h" diff --git a/ZDC/AliZDCv1.cxx b/ZDC/AliZDCv1.cxx index 07d4e0bce65..930dfbb4791 100644 --- a/ZDC/AliZDCv1.cxx +++ b/ZDC/AliZDCv1.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.4 2000/08/24 09:23:59 hristov +Bug in ZDC geometry corrected by E.Scomparin + Revision 1.3 2000/07/12 06:59:16 fca Fixing dimension of hits array @@ -47,6 +50,7 @@ Introduction of the Copyright and cvs Log #include "stdio.h" #include "AliZDCv1.h" #include "AliRun.h" +#include "AliMagF.h" #include "AliMC.h" #include "AliCallf77.h" #include "AliConst.h" @@ -1050,10 +1054,10 @@ void AliZDCv1::StepManager() // Int_t pcID = gMC->TrackPid(); // printf(" Pc %d in quadrant %d -> beta = %f \n", pcID, vol[1], beta); if(beta<0.67) return; - if((beta>=0.67) && (beta<=0.75)) ibeta = 0; - if((beta>0.75) && (beta<=0.85)) ibeta = 1; - if((beta>0.85) && (beta<=0.95)) ibeta = 2; - if((beta>0.95) && (beta<=1.00)) ibeta = 3; + else if((beta>=0.67) && (beta<=0.75)) ibeta = 0; + else if((beta>0.75) && (beta<=0.85)) ibeta = 1; + else if((beta>0.85) && (beta<=0.95)) ibeta = 2; + else ibeta = 3; // Angle between particle trajectory and fibre axis // 1 -> Momentum directions -- 2.43.0