From 0e46b9aedf22cba61c60921b7b19fb76d89a7a2e Mon Sep 17 00:00:00 2001 From: hristov Date: Thu, 20 Apr 2006 22:30:50 +0000 Subject: [PATCH] Coding conventions (Annalisa) --- TOF/AliTOF.cxx | 67 +++++++++---------- TOF/AliTOF.h | 31 ++++----- TOF/AliTOFAlignment.cxx | 26 ++++++-- TOF/AliTOFAlignment.h | 3 +- TOF/AliTOFCal.cxx | 12 ++-- TOF/AliTOFCal.h | 7 +- TOF/AliTOFCalPadZ.cxx | 12 ++-- TOF/AliTOFCalPadZ.h | 8 +-- TOF/AliTOFCalPlateA.cxx | 12 ++-- TOF/AliTOFCalPlateA.h | 9 ++- TOF/AliTOFCalPlateB.cxx | 12 ++-- TOF/AliTOFCalPlateB.h | 9 ++- TOF/AliTOFCalPlateC.cxx | 12 ++-- TOF/AliTOFCalPlateC.h | 9 ++- TOF/AliTOFCalSector.cxx | 11 +-- TOF/AliTOFCalSector.h | 11 +-- TOF/AliTOFCalStrip.cxx | 14 ++-- TOF/AliTOFCalStrip.h | 9 ++- TOF/AliTOFChSim.h | 2 +- TOF/AliTOFChannel.h | 2 +- TOF/AliTOFClusterFinder.cxx | 24 +++---- TOF/AliTOFClusterFinder.h | 4 +- TOF/AliTOFDDLRawData.cxx | 20 +++--- TOF/AliTOFDDLRawData.h | 12 ++-- TOF/AliTOFDigitMap.cxx | 7 +- TOF/AliTOFDigitMap.h | 22 +++--- TOF/AliTOFDigitizer.cxx | 64 +++++++++--------- TOF/AliTOFDigitizer.h | 27 ++++---- TOF/AliTOFGeometry.cxx | 7 +- TOF/AliTOFGeometry.h | 4 +- TOF/AliTOFGeometryV4.cxx | 12 ++-- TOF/AliTOFGeometryV4.h | 3 +- TOF/AliTOFGeometryV5.cxx | 13 ++-- TOF/AliTOFGeometryV5.h | 3 +- TOF/AliTOFHitMap.cxx | 4 -- TOF/AliTOFHitMap.h | 21 +++--- TOF/AliTOFRawStream.cxx | 17 +++-- TOF/AliTOFRawStream.h | 12 ++-- TOF/AliTOFReconstructor.cxx | 18 +++-- TOF/AliTOFReconstructor.h | 13 ++++ TOF/AliTOFSDigit.cxx | 32 ++++----- TOF/AliTOFSDigit.h | 9 ++- TOF/AliTOFSDigitizer.cxx | 130 +++++++++++++++++++----------------- TOF/AliTOFSDigitizer.h | 22 +++--- TOF/AliTOFT0.cxx | 91 +++++++++++++------------ TOF/AliTOFT0.h | 24 +++---- TOF/AliTOFTrigger.cxx | 8 ++- TOF/AliTOFTrigger.h | 12 ++-- TOF/AliTOFcalib.cxx | 40 ++++++----- TOF/AliTOFcalib.h | 17 +++-- TOF/AliTOFcalibESD.cxx | 4 ++ TOF/AliTOFcalibESD.h | 4 +- TOF/AliTOFcluster.cxx | 8 ++- TOF/AliTOFcluster.h | 11 ++- TOF/AliTOFdigit.cxx | 36 +++++----- TOF/AliTOFdigit.h | 10 +-- TOF/AliTOFhit.h | 10 +-- TOF/AliTOFhitT0.h | 6 +- TOF/AliTOFpidESD.cxx | 17 +++-- TOF/AliTOFpidESD.h | 7 +- TOF/AliTOFtrack.cxx | 25 ++++--- TOF/AliTOFtrack.h | 19 ++++-- TOF/AliTOFtracker.cxx | 42 +++++++----- TOF/AliTOFtracker.h | 30 +++++---- TOF/AliTOFtrackerMI.cxx | 42 +++++++----- TOF/AliTOFtrackerMI.h | 25 ++++--- TOF/AliTOFv4T0.cxx | 46 +++++++------ TOF/AliTOFv4T0.h | 20 +++--- TOF/AliTOFv5T0.cxx | 49 ++++++++------ TOF/AliTOFv5T0.h | 19 +++--- 70 files changed, 761 insertions(+), 639 deletions(-) diff --git a/TOF/AliTOF.cxx b/TOF/AliTOF.cxx index 741d01693fb..1612c6de088 100644 --- a/TOF/AliTOF.cxx +++ b/TOF/AliTOF.cxx @@ -39,43 +39,37 @@ */ //End_Html +#include "TFile.h" +#include "TFolder.h" +#include "TROOT.h" +#include "TTask.h" +#include "TTree.h" +#include "TVirtualMC.h" - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "AliLog.h" -#include "AliConfig.h" -#include "AliHeader.h" #include "AliConst.h" #include "AliLoader.h" -#include "AliMagF.h" +#include "AliLog.h" +#include "AliMC.h" #include "AliRun.h" -#include "AliTOF.h" -#include "AliTOFGeometry.h" -#include "AliTOFGeometryV4.h" -#include "AliTOFGeometryV5.h" -#include "AliTOFSDigit.h" + +#include "AliTOFDDLRawData.h" +#include "AliTOFDigitizer.h" #include "AliTOFdigit.h" -#include "AliTOFhit.h" #include "AliTOFhitT0.h" -#include "AliMC.h" -#include "AliTOFDigitizer.h" -#include "AliTOFDDLRawData.h" -#include "AliTOFcluster.h" +#include "AliTOFhit.h" +#include "AliTOFGeometry.h" +#include "AliTOFSDigitizer.h" +#include "AliTOFSDigit.h" +#include "AliTOF.h" + +class AliTOFcluster; + +extern TFile *gFile; +extern TROOT *gROOT; +extern TVirtualMC *gMC; + +extern AliRun *gAlice; + ClassImp(AliTOF) @@ -127,8 +121,11 @@ AliTOF::AliTOF(const char *name, const char *title, Option_t *option) if (gAlice==0) { AliFatal("gAlice==0 !"); } - if (gAlice->GetMCApp()->GetHitLists()) - gAlice->GetMCApp()->AddHitList(fHits); + + AliMC *mcApplication = (AliMC*)gAlice->GetMCApp(); + + if (mcApplication->GetHitLists()) + mcApplication->AddHitList(fHits); else AliError("gAlice->GetHitLists()==0"); fIshunt = 0; @@ -435,7 +432,7 @@ void AliTOF::DrawModule() const } //_____________________________________________________________________________ -Int_t AliTOF::DistancetoPrimitive(Int_t , Int_t ) const +Int_t AliTOF::DistancetoPrimitive(Int_t , Int_t ) { // // Returns distance from mouse pointer to detector, default version @@ -565,7 +562,7 @@ void AliTOF::Hits2SDigits() // Use the TOF SDigitizer to make TOF SDigits // -// cout<<"AliTOF::Hits2SDigits> start...\n"; +// AliInfo("Start..."); AliRunLoader * rl = fLoader->GetRunLoader(); AliTOFSDigitizer sd((rl->GetFileName()).Data()); diff --git a/TOF/AliTOF.h b/TOF/AliTOF.h index 0f5594af609..ed758287745 100644 --- a/TOF/AliTOF.h +++ b/TOF/AliTOF.h @@ -1,6 +1,13 @@ +#ifndef ALITOF_H +#define ALITOF_H +/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * + * See cxx source for full Copyright notice */ + +/* $Id$ */ + //////////////////////////////////////////////// // // -// Manager classe for TOF // +// Manager class for TOF // // Interface : // // AliTOF // // Associations between TOF related objects // @@ -10,27 +17,17 @@ // // //////////////////////////////////////////////// -#ifndef ALITOF_H -#define ALITOF_H -/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * - * See cxx source for full Copyright notice */ +#include "AliDetector.h" -/* $Id$ */ +#include "AliTOFTrigger.h" -class TFile; class TDirectory; +class TFile; +class TFolder ; class TString ; class TTask ; -class TFolder ; - -#include "TObject.h" -#include "TTree.h" -#include "AliDetector.h" - -#include "AliTOFSDigitizer.h" -#include "AliTOFGeometry.h" -#include "AliTOFTrigger.h" +class AliTOFGeometry; class AliTOF : public AliDetector { public: @@ -58,7 +55,7 @@ public: virtual void Makehits(Bool_t hits=1); virtual void FinishEvent(); virtual Int_t IsVersion() const =0; - Int_t DistancetoPrimitive(Int_t px, Int_t py) const; + Int_t DistancetoPrimitive(Int_t px, Int_t py); virtual void StepManager()=0; virtual void TOFpc(Float_t /*xtof*/, Float_t /*ytof*/, Float_t /*zlenC*/, Float_t /*zlenB*/, Float_t /*zlenA*/, Float_t /*ztof0*/){}; diff --git a/TOF/AliTOFAlignment.cxx b/TOF/AliTOFAlignment.cxx index e4170dc5d4b..4c9d84879cb 100644 --- a/TOF/AliTOFAlignment.cxx +++ b/TOF/AliTOFAlignment.cxx @@ -11,7 +11,13 @@ * appear in the supporting documentation. The authors make no claims * * about the suitability of this software for any purpose. It is * * provided "as is" without express or implied warranty. * +***************************************************************************/ + +/* $Log$ +Revision 1.5 2006/04/16 22:29:05 hristov +Coding conventions (Annalisa) + Revision 1.4 2006/04/05 08:35:38 hristov Coding conventions (S.Arcelli, C.Zampolli) @@ -27,21 +33,27 @@ class for TOF alignment author: Silvia Arcelli, arcelli@bo.infn.it */ -#include +///////////////////////////////////////////////////////// +// // +// Class for alignment procedure // +// // +// // +// // +///////////////////////////////////////////////////////// + #include -#include "TClonesArray.h" -#include "TObjString.h" + +#include "TRandom.h" +#include "TString.h" + #include "AliLog.h" -#include "AliRun.h" -#include "AliModule.h" -#include "AliTOFAlignment.h" #include "AliAlignObj.h" #include "AliAlignObjAngles.h" #include "AliCDBManager.h" #include "AliCDBMetaData.h" -#include "AliCDBStorage.h" #include "AliCDBId.h" #include "AliCDBEntry.h" +#include "AliTOFAlignment.h" ClassImp(AliTOFAlignment) diff --git a/TOF/AliTOFAlignment.h b/TOF/AliTOFAlignment.h index 639daa217b6..04b74b24e31 100644 --- a/TOF/AliTOFAlignment.h +++ b/TOF/AliTOFAlignment.h @@ -9,7 +9,8 @@ ////////////////////////////////////////////////////////////////// #include "TTask.h" -#include "AliAlignObj.h" + +class TObjArray; class AliTOFAlignment :public TTask{ diff --git a/TOF/AliTOFCal.cxx b/TOF/AliTOFCal.cxx index dd920075678..d69835d7756 100644 --- a/TOF/AliTOFCal.cxx +++ b/TOF/AliTOFCal.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.5 2006/04/16 22:29:05 hristov +Coding conventions (Annalisa) + Revision 1.4 2006/04/05 08:35:38 hristov Coding conventions (S.Arcelli, C.Zampolli) @@ -36,15 +39,14 @@ author: Chiara Zampolli, zampolli@bo.infn.it // // /////////////////////////////////////////////////////////////////////////////// -#include "TObject.h" -#include "TROOT.h" #include "TBrowser.h" -#include "TClass.h" +#include "TROOT.h" + #include "AliLog.h" -#include "AliTOFGeometryV5.h" + #include "AliTOFCalSector.h" #include "AliTOFCal.h" -#include "AliTOFChannel.h" +#include "AliTOFGeometryV5.h" extern TROOT *gROOT; diff --git a/TOF/AliTOFCal.h b/TOF/AliTOFCal.h index b07b92004e9..a1246dc783a 100644 --- a/TOF/AliTOFCal.h +++ b/TOF/AliTOFCal.h @@ -11,12 +11,11 @@ //_____________________________________________________________ #include "TObject.h" -#include "TROOT.h" -#include "TBrowser.h" -#include "TClass.h" -#include "AliTOFGeometry.h" #include "AliTOFChannel.h" +class TBrowser; +class AliTOFGeometry; + class AliTOFCal: public TObject { diff --git a/TOF/AliTOFCalPadZ.cxx b/TOF/AliTOFCalPadZ.cxx index e9825b154a0..f66c83532ee 100644 --- a/TOF/AliTOFCalPadZ.cxx +++ b/TOF/AliTOFCalPadZ.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.5 2006/04/16 22:29:05 hristov +Coding conventions (Annalisa) + Revision 1.4 2006/04/05 08:35:38 hristov Coding conventions (S.Arcelli, C.Zampolli) @@ -36,14 +39,13 @@ author: Chiara Zampolli, zampolli@bo.infn.it // // /////////////////////////////////////////////////////////////////////////////// -#include "TObject.h" -#include "TROOT.h" #include "TBrowser.h" -#include "TClass.h" + #include "AliLog.h" -#include "AliTOFGeometryV5.h" -#include "AliTOFChannel.h" + #include "AliTOFCalPadZ.h" +#include "AliTOFChannel.h" +#include "AliTOFGeometryV5.h" ClassImp(AliTOFCalPadZ) diff --git a/TOF/AliTOFCalPadZ.h b/TOF/AliTOFCalPadZ.h index ebcb883cf45..f9147c2a194 100644 --- a/TOF/AliTOFCalPadZ.h +++ b/TOF/AliTOFCalPadZ.h @@ -11,12 +11,10 @@ //_____________________________________________________________ #include "TObject.h" -#include "TROOT.h" -#include "TBrowser.h" -#include "TClass.h" -#include "AliTOFGeometry.h" -#include "AliTOFChannel.h" +class TBrowser; +class AliTOFGeometry; +class AliTOFChannel; class AliTOFCalPadZ: public TObject { diff --git a/TOF/AliTOFCalPlateA.cxx b/TOF/AliTOFCalPlateA.cxx index 7a911ab3c4e..9ce120f72d8 100644 --- a/TOF/AliTOFCalPlateA.cxx +++ b/TOF/AliTOFCalPlateA.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.5 2006/04/16 22:29:05 hristov +Coding conventions (Annalisa) + Revision 1.4 2006/04/05 08:35:38 hristov Coding conventions (S.Arcelli, C.Zampolli) @@ -36,15 +39,14 @@ author: Chiara Zampolli, zampolli@bo.infn.it // // /////////////////////////////////////////////////////////////////////////////// -#include "TObject.h" -#include "TROOT.h" #include "TBrowser.h" -#include "TClass.h" + #include "AliLog.h" -#include "AliTOFGeometryV5.h" -#include "AliTOFCalStrip.h" + #include "AliTOFCalPlateA.h" +#include "AliTOFCalStrip.h" #include "AliTOFChannel.h" +#include "AliTOFGeometryV5.h" ClassImp(AliTOFCalPlateA) diff --git a/TOF/AliTOFCalPlateA.h b/TOF/AliTOFCalPlateA.h index 7afd5ea940c..ba638bff200 100644 --- a/TOF/AliTOFCalPlateA.h +++ b/TOF/AliTOFCalPlateA.h @@ -11,12 +11,11 @@ //_____________________________________________________________ #include "TObject.h" -#include "TROOT.h" -#include "TBrowser.h" -#include "TClass.h" -#include "AliTOFGeometry.h" -#include "AliTOFChannel.h" +class TBrowser; + +class AliTOFChannel; +class AliTOFGeometry; class AliTOFCalPlateA: public TObject { diff --git a/TOF/AliTOFCalPlateB.cxx b/TOF/AliTOFCalPlateB.cxx index 89c35729793..e094b92f530 100644 --- a/TOF/AliTOFCalPlateB.cxx +++ b/TOF/AliTOFCalPlateB.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.5 2006/04/16 22:29:05 hristov +Coding conventions (Annalisa) + Revision 1.4 2006/04/05 08:35:38 hristov Coding conventions (S.Arcelli, C.Zampolli) @@ -36,15 +39,14 @@ author: Chiara Zampolli, zampolli@bo.infn.it // // /////////////////////////////////////////////////////////////////////////////// -#include "TObject.h" -#include "TROOT.h" #include "TBrowser.h" -#include "TClass.h" + #include "AliLog.h" -#include "AliTOFGeometryV5.h" -#include "AliTOFCalStrip.h" + #include "AliTOFCalPlateB.h" +#include "AliTOFCalStrip.h" #include "AliTOFChannel.h" +#include "AliTOFGeometryV5.h" ClassImp(AliTOFCalPlateB) diff --git a/TOF/AliTOFCalPlateB.h b/TOF/AliTOFCalPlateB.h index c323af68995..f7877427711 100644 --- a/TOF/AliTOFCalPlateB.h +++ b/TOF/AliTOFCalPlateB.h @@ -11,12 +11,11 @@ //_____________________________________________________________ #include "TObject.h" -#include "TROOT.h" -#include "TBrowser.h" -#include "TClass.h" -#include "AliTOFGeometry.h" -#include "AliTOFChannel.h" +class TBrowser; + +class AliTOFChannel; +class AliTOFGeometry; class AliTOFCalPlateB: public TObject { diff --git a/TOF/AliTOFCalPlateC.cxx b/TOF/AliTOFCalPlateC.cxx index 6d32bac3582..b2a19eb317f 100644 --- a/TOF/AliTOFCalPlateC.cxx +++ b/TOF/AliTOFCalPlateC.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.5 2006/04/16 22:29:05 hristov +Coding conventions (Annalisa) + Revision 1.4 2006/04/05 08:35:38 hristov Coding conventions (S.Arcelli, C.Zampolli) @@ -36,15 +39,14 @@ author: Chiara Zampolli, zampolli@bo.infn.it // // /////////////////////////////////////////////////////////////////////////////// -#include "TObject.h" -#include "TROOT.h" #include "TBrowser.h" -#include "TClass.h" + #include "AliLog.h" -#include "AliTOFGeometryV5.h" -#include "AliTOFCalStrip.h" + #include "AliTOFCalPlateC.h" +#include "AliTOFCalStrip.h" #include "AliTOFChannel.h" +#include "AliTOFGeometryV5.h" ClassImp(AliTOFCalPlateC) diff --git a/TOF/AliTOFCalPlateC.h b/TOF/AliTOFCalPlateC.h index 1fb1ade8ce1..494c5009803 100644 --- a/TOF/AliTOFCalPlateC.h +++ b/TOF/AliTOFCalPlateC.h @@ -11,12 +11,11 @@ //_____________________________________________________________ #include "TObject.h" -#include "TROOT.h" -#include "TBrowser.h" -#include "TClass.h" -#include "AliTOFGeometry.h" -#include "AliTOFChannel.h" +class TBrowser; + +class AliTOFChannel; +class AliTOFGeometry; class AliTOFCalPlateC: public TObject { diff --git a/TOF/AliTOFCalSector.cxx b/TOF/AliTOFCalSector.cxx index ddd5e5474f7..e9d522abd55 100644 --- a/TOF/AliTOFCalSector.cxx +++ b/TOF/AliTOFCalSector.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.5 2006/04/16 22:29:05 hristov +Coding conventions (Annalisa) + Revision 1.4 2006/04/05 08:35:38 hristov Coding conventions (S.Arcelli, C.Zampolli) @@ -36,17 +39,17 @@ author: Chiara Zampolli, zampolli@bo.infn.it // // /////////////////////////////////////////////////////////////////////////////// -#include "TObject.h" -#include "TROOT.h" #include "TBrowser.h" -#include "TClass.h" +#include "TROOT.h" + #include "AliLog.h" -#include "AliTOFGeometryV5.h" + #include "AliTOFCalPlateA.h" #include "AliTOFCalPlateB.h" #include "AliTOFCalPlateC.h" #include "AliTOFCalSector.h" #include "AliTOFChannel.h" +#include "AliTOFGeometryV5.h" extern TROOT *gROOT; diff --git a/TOF/AliTOFCalSector.h b/TOF/AliTOFCalSector.h index 4438a9b43c6..5ac3a65ed2b 100644 --- a/TOF/AliTOFCalSector.h +++ b/TOF/AliTOFCalSector.h @@ -11,15 +11,10 @@ //_____________________________________________________________ #include "TObject.h" -#include "TROOT.h" -#include "TBrowser.h" -#include "TClass.h" -#include "AliTOFGeometry.h" -#include "AliTOFChannel.h" -#include "AliTOFCalPlateA.h" -#include "AliTOFCalPlateB.h" -#include "AliTOFCalPlateC.h" +class TBrowser; +class AliTOFGeometry; +class AliTOFChannel; class AliTOFCalSector: public TObject { diff --git a/TOF/AliTOFCalStrip.cxx b/TOF/AliTOFCalStrip.cxx index 0c2d9603e94..053162ed08f 100644 --- a/TOF/AliTOFCalStrip.cxx +++ b/TOF/AliTOFCalStrip.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.5 2006/04/16 22:29:05 hristov +Coding conventions (Annalisa) + Revision 1.4 2006/04/05 08:35:38 hristov Coding conventions (S.Arcelli, C.Zampolli) @@ -36,15 +39,14 @@ author: Chiara Zampolli, zampolli@bo.infn.it // // /////////////////////////////////////////////////////////////////////////////// -#include "TObject.h" -#include "TROOT.h" #include "TBrowser.h" -#include "TClass.h" + #include "AliLog.h" -#include "AliTOFGeometryV5.h" -#include "AliTOFChannel.h" -#include "AliTOFCalStrip.h" + #include "AliTOFCalPadZ.h" +#include "AliTOFCalStrip.h" +#include "AliTOFChannel.h" +#include "AliTOFGeometryV5.h" ClassImp(AliTOFCalStrip) diff --git a/TOF/AliTOFCalStrip.h b/TOF/AliTOFCalStrip.h index 5e226a675d5..1d798b4bf18 100644 --- a/TOF/AliTOFCalStrip.h +++ b/TOF/AliTOFCalStrip.h @@ -11,11 +11,10 @@ //_____________________________________________________________ #include "TObject.h" -#include "TROOT.h" -#include "TBrowser.h" -#include "TClass.h" -#include "AliTOFGeometry.h" -#include "AliTOFChannel.h" + +class TBrowser; +class AliTOFGeometry; +class AliTOFChannel; class AliTOFCalStrip: public TObject { diff --git a/TOF/AliTOFChSim.h b/TOF/AliTOFChSim.h index 3d825c5de4c..cf7b32ab946 100644 --- a/TOF/AliTOFChSim.h +++ b/TOF/AliTOFChSim.h @@ -8,7 +8,7 @@ // class for TOF calibration // //////////////////////////////////////////////// -#include "TNamed.h" +#include "TObject.h" class AliTOFChSim: public TObject { diff --git a/TOF/AliTOFChannel.h b/TOF/AliTOFChannel.h index b01eef3a405..bd140f093f2 100644 --- a/TOF/AliTOFChannel.h +++ b/TOF/AliTOFChannel.h @@ -8,7 +8,7 @@ // class for TOF calibration // //////////////////////////////////////////////// -#include "TNamed.h" +#include "TObject.h" class AliTOFChannel: public TObject { diff --git a/TOF/AliTOFClusterFinder.cxx b/TOF/AliTOFClusterFinder.cxx index 85ee8674dd4..aeb2d3ba4ba 100644 --- a/TOF/AliTOFClusterFinder.cxx +++ b/TOF/AliTOFClusterFinder.cxx @@ -50,26 +50,26 @@ Revision 0.01 2005/07/25 A. De Caro // // //////////////////////////////////////////////////////////////// -#include -#include -#include -#include +#include "TClonesArray.h" +#include "TFile.h" +#include "TTree.h" +#include "AliLoader.h" #include "AliLog.h" +#include "AliRawReader.h" #include "AliRunLoader.h" -#include "AliLoader.h" -#include "AliTOFdigit.h" -#include "AliTOFcluster.h" -#include "AliTOFGeometry.h" -#include "AliTOFGeometryV4.h" -#include "AliTOFGeometryV5.h" -#include "AliTOFRawStream.h" #include "AliTOFcalib.h" #include "AliTOFCal.h" #include "AliTOFChannel.h" - #include "AliTOFClusterFinder.h" +#include "AliTOFcluster.h" +#include "AliTOFdigit.h" +#include "AliTOFGeometryV5.h" +#include "AliTOFGeometry.h" +#include "AliTOFRawStream.h" + +extern TFile *gFile; ClassImp(AliTOFClusterFinder) diff --git a/TOF/AliTOFClusterFinder.h b/TOF/AliTOFClusterFinder.h index 681b23dd765..63610b911c2 100644 --- a/TOF/AliTOFClusterFinder.h +++ b/TOF/AliTOFClusterFinder.h @@ -6,7 +6,7 @@ // Task: Transform digits/raw data to TOF Clusters, to fill TOF RecPoints // and feed TOF tracking -#include "AliRawReader.h" +#include "TObject.h" class TClonesArray; class TFile; @@ -14,8 +14,10 @@ class TTree; class AliLoader; class AliRunLoader; +class AliRawReader; class AliTOFGeometry; +class AliTOFcluster; class AliTOFClusterFinder : public TObject { diff --git a/TOF/AliTOFDDLRawData.cxx b/TOF/AliTOFDDLRawData.cxx index f754ef15b6b..ee7535d7a38 100644 --- a/TOF/AliTOFDDLRawData.cxx +++ b/TOF/AliTOFDDLRawData.cxx @@ -33,22 +33,20 @@ Revision 0.01 2004/6/11 A.De Caro, S.B.Sellitto, R.Silvestri // ////////////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include -#include "AliLog.h" +#include "Riostream.h" + +#include "TBranch.h" +#include "TClonesArray.h" +#include "TMath.h" -#include "AliRawDataHeader.h" #include "AliBitPacking.h" +#include "AliLog.h" +#include "AliRawDataHeader.h" -#include "AliTOFGeometry.h" -#include "AliTOFGeometryV4.h" -#include "AliTOFGeometryV5.h" +#include "AliTOFDDLRawData.h" #include "AliTOFdigit.h" +#include "AliTOFGeometry.h" #include "AliTOFRawStream.h" -#include "AliTOFDDLRawData.h" ClassImp(AliTOFDDLRawData) diff --git a/TOF/AliTOFDDLRawData.h b/TOF/AliTOFDDLRawData.h index 6d45c65173f..d5019490d3f 100644 --- a/TOF/AliTOFDDLRawData.h +++ b/TOF/AliTOFDDLRawData.h @@ -1,17 +1,19 @@ +#ifndef AliTOFDDLRAWDATA_H +#define AliTOFDDLRAWDATA_H + /* Copyright(c) 1998-2003, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ //////////////////////////////////////////////////////////////////////////// +// // // Class used for generating the files containing raw data, // -// required for Data Challenge // +// required for Data Challenge // +// // //////////////////////////////////////////////////////////////////////////// -#ifndef AliTOFDDLRAWDATA_H -#define AliTOFDDLRAWDATA_H +#include "TObject.h" -class AliTOF; class AliTOFGeometry; -class TTree; class AliTOFDDLRawData:public TObject{ public: diff --git a/TOF/AliTOFDigitMap.cxx b/TOF/AliTOFDigitMap.cxx index c4823d0346d..159adb42d01 100644 --- a/TOF/AliTOFDigitMap.cxx +++ b/TOF/AliTOFDigitMap.cxx @@ -32,16 +32,11 @@ // //////////////////////////////////////////////////////////////////////// -#include -#include +#include "TClonesArray.h" #include "AliTOFDigitMap.h" -#include "AliTOFdigit.h" #include "AliTOFGeometry.h" - -#include - ClassImp(AliTOFDigitMap) AliTOFDigitMap::AliTOFDigitMap() diff --git a/TOF/AliTOFDigitMap.h b/TOF/AliTOFDigitMap.h index a162cd7f839..a3d8eef7ac3 100644 --- a/TOF/AliTOFDigitMap.h +++ b/TOF/AliTOFDigitMap.h @@ -5,19 +5,19 @@ * See cxx source for full Copyright notice */ -//////////////////////////////////////////////////////////////////////// -// -// AliTOFDigitMap class -// -// digitmap enables fast check if the pad was already hit -// -// Author: F. Pierella | pierella@bo.infn.it -// -//////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////// +// // +// AliTOFDigitMap class // +// // +// digitmap enables fast check if the pad was already hit // +// // +// Author: F. Pierella | pierella@bo.infn.it // +// // +////////////////////////////////////////////////////////////// -#include "AliHitMap.h" #include "TObject.h" -#include "AliTOFGeometry.h" + +#include "AliHitMap.h" class TClonesArray; class AliTOFGeometry; diff --git a/TOF/AliTOFDigitizer.cxx b/TOF/AliTOFDigitizer.cxx index 7fcdc1e0089..21754ca1dd0 100644 --- a/TOF/AliTOFDigitizer.cxx +++ b/TOF/AliTOFDigitizer.cxx @@ -13,48 +13,46 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -//_________________________________________________________________________ -// This is a TTask that makes TOF-Digits out of TOF-SDigits. -// The simulation of the detector is performed at sdigits level: -// during digitization the unique task is the sum of all sdigits in the -// same pad. -// Digits are written to TreeD in branch "TOF". -// -// -- Author : F. Pierella (Bologna University) pierella@bo.infn.it -////////////////////////////////////////////////////////////////////////////// - - -#include -#include -#include -#include -#include -#include -#include -#include -#include "TF1.h" +//_________________________________________________________________________// +// // +// This is a TTask that makes TOF-Digits out of TOF-SDigits. // +// The simulation of the detector is performed at sdigits level: // +// during digitization the unique task is the sum of all sdigits in the // +// same pad. // +// Digits are written to TreeD in branch "TOF". // +// // +// -- Author : F. Pierella (Bologna University) pierella@bo.infn.it // +// // +//_________________________________________________________________________// + +#include "Riostream.h" + +#include "TFile.h" #include "TH1F.h" -#include "TList.h" -#include "TRandom.h" +#include "TTree.h" -#include "AliLog.h" -#include "AliRun.h" -#include "AliRunLoader.h" #include "AliLoader.h" -#include "AliDigitizer.h" +#include "AliLog.h" #include "AliRunDigitizer.h" -#include "AliPDG.h" +#include "AliRunLoader.h" +#include "AliRun.h" -#include "AliTOF.h" +#include "AliTOFCal.h" +#include "AliTOFcalib.h" +#include "AliTOFChannel.h" #include "AliTOFDigitizer.h" -#include "AliTOFSDigitizer.h" -#include "AliTOFhit.h" #include "AliTOFdigit.h" -#include "AliTOFSDigit.h" #include "AliTOFHitMap.h" -#include "AliTOFChannel.h" -#include "AliTOFCal.h" #include "AliTOFGeometryV5.h" +#include "AliTOFSDigit.h" +#include "AliTOF.h" + +extern TDirectory *gDirectory; +extern TFile *gFile; +extern TRandom *gRandom; + +extern AliRun *gAlice; + ClassImp(AliTOFDigitizer) diff --git a/TOF/AliTOFDigitizer.h b/TOF/AliTOFDigitizer.h index ac2c6b8d444..e0229deb225 100644 --- a/TOF/AliTOFDigitizer.h +++ b/TOF/AliTOFDigitizer.h @@ -1,26 +1,29 @@ #ifndef ALITOFDIGITIZER_H #define ALITOFDIGITIZER_H + /* Copyright(c) 1998-2000, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ -//_________________________________________________________________________ -// Task Class for making Digits in TOF -// Class performs digitization of Summable digits (in the TOF case this is just -// sum of contributions of all signals into a given pad). -// In addition it performs mixing of summable digits from different events. -// -//*-- Author: Fabrizio Pierella (Bologna University) +//_______________________________________________________________________________// +// // +// Task Class for making Digits in TOF // +// Class performs digitization of Summable digits (in the TOF case this is just // +// sum of contributions of all signals into a given pad). // +// In addition it performs mixing of summable digits from different events. // +// // +// -- Author: Fabrizio Pierella (Bologna University) +// // +//_______________________________________________________________________________// + +/* $Id$ */ -#include "TH1F.h" -#include "TList.h" #include "AliDigitizer.h" -#include "AliTOFcalib.h" -#include "AliTOFCal.h" -#include "AliTOFGeometry.h" class AliRunDigitizer; class AliTOFHitMap; class AliTOFSDigit; +class AliTOFcalib; +class AliTOFGeometry; class AliTOFDigitizer : public AliDigitizer { public: diff --git a/TOF/AliTOFGeometry.cxx b/TOF/AliTOFGeometry.cxx index a4057899176..9b485138732 100644 --- a/TOF/AliTOFGeometry.cxx +++ b/TOF/AliTOFGeometry.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.15 2006/04/16 22:29:05 hristov +Coding conventions (Annalisa) + Revision 1.14 2006/04/05 08:35:38 hristov Coding conventions (S.Arcelli, C.Zampolli) @@ -77,16 +80,12 @@ Revision 0.02 2003/12/10 S.Arcelli: Revision 0.01 2003/12/04 S.Arcelli */ -#include -#include /////////////////////////////////////////////////////////////////////////////// // // // TOF Geometry class // // // /////////////////////////////////////////////////////////////////////////////// -#include "AliLog.h" -#include "AliConst.h" #include "AliTOFGeometry.h" ClassImp(AliTOFGeometry) diff --git a/TOF/AliTOFGeometry.h b/TOF/AliTOFGeometry.h index fac9380b571..15029102af0 100644 --- a/TOF/AliTOFGeometry.h +++ b/TOF/AliTOFGeometry.h @@ -1,5 +1,6 @@ #ifndef ALITOFGEOMETRY_H #define ALITOFGEOMETRY_H + /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ @@ -11,9 +12,8 @@ // // /////////////////////////////////////////////////////////////////////////////// - +#include "TGeoMatrix.h" #include "TObject.h" -#include "TGeoManager.h" class AliTOFGeometry: public TObject{ diff --git a/TOF/AliTOFGeometryV4.cxx b/TOF/AliTOFGeometryV4.cxx index 434619dc5d1..852af052e2a 100644 --- a/TOF/AliTOFGeometryV4.cxx +++ b/TOF/AliTOFGeometryV4.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.4 2006/04/16 22:29:05 hristov +Coding conventions (Annalisa) + Revision 1.3 2006/03/12 14:38:13 arcelli Changes for TOF Reconstruction using TGeo @@ -35,20 +38,21 @@ Revision 0.1 2005/07/19 A. De Caro according to the PPR TOF geometry */ -#include -#include /////////////////////////////////////////////////////////////////////////////// // // // TOF Geometry class (PPR version) // // // /////////////////////////////////////////////////////////////////////////////// -#include "AliLog.h" +#include "TGeoManager.h" + #include "AliConst.h" +#include "AliLog.h" -#include "AliTOFGeometry.h" #include "AliTOFGeometryV4.h" +extern TGeoManager *gGeoManager; + ClassImp(AliTOFGeometryV4) diff --git a/TOF/AliTOFGeometryV4.h b/TOF/AliTOFGeometryV4.h index e6e9213e76e..a082f1a4566 100644 --- a/TOF/AliTOFGeometryV4.h +++ b/TOF/AliTOFGeometryV4.h @@ -1,16 +1,15 @@ #ifndef ALITOFGEOMETRYV4_H #define ALITOFGEOMETRYV4_H + /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ - /////////////////////////////////////////////////////////////////////////////// // // // TOF geometry class (PPR version) // // // /////////////////////////////////////////////////////////////////////////////// - #include "AliTOFGeometry.h" class AliTOFGeometryV4: public AliTOFGeometry { diff --git a/TOF/AliTOFGeometryV5.cxx b/TOF/AliTOFGeometryV5.cxx index 30711971ae1..bd9a78a8bd7 100644 --- a/TOF/AliTOFGeometryV5.cxx +++ b/TOF/AliTOFGeometryV5.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.4 2006/04/16 22:29:05 hristov +Coding conventions (Annalisa) + Revision 1.3 2006/03/12 14:38:05 arcelli Changes for TOF Reconstruction using TGeo @@ -36,19 +39,21 @@ Revision 0.1 2005/07/19 G. Cara Romeo and A. De Caro according to the new TOF geometry */ -#include -#include /////////////////////////////////////////////////////////////////////////////// // // // TOF Geometry class (new version) // // // /////////////////////////////////////////////////////////////////////////////// -#include "AliLog.h" +#include "TGeoManager.h" + #include "AliConst.h" -#include "AliTOFGeometry.h" +#include "AliLog.h" + #include "AliTOFGeometryV5.h" +extern TGeoManager *gGeoManager; + ClassImp(AliTOFGeometryV5) diff --git a/TOF/AliTOFGeometryV5.h b/TOF/AliTOFGeometryV5.h index 844b83fc758..a76fbe9ff42 100644 --- a/TOF/AliTOFGeometryV5.h +++ b/TOF/AliTOFGeometryV5.h @@ -1,16 +1,15 @@ #ifndef ALITOFGEOMETRYV5_H #define ALITOFGEOMETRYV5_H + /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ - /////////////////////////////////////////////////////////////////////////////// // // // TOF geometry class (new version) // // // /////////////////////////////////////////////////////////////////////////////// - #include "AliTOFGeometry.h" class AliTOFGeometryV5: public AliTOFGeometry { diff --git a/TOF/AliTOFHitMap.cxx b/TOF/AliTOFHitMap.cxx index e7715185aa7..498e168d73f 100644 --- a/TOF/AliTOFHitMap.cxx +++ b/TOF/AliTOFHitMap.cxx @@ -33,12 +33,8 @@ // //////////////////////////////////////////////////////////////////////// -#include -#include - #include "AliLog.h" #include "AliTOFHitMap.h" -#include "AliTOFSDigit.h" #include "AliTOFGeometry.h" diff --git a/TOF/AliTOFHitMap.h b/TOF/AliTOFHitMap.h index 3de6d63f8b7..a16850f407b 100644 --- a/TOF/AliTOFHitMap.h +++ b/TOF/AliTOFHitMap.h @@ -6,19 +6,20 @@ /* $Id$ */ -//////////////////////////////////////////////////////////////////////// -// -// AliTOFHitMap class -// -// hitmap enables fast check if the pad was already hit -// -// Author: Jiri Chudoba (CERN) -// -//////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////// +// // +// AliTOFHitMap class // +// // +// hitmap enables fast check if the pad was already hit // +// // +// Author: Jiri Chudoba (CERN) // +// // +////////////////////////////////////////////////////////////// -#include "AliHitMap.h" #include "TObject.h" +#include "AliHitMap.h" + class TClonesArray; class AliTOFGeometry; diff --git a/TOF/AliTOFRawStream.cxx b/TOF/AliTOFRawStream.cxx index 0caf78fb008..a2595e53acd 100644 --- a/TOF/AliTOFRawStream.cxx +++ b/TOF/AliTOFRawStream.cxx @@ -29,15 +29,14 @@ Revision 0.01 2005/07/22 A. De Caro GetPadX() */ -/////////////////////////////////////////////////////////////////////////////// -// -// This class provides access to TOF raw data in DDL files. -// -// It loops over all TOF raw data given by the AliRawReader. -// -/////////////////////////////////////////////////////////////////////////////// - -#include "AliLog.h" +//////////////////////////////////////////////////////////////////////// +// // +// This class provides access to TOF raw data in DDL files. // +// // +// It loops over all TOF raw data given by the AliRawReader. // +// // +//////////////////////////////////////////////////////////////////////// + #include "AliRawReader.h" #include "AliTOFGeometry.h" diff --git a/TOF/AliTOFRawStream.h b/TOF/AliTOFRawStream.h index 71b1d9e8048..601452efa2f 100644 --- a/TOF/AliTOFRawStream.h +++ b/TOF/AliTOFRawStream.h @@ -5,13 +5,13 @@ /* $Id$ */ -//////////////////////////////////////////////////////////// -// -// This class provides the key-reading for TOF raw data. -// -//////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////// +// // +// This class provides the key-reading for TOF raw data. // +// // +/////////////////////////////////////////////////////////////// -#include +#include "TObject.h" class AliRawReader; diff --git a/TOF/AliTOFReconstructor.cxx b/TOF/AliTOFReconstructor.cxx index 744180f32c7..74fed57a157 100644 --- a/TOF/AliTOFReconstructor.cxx +++ b/TOF/AliTOFReconstructor.cxx @@ -21,21 +21,25 @@ // // /////////////////////////////////////////////////////////////////////////////// - -#include +#include "TFile.h" #include "AliLog.h" -#include "AliRun.h" +#include "AliRawReader.h" #include "AliRunLoader.h" +#include "AliTOFClusterFinder.h" #include "AliTOFGeometry.h" -#include "AliTOFGeometryV4.h" -#include "AliTOFGeometryV5.h" -#include "AliTOFtracker.h" #include "AliTOFtrackerMI.h" -#include "AliTOFClusterFinder.h" +#include "AliTOFtracker.h" #include "AliTOFReconstructor.h" +class TTree; + +class AliESD; + +extern TDirectory *gDirectory; +extern TFile *gFile; + ClassImp(AliTOFReconstructor) //_____________________________________________________________________________ diff --git a/TOF/AliTOFReconstructor.h b/TOF/AliTOFReconstructor.h index 5ecf78e2e58..fc1a9afc6ac 100644 --- a/TOF/AliTOFReconstructor.h +++ b/TOF/AliTOFReconstructor.h @@ -1,12 +1,25 @@ #ifndef ALITOFRECONSTRUCTOR_H #define ALITOFRECONSTRUCTOR_H + /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ /* $Id$ */ +/////////////////////////////////////////////////////////////////////////////// +// // +// class for TOF reconstruction // +// // +/////////////////////////////////////////////////////////////////////////////// + #include "AliReconstructor.h" +class TTree; + +class AliESD; +class AliRawReader; +class AliRunLoader; + class AliTOFGeometry; class AliTOFReconstructor: public AliReconstructor { diff --git a/TOF/AliTOFSDigit.cxx b/TOF/AliTOFSDigit.cxx index 43bf40c16a4..dba17762599 100644 --- a/TOF/AliTOFSDigit.cxx +++ b/TOF/AliTOFSDigit.cxx @@ -15,27 +15,27 @@ /* $Id$ */ -//_________________________________________________________________________ -// TOF sdigit: member variables -// fSector : TOF sector -// fPlate : TOF plate -// fStrip : strips number -// fPadx : pad number along x -// fPadz : pad number along z -// fTdc : TArrayF of TDC values -// fAdc : TArrayF of ADC values -// -// Getters, setters and member functions defined here -// -//*-- Authors: F. Pierella, A. Seganti, D. Vicinanza +//_________________________________________________________________________// +// // +// TOF sdigit: member variables // +// fSector : TOF sector // +// fPlate : TOF plate // +// fStrip : strips number // +// fPadx : pad number along x // +// fPadz : pad number along z // +// fTdc : TArrayF of TDC values // +// fAdc : TArrayF of ADC values // +// // +// Getters, setters and member functions defined here // +// // +// -- Authors: F. Pierella, A. Seganti, D. Vicinanza // +//_________________________________________________________________________// -#include #include "TArrayF.h" #include "TArrayI.h" #include "AliLog.h" -#include "AliRun.h" -#include "AliTOF.h" + #include "AliTOFGeometry.h" #include "AliTOFSDigit.h" diff --git a/TOF/AliTOFSDigit.h b/TOF/AliTOFSDigit.h index f603e5cc4e0..d99a1e5e74d 100644 --- a/TOF/AliTOFSDigit.h +++ b/TOF/AliTOFSDigit.h @@ -1,22 +1,21 @@ #ifndef ALITOFSDIGIT_H #define ALITOFSDIGIT_H +/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * + * See cxx source for full Copyright notice */ + //////////////////////////////////////////////// // // // Class for TOF SDigits // // // //////////////////////////////////////////////// -/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * - * See cxx source for full Copyright notice */ - /* $Id$ */ +#include "TObject.h" #include "TArrayF.h" #include "TArrayI.h" -#include "AliDigit.h" -//class TArrayF; class AliTOFGeometry; class AliTOFSDigit : public TObject { diff --git a/TOF/AliTOFSDigitizer.cxx b/TOF/AliTOFSDigitizer.cxx index aeec5069e2e..6ab959ddada 100644 --- a/TOF/AliTOFSDigitizer.cxx +++ b/TOF/AliTOFSDigitizer.cxx @@ -15,44 +15,45 @@ /* $Id$ */ -//_________________________________________________________________________ -// This is a TTask that constructs SDigits out of Hits -// A Summable Digits is the "sum" of all hits in a pad -// Detector response has been simulated via the method -// SimulateDetectorResponse -// -//-- Authors: F. Pierella, A. De Caro -// Use case: see AliTOFhits2sdigits.C macro in the CVS -////////////////////////////////////////////////////////////////////////////// - -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +//__________________________________________________________// +// // +// This is a TTask that constructs SDigits out of Hits // +// A Summable Digits is the "sum" of all hits in a pad // +// Detector response has been simulated via the method // +// SimulateDetectorResponse // +// // +// -- Authors: F. Pierella, A. De Caro // +// Use case: see AliTOFhits2sdigits.C macro in the CVS // +//__________________________________________________________// + +#include "TBenchmark.h" +#include "TF1.h" +#include "TFile.h" +#include "TParticle.h" +#include "TTree.h" -#include "AliLog.h" -#include "AliDetector.h" #include "AliLoader.h" +#include "AliLog.h" #include "AliMC.h" -#include "AliRun.h" #include "AliRunLoader.h" +#include "AliRun.h" -#include "AliTOF.h" #include "AliTOFGeometry.h" #include "AliTOFHitMap.h" -#include "AliTOFSDigit.h" -#include "AliTOFSDigitizer.h" -#include "AliTOFhit.h" #include "AliTOFhitT0.h" +#include "AliTOFhit.h" +#include "AliTOFSDigitizer.h" +#include "AliTOFSDigit.h" +#include "AliTOF.h" + +extern TBenchmark *gBenchmark; +extern TDirectory *gDirectory; +extern TFile *gFile; +extern TRandom *gRandom; +extern TROOT *gROOT; + +extern AliRun *gAlice; + ClassImp(AliTOFSDigitizer) @@ -267,8 +268,8 @@ void AliTOFSDigitizer::Exec(Option_t *verboseOption) { fTOFLoader->LoadSDigits("recreate"); for (Int_t iEvent=fEvent1; iEventGetEvent(iEvent); @@ -311,7 +312,10 @@ void AliTOFSDigitizer::Exec(Option_t *verboseOption) { { gAlice->ResetHits(); tofHitsBranch->GetEvent(track); - particle = gAlice->GetMCApp()->Particle(track); + + AliMC *mcApplication = (AliMC*)gAlice->GetMCApp(); + + particle = mcApplication->Particle(track); Int_t nhits = tofHitArray->GetEntriesFast(); // cleaning all hits of the same track in the same pad volume // it is a rare event, however it happens @@ -503,7 +507,7 @@ void AliTOFSDigitizer::Exec(Option_t *verboseOption) { //__________________________________________________________________ void AliTOFSDigitizer::Print(Option_t* /*opt*/)const { - cout << "------------------- "<< GetName() << " ------------- \n"; + AliInfo(Form(" ------------------- %s ------------- ", GetName())); } //__________________________________________________________________ @@ -812,36 +816,36 @@ void AliTOFSDigitizer::PrintParameters()const // // Print parameters used for sdigitization // - cout << " ------------------- "<< GetName() << " -------------" << endl ; - cout << " Parameters used for TOF SDigitization " << endl ; + AliInfo(Form(" ------------------- %s -------------", GetName())); + AliInfo(" Parameters used for TOF SDigitization "); // Printing the parameters - cout << " Number of events: " << (fEvent2-fEvent1) << endl; - cout << " from event " << fEvent1 << " to event " << (fEvent2-1) << endl; - cout << " Time Resolution (ns) "<< fTimeResolution <<" Pad Efficiency: "<< fpadefficiency << endl; - cout << " Edge Effect option: "<< fEdgeEffect<< endl; - - cout << " Boundary Effect Simulation Parameters " << endl; - cout << " Hparameter: "<< fHparameter<<" H2parameter:"<< fH2parameter <<" Kparameter:"<< fKparameter<<" K2parameter: "<< fK2parameter << endl; - cout << " Efficiency in the central region of the pad: "<< fEffCenter << endl; - cout << " Efficiency at the boundary region of the pad: "<< fEffBoundary << endl; - cout << " Efficiency value at H2parameter "<< fEff2Boundary << endl; - cout << " Efficiency value at K2parameter "<< fEff3Boundary << endl; - cout << " Resolution (ps) in the central region of the pad: "<< fResCenter << endl; - cout << " Resolution (ps) at the boundary of the pad : "<< fResBoundary << endl; - cout << " Slope (ps/K) for neighbouring pad : "<< fResSlope <: object already instantiated @@ -73,35 +74,38 @@ // misidentified tracks and a comparison about the // true configuration (known from MC) and the best // assignment +// //-- Author: F. Pierella -////////////////////////////////////////////////////////////////////////////// - -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "AliDetector.h" +// +//_________________________________________________________________________ + +#include "TCanvas.h" +#include "TClonesArray.h" +#include "TFile.h" +#include "TFolder.h" +#include "TFrame.h" +#include "TH1.h" +#include "TParticle.h" +#include "TRandom.h" +#include "TBenchmark.h" +#include "TSystem.h" +#include "TTask.h" +#include "TTree.h" + #include "AliMC.h" #include "AliRun.h" -#include "AliTOF.h" -#include "AliTOFT0.h" #include "AliTOFhitT0.h" -#include "AliTOFv4T0.h" -#include "AliTOFv5T0.h" +#include "AliTOFT0.h" +#include "AliTOF.h" + +extern TBenchmark *gBenchmark; +extern TSystem *gSystem; +extern TRandom *gRandom; +extern TROOT *gROOT; + +extern AliRun *gAlice; + ClassImp(AliTOFT0) @@ -246,8 +250,8 @@ void AliTOFT0::Exec(Option_t *option) } if(strstr(option,"all")){ - cout << "Selecting primary tracks with momentum between " << fLowerMomBound << " GeV/c and " << fUpperMomBound << " GeV/c" << endl; - cout << "Memorandum: 0 means PION | 1 means KAON | 2 means PROTON" << endl; + AliInfo(Form("Selecting primary tracks with momentum between %d GeV/c and %d GeV/c", fLowerMomBound, fUpperMomBound)); + AliInfo("Memorandum: 0 means PION | 1 means KAON | 2 means PROTON") } if (fNevents == 0) fNevents = (Int_t) gAlice->TreeE()->GetEntries(); @@ -276,7 +280,10 @@ void AliTOFT0::Exec(Option_t *option) gAlice->ResetHits(); hitTree->GetEvent(track); - particle = gAlice->GetMCApp()->Particle(track); + + AliMC *mcApplication = (AliMC*)gAlice->GetMCApp(); + + particle = mcApplication->Particle(track); Int_t nhits = tofHits->GetEntriesFast(); for (Int_t hit = 0; hit < nhits; hit++) @@ -312,7 +319,7 @@ void AliTOFT0::Exec(Option_t *option) timeofflight[index]=time; tracktoflen[index]=toflen; momentum[index]=mom; - // cout << timeofflight[index] << " " << tracktoflen[index] << " " << momentum[index] << endl; + //AliInfo(Form(" %d %d %d ", timeofflight[index], tracktoflen[index], momentum[index])); switch (abspdg) { case 211: truparticle[index]=0; @@ -333,7 +340,7 @@ void AliTOFT0::Exec(Option_t *option) lasttrack=track; istop=0; selected=0; - //cout << "starting t0 calculation for current set" << endl; + //AliInfo("starting t0 calculation for current set"); for (Int_t i1=0; i1<3;i1++) { beta[0]=momentum[0]/sqrt(massarray[i1]*massarray[i1]+momentum[0]*momentum[0]); for (Int_t i2=0; i2<3;i2++) { @@ -419,10 +426,10 @@ void AliTOFT0::Exec(Option_t *option) hchibestconflevel->Fill(confLevel); itimes++; if(strstr(option,"all")){ - cout << "True Assignment " << truparticle[0] << truparticle[1] << truparticle[2] << truparticle[3] << truparticle[4] << truparticle[5] << truparticle[6] << truparticle[7] << truparticle[8] << truparticle[9] <Stop("TOFT0"); - cout << "AliTOFT0:" << endl ; + AliInfo("AliTOFT0:"); + /* cout << " took " << gBenchmark->GetCpuTime("TOFT0") << " seconds in order to calculate T0 " - << gBenchmark->GetCpuTime("TOFT0")/fNevents << " seconds per event " << endl ; - cout << endl ; + << gBenchmark->GetCpuTime("TOFT0")/fNevents << " seconds per event " << endl ; + */ + gBenchmark->Print("TOFT0"); } } diff --git a/TOF/AliTOFT0.h b/TOF/AliTOFT0.h index 881ad731785..64c7f08df80 100644 --- a/TOF/AliTOFT0.h +++ b/TOF/AliTOFT0.h @@ -3,22 +3,20 @@ /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ - -//_________________________________________________________________________ -// Task Class for calculating the time zero of interaction using TOF -// The input file need the track length till TOF detector -// It can be done modifyng the AliTOFvj StepManager and the AliTOFHit class -// as follow -//-- Author: F. Pierella - +//_____________________________________________________________________________// +// // +// Task Class for calculating the time zero of interaction using TOF // +// The input file need the track length till TOF detector // +// It can be done modifyng the AliTOFvj StepManager and the AliTOFHit class // +// as follow // +// // +//-- Author: F. Pierella // +// // +//_____________________________________________________________________________// #include "TTask.h" -#include "TString.h" -#include "TObjString.h" -#include "AliTOF.h" -#include "AliDetector.h" -class TClonesArray; +class TString; class AliTOFT0: public TTask { diff --git a/TOF/AliTOFTrigger.cxx b/TOF/AliTOFTrigger.cxx index cdd8719df0f..aaa5e5fdc65 100644 --- a/TOF/AliTOFTrigger.cxx +++ b/TOF/AliTOFTrigger.cxx @@ -26,14 +26,16 @@ // ///////////////////////////////////////////////////////////////////// -#include "AliTOFTrigger.h" -#include "AliLog.h" -#include "AliRun.h" #include "AliLoader.h" +#include "AliLog.h" #include "AliRunLoader.h" +#include "AliRun.h" #include "AliTriggerInput.h" + #include "AliTOFdigit.h" +#include "AliTOFTrigger.h" +extern AliRun* gAlice; //------------------------------------------------------------------------- ClassImp(AliTOFTrigger) diff --git a/TOF/AliTOFTrigger.h b/TOF/AliTOFTrigger.h index 07070226221..7989682fcdb 100644 --- a/TOF/AliTOFTrigger.h +++ b/TOF/AliTOFTrigger.h @@ -1,15 +1,15 @@ +#ifndef ALITOFTRIGGER_H +#define ALITOFTRIGGER_H + /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ /* $Id$ */ -#ifndef ALITOFTRIGGER_H -#define ALITOFTRIGGER_H - ///////////////////////////////////////////////// -// -// TOF Trigger Detector Class -// +// // +// TOF Trigger Detector Class // +// // ///////////////////////////////////////////////// #include "AliTriggerDetector.h" diff --git a/TOF/AliTOFcalib.cxx b/TOF/AliTOFcalib.cxx index c7d3eb3d493..b9891a9f706 100644 --- a/TOF/AliTOFcalib.cxx +++ b/TOF/AliTOFcalib.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.8 2006/04/16 22:29:05 hristov +Coding conventions (Annalisa) + Revision 1.7 2006/04/16 20:12:46 hristov Removing memory leak in case of cached CDB entries @@ -45,33 +48,28 @@ author: Chiara Zampolli, zampolli@bo.infn.it // // /////////////////////////////////////////////////////////////////////////////// -#include "AliTOFcalib.h" -#include "AliRun.h" -#include -#include -#include -#include -#include "AliTOF.h" -#include "AliTOFcalibESD.h" -#include "AliESD.h" -#include #include "TF1.h" +#include "TFile.h" #include "TH1F.h" #include "TH2F.h" -#include "AliESDtrack.h" -#include "AliTOFChannel.h" -#include "AliTOFChSim.h" -#include "AliTOFGeometryV5.h" -#include "TClonesArray.h" -#include "AliTOFCal.h" -#include "TRandom.h" -#include "AliTOFcluster.h" #include "TList.h" +#include "TROOT.h" +#include "TStyle.h" + +#include "AliCDBEntry.h" +#include "AliCDBId.h" #include "AliCDBManager.h" #include "AliCDBMetaData.h" -#include "AliCDBStorage.h" -#include "AliCDBId.h" -#include "AliCDBEntry.h" +#include "AliESDtrack.h" +#include "AliESD.h" +#include "AliLog.h" + +#include "AliTOFCal.h" +#include "AliTOFcalibESD.h" +#include "AliTOFcalib.h" +#include "AliTOFChannel.h" +#include "AliTOFGeometryV5.h" +#include "AliTOFGeometry.h" extern TROOT *gROOT; extern TStyle *gStyle; diff --git a/TOF/AliTOFcalib.h b/TOF/AliTOFcalib.h index cb330111afa..09a02c590ea 100644 --- a/TOF/AliTOFcalib.h +++ b/TOF/AliTOFcalib.h @@ -9,13 +9,16 @@ ////////////////////////////////////////////////////////////////// #include "TTask.h" -#include "TH1F.h" -#include "AliTOFChannel.h" -#include "TClonesArray.h" -#include "TList.h" -#include "AliTOFCal.h" -#include "AliTOFGeometry.h" -#include "AliESD.h" + +class TArrayF; +class TF1; +class TH1F; +class TObjArray; + +class AliESD; + +class AliTOFCal; +class AliTOFGeometry; class AliTOFcalib:public TTask{ public: diff --git a/TOF/AliTOFcalibESD.cxx b/TOF/AliTOFcalibESD.cxx index a6b4c9152d8..208f28a1835 100644 --- a/TOF/AliTOFcalibESD.cxx +++ b/TOF/AliTOFcalibESD.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.4 2006/04/05 08:35:38 hristov +Coding conventions (S.Arcelli, C.Zampolli) + Revision 1.3 2006/03/28 14:57:13 arcelli updates to handle new V5 geometry & some re-arrangements @@ -35,6 +38,7 @@ author: Chiara Zampolli, zampolli@bo.infn.it #include "AliTOFcalibESD.h" +class AliPID; ClassImp(AliTOFcalibESD) diff --git a/TOF/AliTOFcalibESD.h b/TOF/AliTOFcalibESD.h index 624a7871d87..289f42fb35a 100644 --- a/TOF/AliTOFcalibESD.h +++ b/TOF/AliTOFcalibESD.h @@ -8,11 +8,9 @@ // class for TOF calibration:: simulation of uncalibrated data // ////////////////////////////////////////////////////////////////// -#include "AliPID.h" #include "AliESDtrack.h" -#include "TObject.h" -//class AliESDtrack; +class AliPID; class AliTOFcalibESD:public AliESDtrack{ public: diff --git a/TOF/AliTOFcluster.cxx b/TOF/AliTOFcluster.cxx index 316f480926d..a50b0ea97f4 100644 --- a/TOF/AliTOFcluster.cxx +++ b/TOF/AliTOFcluster.cxx @@ -23,8 +23,12 @@ Revision 0.01 2005/07/25 A. De Caro (originally implemented by S. Arcelli and C. Zampolli) */ -// AliTOFcluster Class -// Description: class for TOF cluster definition +//////////////////////////////////////////////////////// +// // +// AliTOFcluster Class // +// Description: class for TOF cluster definition // +// // +//////////////////////////////////////////////////////// #include "AliTOFcluster.h" diff --git a/TOF/AliTOFcluster.h b/TOF/AliTOFcluster.h index b7d58b23bf0..d473274455a 100644 --- a/TOF/AliTOFcluster.h +++ b/TOF/AliTOFcluster.h @@ -1,13 +1,18 @@ #ifndef ALITOFCLUSTER_H #define ALITOFCLUSTER_H + /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ -// AliTOFcluster Class -/* $Id $ */ +/* $Id$ */ -#include "TMath.h" +////////////////////////////////////////////// +// // +// Class for TOF cluster definition // +// // +////////////////////////////////////////////// +#include "TMath.h" #include "TObject.h" class AliTOFcluster : public TObject { diff --git a/TOF/AliTOFdigit.cxx b/TOF/AliTOFdigit.cxx index 04d74a9e52e..d73b24a16cb 100644 --- a/TOF/AliTOFdigit.cxx +++ b/TOF/AliTOFdigit.cxx @@ -15,29 +15,27 @@ /* $Id$ */ -//_________________________________________________________________________ -// TOF digit: member variables -// fSector : TOF sector -// fPlate : TOF plate -// fStrip : strips number -// fPadx : pad number along x -// fPadz : pad number along z -// fTdc : TDC -// fAdc : ADC -// -// Getters, setters and member functions defined here -// -//*-- Authors: F. Pierella, A. Seganti, D. Vicinanza +//_________________________________________________________________________// +// // +// TOF digit: member variables // +// fSector : TOF sector // +// fPlate : TOF plate // +// fStrip : strips number // +// fPadx : pad number along x // +// fPadz : pad number along z // +// fTdc : TDC // +// fAdc : ADC // +// // +// Getters, setters and member functions defined here // +// // +// -- Authors: F. Pierella, A. Seganti, D. Vicinanza // +//_________________________________________________________________________// -#include - -#include "AliRun.h" +#include "Riostream.h" -#include "AliTOFGeometry.h" -#include "AliTOFGeometryV4.h" -#include "AliTOFGeometryV5.h" #include "AliTOFdigit.h" +#include "AliTOFGeometry.h" ClassImp(AliTOFdigit) diff --git a/TOF/AliTOFdigit.h b/TOF/AliTOFdigit.h index 7bab7fa85c7..bde47e66ef2 100644 --- a/TOF/AliTOFdigit.h +++ b/TOF/AliTOFdigit.h @@ -1,3 +1,8 @@ +#ifndef ALITOFDIGIT_H +#define ALITOFDIGIT_H +/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * + * See cxx source for full Copyright notice */ + //////////////////////////////////////////////// // // // Digit class for TOF // @@ -7,11 +12,6 @@ // // //////////////////////////////////////////////// -#ifndef ALITOFDIGIT_H -#define ALITOFDIGIT_H -/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * - * See cxx source for full Copyright notice */ - /* $Id$ */ #include "AliDigit.h" diff --git a/TOF/AliTOFhit.h b/TOF/AliTOFhit.h index 9a9e286c370..09e666b642b 100644 --- a/TOF/AliTOFhit.h +++ b/TOF/AliTOFhit.h @@ -1,3 +1,8 @@ +#ifndef ALITOFHIT_H +#define ALITOFHIT_H +/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * + * See cxx source for full Copyright notice */ + //////////////////////////////////////////////// // // // Hit class for TOF // @@ -7,11 +12,6 @@ // // //////////////////////////////////////////////// -#ifndef ALITOFHIT_H -#define ALITOFHIT_H -/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * - * See cxx source for full Copyright notice */ - /* $Id$ */ #include "AliHit.h" diff --git a/TOF/AliTOFhitT0.h b/TOF/AliTOFhitT0.h index a639aa01086..b38322aab62 100644 --- a/TOF/AliTOFhitT0.h +++ b/TOF/AliTOFhitT0.h @@ -3,8 +3,6 @@ /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ -#include "AliHit.h" - //////////////////////////////////////////////// // // // Hit class for TOF // @@ -14,6 +12,10 @@ // // //////////////////////////////////////////////// +/* $Id$ */ + +#include "AliHit.h" + class AliTOFhitT0 : public AliHit { public: AliTOFhitT0() {} diff --git a/TOF/AliTOFpidESD.cxx b/TOF/AliTOFpidESD.cxx index b19ccee2563..aeb99de6331 100644 --- a/TOF/AliTOFpidESD.cxx +++ b/TOF/AliTOFpidESD.cxx @@ -13,15 +13,20 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -//----------------------------------------------------------------- -// Implementation of the TOF PID class -// Origin: Iouri Belikov, CERN, Jouri.Belikov@cern.ch -//----------------------------------------------------------------- -#include "TError.h" -#include "AliTOFpidESD.h" +//-----------------------------------------------------------------// +// // +// Implementation of the TOF PID class // +// Origin: Iouri Belikov, CERN, Jouri.Belikov@cern.ch // +// // +//-----------------------------------------------------------------// + +#include "TMath.h" + #include "AliESDtrack.h" #include "AliESD.h" +#include "AliTOFpidESD.h" + ClassImp(AliTOFpidESD) //_________________________________________________________________________ diff --git a/TOF/AliTOFpidESD.h b/TOF/AliTOFpidESD.h index 1fd17feb9f1..3b39965fce2 100644 --- a/TOF/AliTOFpidESD.h +++ b/TOF/AliTOFpidESD.h @@ -1,5 +1,6 @@ #ifndef ALITOFPIDESD_H #define ALITOFPIDESD_H + /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ @@ -8,12 +9,12 @@ // Origin: Iouri Belikov, CERN, Jouri.Belikov@cern.ch //------------------------------------------------------- -#include -#include +#include "TObject.h" -class AliTOFGeometry; class AliESD; +class AliTOFGeometry; + class AliTOFpidESD : public TObject { enum {kMaxCluster=77777}; //maximal number of the TOF clusters public: diff --git a/TOF/AliTOFtrack.cxx b/TOF/AliTOFtrack.cxx index 9127570ac5f..745fc9172a4 100644 --- a/TOF/AliTOFtrack.cxx +++ b/TOF/AliTOFtrack.cxx @@ -12,25 +12,24 @@ * about the suitability of this software for any purpose. It is * * provided "as is" without express or implied warranty. * **************************************************************************/ -//////////////////////////////////////////////////////////////////////// -// -// AliTOFtrack class -// -// Authors: Bologna-CERN-ITEP-Salerno Group -// -// Description: class for handling ESD extracted tracks for TOF matching. -/* $Id$ */ -#include +/* $Id$ */ -#include +///////////////////////////////////////////////////////////////////////////// +// // +// AliTOFtrack class // +// // +// Authors: Bologna-CERN-ITEP-Salerno Group // +// // +// Description: class for handling ESD extracted tracks for TOF matching. // +// // +///////////////////////////////////////////////////////////////////////////// -#include "AliLog.h" #include "AliESDtrack.h" +#include "AliLog.h" -#include "AliTOFGeometry.h" #include "AliTOFGeometryV4.h" -#include "AliTOFGeometryV5.h" +#include "AliTOFGeometry.h" #include "AliTOFtrack.h" ClassImp(AliTOFtrack) diff --git a/TOF/AliTOFtrack.h b/TOF/AliTOFtrack.h index e11e65adea6..4c8f534498e 100644 --- a/TOF/AliTOFtrack.h +++ b/TOF/AliTOFtrack.h @@ -1,15 +1,26 @@ #ifndef ALITOFTRACK_H #define ALITOFTRACK_H -// Description: class for handling ESD extracted tracks for TOF matching. + /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ -#include -#include -#include "AliTOFGeometry.h" +//----------------------------------------------------------------------------// +// // +// Description: class for handling ESD extracted tracks for TOF matching. // +// // +//----------------------------------------------------------------------------// + +#include "TMath.h" #include "TVector2.h" +#include "AliKalmanTrack.h" + +#include "AliTOFGeometry.h" + +class TObject; + class AliESDtrack; + class AliTOFtrack : public AliKalmanTrack { public: diff --git a/TOF/AliTOFtracker.cxx b/TOF/AliTOFtracker.cxx index a2756fdec37..163fcd09df0 100644 --- a/TOF/AliTOFtracker.cxx +++ b/TOF/AliTOFtracker.cxx @@ -12,33 +12,39 @@ * about the suitability of this software for any purpose. It is * * provided "as is" without express or implied warranty. * **************************************************************************/ -// AliTOFtracker Class -// Task: Perform association of the ESD tracks to TOF Clusters -// and Update ESD track with associated TOF Cluster parameters -// -// -- Authors : S. Arcelli, C. Zampolli (Bologna University and INFN) -// -- Contacts: Annalisa.De.Caro@cern.ch -// -- : Chiara.Zampolli@bo.infn.it -// -- : Silvia.Arcelli@bo.infn.it -//-------------------------------------------------------------------- - -#include + +//--------------------------------------------------------------------// +// // +// AliTOFtracker Class // +// Task: Perform association of the ESD tracks to TOF Clusters // +// and Update ESD track with associated TOF Cluster parameters // +// // +// -- Authors : S. Arcelli, C. Zampolli (Bologna University and INFN) // +// -- Contacts: Annalisa.De.Caro@cern.ch // +// -- : Chiara.Zampolli@bo.infn.it // +// -- : Silvia.Arcelli@bo.infn.it // +// // +//--------------------------------------------------------------------// + +#include "Rtypes.h" #include "TClonesArray.h" +#include "TGeoManager.h" +#include "TTree.h" +#include "AliAlignObj.h" +#include "AliESDtrack.h" +#include "AliESD.h" #include "AliLog.h" -#include "AliRun.h" -#include "AliModule.h" +#include "AliTrackPointArray.h" +#include "AliTOFcalib.h" #include "AliTOFcluster.h" -#include "AliTOFtrack.h" #include "AliTOFGeometry.h" #include "AliTOFtracker.h" +#include "AliTOFtrack.h" - -#include "AliTrackPointArray.h" -#include "AliAlignObj.h" -#include "AliTOFcalib.h" +extern TGeoManager *gGeoManager; ClassImp(AliTOFtracker) diff --git a/TOF/AliTOFtracker.h b/TOF/AliTOFtracker.h index 95259abbcde..844d603fb95 100644 --- a/TOF/AliTOFtracker.h +++ b/TOF/AliTOFtracker.h @@ -1,28 +1,34 @@ #ifndef ALITOFTRACKER_H #define ALITOFTRACKER_H + /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ -// AliTOFtracker Class -// Task: Perform association of the ESD tracks to TOF Clusters -// and Update ESD track with associated TOF Cluster parameters -// -// -- Authors : S. Arcelli, C. Zampolli (Bologna University and INFN) -// -- Contacts: Annalisa.De.Caro@cern.ch -// -- : Chiara.Zampolli@bo.infn.it -// -- : Silvia.Arcelli@bo.infn.it -//-------------------------------------------------------------------- /* $Id$ */ -#include "TClonesArray.h" +//----------------------------------------------------------------------// +// // +// AliTOFtracker Class // +// Task: Perform association of the ESD tracks to TOF Clusters // +// and Update ESD track with associated TOF Cluster parameters // +// // +// -- Authors : S. Arcelli, C. Zampolli (Bologna University and INFN) // +// -- Contacts: Annalisa.De.Caro@cern.ch // +// -- : Chiara.Zampolli@bo.infn.it // +// -- : Silvia.Arcelli@bo.infn.it // +// // +//----------------------------------------------------------------------// -#include "AliESD.h" #include "AliTracker.h" #include "AliTOFpidESD.h" -class AliTOFGeometry; +class TClonesArray; + +class AliESD; + class AliTOFcluster; +class AliTOFGeometry; class AliTOFtracker : public AliTracker { diff --git a/TOF/AliTOFtrackerMI.cxx b/TOF/AliTOFtrackerMI.cxx index 0bb5fb65801..f897e69e25b 100644 --- a/TOF/AliTOFtrackerMI.cxx +++ b/TOF/AliTOFtrackerMI.cxx @@ -12,25 +12,33 @@ * about the suitability of this software for any purpose. It is * * provided "as is" without express or implied warranty. * **************************************************************************/ -// AliTOFtracker Class -// Task: Perform association of the ESD tracks to TOF Clusters -// and Update ESD track with associated TOF Cluster parameters -// -//-------------------------------------------------------------------- + +//-----------------------------------------------------------------// +// // +// AliTOFtracker Class // +// Task: Perform association of the ESD tracks to TOF Clusters // +// and Update ESD track with associated TOF Cluster parameters // +// // +//-----------------------------------------------------------------// #include -#include "AliTOFtrackerMI.h" -#include "AliTOFtrack.h" + #include "TClonesArray.h" -#include "TError.h" -#include "AliTOFdigit.h" -#include "AliTOFGeometry.h" -#include "AliTOF.h" -#include "AliRun.h" -#include "AliModule.h" +#include "TGeoManager.h" +#include "TTree.h" #include "TTreeStream.h" -#include "AliTOFcluster.h" + +#include "AliRun.h" +#include "AliESD.h" +#include "AliESDtrack.h" + #include "AliTOFcalib.h" +#include "AliTOFcluster.h" +#include "AliTOFGeometry.h" +#include "AliTOFtrackerMI.h" +#include "AliTOFtrack.h" + +extern TGeoManager *gGeoManager; ClassImp(AliTOFtrackerMI) @@ -133,7 +141,7 @@ void AliTOFtrackerMI::Init() { AliModule* frame=gAlice->GetModule("FRAME"); if(!frame) { - Error("Init","Could Not load FRAME! Assume Frame with Holes \n"); + AliError("Could Not load FRAME! Assume Frame with Holes "); fHoles=true; } else{ if(frame->IsVersion()==1) {fHoles=false;} @@ -589,7 +597,7 @@ void AliTOFtrackerMI::MatchTracksMI(Bool_t mLastStep){ // TBranch *branch=dTree->GetBranch("TOF"); // if (!branch) { -// Error("LoadClusters"," can't get the branch with the TOF digits !\n"); +// AliError(" can't get the branch with the TOF digits !"); // return 1; // } @@ -702,7 +710,7 @@ Int_t AliTOFtrackerMI::InsertCluster(AliTOFcluster *c) { //This function adds a cluster to the array of clusters sorted in Z //-------------------------------------------------------------------- if (fN==kMaxCluster) { - Error("InsertCluster","Too many clusters !\n"); + AliError("Too many clusters !"); return 1; } diff --git a/TOF/AliTOFtrackerMI.h b/TOF/AliTOFtrackerMI.h index 4a2786407b2..1de9dea47c9 100644 --- a/TOF/AliTOFtrackerMI.h +++ b/TOF/AliTOFtrackerMI.h @@ -1,24 +1,31 @@ #ifndef ALITOFTRACKERMI_H #define ALITOFTRACKERMI_H + /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ -// AliTOFtrackerMI Class -// Task: Perform association of the ESD tracks to TOF Clusters -// and Update ESD track with associated TOF Cluster parameters -// -//-------------------------------------------------------------------- /* $Id$ */ +//-----------------------------------------------------------------// +// // +// AliTOFtrackerMI Class // +// Task: Perform association of the ESD tracks to TOF Clusters // +// and Update ESD track with associated TOF Cluster parameters // +// // +//-----------------------------------------------------------------// + #include "AliTracker.h" + #include "AliTOFpidESD.h" -#include "AliESD.h" -#include "TClonesArray.h" +class TTreeSRedirector; +class TClonesArray; + +class AliESD; + +class AliTOFcluster; class AliTOFGeometry; class AliTOFtrack; -class AliTOFcluster; -class TTreeSRedirector; class AliTOFtrackerMI : public AliTracker { diff --git a/TOF/AliTOFv4T0.cxx b/TOF/AliTOFv4T0.cxx index 3e50f57b5c3..1c4d2f38d4b 100644 --- a/TOF/AliTOFv4T0.cxx +++ b/TOF/AliTOFv4T0.cxx @@ -37,27 +37,27 @@ // // /////////////////////////////////////////////////////////////////////////////// -#include -#include - +#include "TBRIK.h" +#include "TGeometry.h" +#include "TLorentzVector.h" +#include "TNode.h" #include "TVirtualMC.h" -#include -#include -#include -#include -#include -#include -#include "AliLog.h" #include "AliConst.h" -#include "AliRun.h" -#include "AliMC.h" +#include "AliLog.h" #include "AliMagF.h" +#include "AliMC.h" +#include "AliRun.h" #include "AliTOFGeometry.h" #include "AliTOFGeometryV4.h" #include "AliTOFv4T0.h" +extern TDirectory *gDirectory; +extern TVirtualMC *gMC; + +extern AliRun *gAlice; + ClassImp(AliTOFv4T0) //_____________________________________________________________________________ @@ -80,7 +80,7 @@ AliTOFv4T0::AliTOFv4T0(const char *name, const char *title) // put TOF - AliModule* frame=gAlice->GetModule("FRAME"); + AliModule* frame = (AliModule*)gAlice->GetModule("FRAME"); if(!frame) { AliFatal("TOF needs FRAME to be present"); } else{ @@ -116,8 +116,10 @@ void AliTOFv4T0::BuildGeometry() TNode *node, *top; const int kColorTOF = 27; + TGeometry *globalGeometry = (TGeometry*)gAlice->GetGeometry(); + // Find top TNODE - top = gAlice->GetGeometry()->GetNode("alice"); + top = (TNode*)globalGeometry->GetNode("alice"); // Position the different copies const Float_t krTof =(fTOFGeometry->Rmax()+fTOFGeometry->Rmin())/2.; @@ -906,9 +908,11 @@ void AliTOFv4T0::CreateMaterials() // Revision: F. Pierella 18-VI-2002 // - Int_t isxfld = gAlice->Field()->Integ(); - Float_t sxmgmx = gAlice->Field()->Max(); - // + AliMagF *magneticField = (AliMagF*)gAlice->Field(); + + Int_t isxfld = magneticField->Integ(); + Float_t sxmgmx = magneticField->Max(); + //--- Quartz (SiO2) to simulate float glass // density tuned to have correct float glass // radiation length @@ -1101,7 +1105,10 @@ void AliTOFv4T0::StepManager() ) { - AddTrackReference(gAlice->GetMCApp()->GetCurrentTrackNumber()); + AliMC *mcApplication = (AliMC*)gAlice->GetMCApp(); + + AddTrackReference(mcApplication->GetCurrentTrackNumber()); + //AddTrackReference(gAlice->GetMCApp()->GetCurrentTrackNumber()); // getting information about hit volumes @@ -1216,6 +1223,7 @@ void AliTOFv4T0::StepManager() vol[3]= padx; vol[4]= padz; - AddT0Hit(gAlice->GetMCApp()->GetCurrentTrackNumber(),vol, hits); + AddT0Hit(mcApplication->GetCurrentTrackNumber(),vol, hits); + //AddT0Hit(gAlice->GetMCApp()->GetCurrentTrackNumber(),vol, hits); } } diff --git a/TOF/AliTOFv4T0.h b/TOF/AliTOFv4T0.h index ca604fd91f7..d7ef688e92c 100644 --- a/TOF/AliTOFv4T0.h +++ b/TOF/AliTOFv4T0.h @@ -1,14 +1,18 @@ -//_________________________________________________________________________ -// Implementation version v4 of TOF Manager class -// FULL COVERAGE VERSION i.e. NO HOLES FOR PHOS AND HMPID (RICH) ARE DEFINED -// -//*-- Authors: Pierella, Seganti, Vicinanza (Bologna and Salerno University) - #ifndef ALITOFv4T0_H #define ALITOFv4T0_H + /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ +//_____________________________________________________________________________// +// // +// Implementation version v4 of TOF Manager class // +// FULL COVERAGE VERSION i.e. NO HOLES FOR PHOS AND HMPID (RICH) ARE DEFINED // +// // +// -- Authors: Pierella, Seganti, Vicinanza (Bologna and Salerno University) // +// // +//_____________________________________________________________________________// + #include "AliTOF.h" @@ -17,9 +21,7 @@ class AliTOFv4T0 : public AliTOF { public: AliTOFv4T0(); AliTOFv4T0(const char *name, const char *title); - virtual ~AliTOFv4T0() { if (fTOFGeometry) {delete fTOFGeometry; - fTOFGeometry = 0; } -} + virtual ~AliTOFv4T0() {}; virtual void BuildGeometry(); virtual void CreateGeometry(); virtual void CreateMaterials(); diff --git a/TOF/AliTOFv5T0.cxx b/TOF/AliTOFv5T0.cxx index b759de27de0..db5e21ec905 100644 --- a/TOF/AliTOFv5T0.cxx +++ b/TOF/AliTOFv5T0.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.7 2006/04/16 22:29:05 hristov +Coding conventions (Annalisa) + Revision 1.6 2006/03/20 08:20:35 decaro Al layer: positioning correction @@ -64,27 +67,27 @@ Revision 0.1 2004 November G. Cara Romeo and A. De Caro // // /////////////////////////////////////////////////////////////////////////////// -#include "Riostream.h" -#include - +#include "TBRIK.h" +#include "TGeometry.h" +#include "TLorentzVector.h" +#include "TNode.h" #include "TVirtualMC.h" -#include -#include -#include -#include -#include -#include -#include "AliLog.h" #include "AliConst.h" -#include "AliRun.h" -#include "AliMC.h" +#include "AliLog.h" #include "AliMagF.h" +#include "AliMC.h" +#include "AliRun.h" #include "AliTOFGeometry.h" #include "AliTOFGeometryV5.h" #include "AliTOFv5T0.h" +extern TDirectory *gDirectory; +extern TVirtualMC *gMC; + +extern AliRun *gAlice; + ClassImp(AliTOFv5T0) //_____________________________________________________________________________ @@ -107,7 +110,7 @@ AliTOFv5T0::AliTOFv5T0(const char *name, const char *title) // put TOF - AliModule* frame=gAlice->GetModule("FRAME"); + AliModule* frame = (AliModule*)gAlice->GetModule("FRAME"); if(!frame) { AliFatal("TOF needs FRAME to be present"); } else{ @@ -145,8 +148,10 @@ void AliTOFv5T0::BuildGeometry() TNode *node, *top; const int kColorTOF = 27; + TGeometry *globalGeometry = (TGeometry*)gAlice->GetGeometry(); + // Find top TNODE - top = gAlice->GetGeometry()->GetNode("alice"); + top = globalGeometry->GetNode("alice"); // Position the different copies const Float_t krTof =(fTOFGeometry->Rmax()+fTOFGeometry->Rmin())/2.; @@ -1183,12 +1188,14 @@ void AliTOFv5T0::CreateMaterials() //AliTOF::CreateMaterials(); - Int_t isxfld = gAlice->Field()->Integ(); - Float_t sxmgmx = gAlice->Field()->Max(); + AliMagF *magneticField = (AliMagF*)gAlice->Field(); + + Int_t isxfld = magneticField->Integ(); + Float_t sxmgmx = magneticField->Max(); + Float_t we[7], ae[7], na[7], fr[7], vl[7]; Int_t i; - // //--- Quartz (SiO2) to simulate float glass // density tuned to have correct float glass // radiation length @@ -1383,7 +1390,10 @@ void AliTOFv5T0::StepManager() ) { - AddTrackReference(gAlice->GetMCApp()->GetCurrentTrackNumber()); + AliMC *mcApplication = (AliMC*)gAlice->GetMCApp(); + + AddTrackReference(mcApplication->GetCurrentTrackNumber()); + //AddTrackReference(gAlice->GetMCApp()->GetCurrentTrackNumber()); // getting information about hit volumes @@ -1479,7 +1489,8 @@ void AliTOFv5T0::StepManager() vol[3]= padx; vol[4]= padz; - AddT0Hit(gAlice->GetMCApp()->GetCurrentTrackNumber(),vol, hits); + AddT0Hit(mcApplication->GetCurrentTrackNumber(),vol, hits); + //AddT0Hit(gAlice->GetMCApp()->GetCurrentTrackNumber(),vol, hits); } } //------------------------------------------------------------------- diff --git a/TOF/AliTOFv5T0.h b/TOF/AliTOFv5T0.h index 319004df84c..f9bda7978dd 100644 --- a/TOF/AliTOFv5T0.h +++ b/TOF/AliTOFv5T0.h @@ -1,14 +1,17 @@ -//_________________________________________________________________________ -// Implementation version v5 of TOF Manager class -// FULL COVERAGE VERSION + OPTION FOR PHOS HOLES -// -//*-- Authors: G. Cara Romeo, A. De Caro - #ifndef ALITOFv5T0_H #define ALITOFv5T0_H /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ +//_________________________________________________________________________// +// // +// Implementation version v5 of TOF Manager class // +// FULL COVERAGE VERSION + OPTION FOR PHOS HOLES // +// // +// -- Authors: G. Cara Romeo, A. De Caro // +// // +//_________________________________________________________________________// + #include "AliTOF.h" @@ -17,9 +20,7 @@ class AliTOFv5T0 : public AliTOF { public: AliTOFv5T0(); AliTOFv5T0(const char *name, const char *title); - virtual ~AliTOFv5T0() { if (fTOFGeometry) {delete fTOFGeometry; - fTOFGeometry = 0; } -} + virtual ~AliTOFv5T0() {}; virtual void BuildGeometry(); virtual void CreateGeometry(); virtual void CreateMaterials(); -- 2.43.0