From 5c7c93fa721bb44809f719d25b85d6a86015032d Mon Sep 17 00:00:00 2001 From: decaro Date: Fri, 8 Feb 2008 15:10:02 +0000 Subject: [PATCH] Coding convention: GC2 violation -> suppression --- TOF/AliTOFAlignment.cxx | 12 +++- TOF/AliTOFAlignment.h | 21 ++++--- TOF/AliTOFClusterFinder.cxx | 10 +-- TOF/AliTOFDataDCS.cxx | 14 ++--- TOF/AliTOFDataDCS.h | 10 +-- TOF/AliTOFDecoder.cxx | 1 + TOF/AliTOFDecoder.h | 8 ++- TOF/AliTOFDigitizer.cxx | 8 +-- TOF/AliTOFGeometry.cxx | 6 +- TOF/AliTOFGeometry.h | 2 + TOF/AliTOFHitDataBuffer.cxx | 2 + TOF/AliTOFHitDataBuffer.h | 2 + TOF/AliTOFQAChecker.cxx | 8 ++- TOF/AliTOFQAChecker.h | 7 ++- TOF/AliTOFQADataMakerRec.cxx | 13 ++-- TOF/AliTOFQADataMakerSim.cxx | 7 ++- TOF/AliTOFRawStream.cxx | 1 + TOF/AliTOFRawStream.h | 4 +- TOF/AliTOFReconstructor.cxx | 8 ++- TOF/AliTOFSDigit.cxx | 2 +- TOF/AliTOFSDigit.h | 2 +- TOF/AliTOFSDigitizer.cxx | 1 + TOF/AliTOFT0.cxx | 8 ++- TOF/AliTOFcalib.cxx | 14 +++-- TOF/AliTOFcalib.h | 2 +- TOF/AliTOFcluster.cxx | 6 +- TOF/AliTOFtracker.cxx | 7 ++- TOF/AliTOFtracker.h | 114 ++++++++++++++++++----------------- TOF/AliTOFtrackerMI.cxx | 7 ++- TOF/AliTOFtrackerMI.h | 61 ++++++++++--------- TOF/AliTOFtrackerV1.cxx | 8 ++- TOF/AliTOFtrackerV1.h | 95 ++++++++++++++--------------- TOF/AliTOFv6T0.cxx | 1 + 33 files changed, 266 insertions(+), 206 deletions(-) diff --git a/TOF/AliTOFAlignment.cxx b/TOF/AliTOFAlignment.cxx index 91b96091953..a89a6423b57 100644 --- a/TOF/AliTOFAlignment.cxx +++ b/TOF/AliTOFAlignment.cxx @@ -82,12 +82,20 @@ author: Silvia Arcelli, arcelli@bo.infn.it #include +#include "TGeoMatrix.h" #include "TMath.h" #include "TFile.h" #include "TRandom.h" +#include "TGeoManager.h" +#include "TGeoVolume.h" +#include "TGeoBBox.h" +#include "TGeoTrd1.h" +#include "TGeoPhysicalNode.h" +#include "TGeoNode.h" +#include "TObjString.h" #include "AliLog.h" -#include "AliAlignObj.h" +//#include "AliAlignObj.h" #include "AliAlignObjParams.h" #include "AliAlignObjMatrix.h" #include "AliCDBManager.h" @@ -97,7 +105,7 @@ author: Silvia Arcelli, arcelli@bo.infn.it #include "AliTOFAlignment.h" #include "AliSurveyObj.h" #include "AliSurveyPoint.h" -#include "TObjString.h" + ClassImp(AliTOFAlignment) const Double_t AliTOFAlignment::fgkRorigTOF = 384.5; // Mean Radius of the TOF ext. volume, cm diff --git a/TOF/AliTOFAlignment.h b/TOF/AliTOFAlignment.h index 7bc40d72dfa..3612418339f 100644 --- a/TOF/AliTOFAlignment.h +++ b/TOF/AliTOFAlignment.h @@ -7,18 +7,21 @@ ////////////////////////////////////////////////////////////////// // class for TOF Alignment:: // ////////////////////////////////////////////////////////////////// -#include -#include +//#include +//#include #include "TTask.h" -#include "TGeoManager.h" -#include "TGeoVolume.h" -#include "TGeoBBox.h" -#include "TGeoTrd1.h" -#include "TGeoPhysicalNode.h" -#include "TGeoNode.h" - +//#include "TGeoManager.h" +//#include "TGeoVolume.h" +//#include "TGeoBBox.h" +//#include "TGeoTrd1.h" +//#include "TGeoPhysicalNode.h" +//#include "TGeoNode.h" +//#include "TGeoMatrix.h" +class TGeoManager; class TObjArray; +class TString; +class TGeoMatrix; class AliTOFAlignment :public TTask{ diff --git a/TOF/AliTOFClusterFinder.cxx b/TOF/AliTOFClusterFinder.cxx index 5df1a584c5e..bf2947c4774 100644 --- a/TOF/AliTOFClusterFinder.cxx +++ b/TOF/AliTOFClusterFinder.cxx @@ -99,21 +99,22 @@ Revision 0.01 2005/07/25 A. De Caro // // //////////////////////////////////////////////////////////////// +#include "Riostream.h" #include "TClonesArray.h" #include "TStopwatch.h" #include "TTree.h" -#include -#include +//#include #include -#include -#include "AliAlignObj.h" +//#include #include "AliDAQ.h" #include "AliLoader.h" #include "AliLog.h" #include "AliRawReader.h" #include "AliRunLoader.h" +//#include "AliAlignObj.h" +#include #include "AliTOFcalib.h" #include "AliTOFChannelOnline.h" @@ -125,7 +126,6 @@ Revision 0.01 2005/07/25 A. De Caro #include "AliTOFGeometry.h" #include "AliTOFrawData.h" #include "AliTOFRawStream.h" -#include "Riostream.h" //extern TFile *gFile; diff --git a/TOF/AliTOFDataDCS.cxx b/TOF/AliTOFDataDCS.cxx index 8dede4aa8b0..b6134e32a0b 100644 --- a/TOF/AliTOFDataDCS.cxx +++ b/TOF/AliTOFDataDCS.cxx @@ -44,18 +44,18 @@ Class for handling the TOF DCS data in the Shuttle (C.Zampolli) */ -#include "AliTOFDataDCS.h" +#include "TString.h" +//#include "TF1.h" +//#include "TH1F.h" +#include "TTimeStamp.h" +#include "TMap.h" +#include "TCanvas.h" #include "AliDCSValue.h" #include "AliLog.h" -//#include "TString.h" +#include "AliTOFDataDCS.h" #include "AliTOFFormatDCS.h" -#include "TF1.h" -#include "TCanvas.h" -#include "TH1F.h" -#include "TTimeStamp.h" -#include "TMap.h" class TH2; class AliCDBMetaData; diff --git a/TOF/AliTOFDataDCS.h b/TOF/AliTOFDataDCS.h index cf0d17fd4b8..9fe91c5ace8 100644 --- a/TOF/AliTOFDataDCS.h +++ b/TOF/AliTOFDataDCS.h @@ -7,14 +7,14 @@ /* $Id$ */ #include "TObject.h" -#include "TString.h" +//#include "TString.h" class TMap; class TClonesArray; -class TH2F; -class TGraph; -class TF1; -//class TString; +//class TH2F; +//class TGraph; +//class TF1; +class TString; class AliTOFFormatDCS; // AliTOFDataDCS class diff --git a/TOF/AliTOFDecoder.cxx b/TOF/AliTOFDecoder.cxx index 64ec9b8e0aa..6fa854d281e 100644 --- a/TOF/AliTOFDecoder.cxx +++ b/TOF/AliTOFDecoder.cxx @@ -46,6 +46,7 @@ TOF Raw Data decoder #include "AliLog.h" #include "AliTOFHitData.h" +#include "AliTOFHitDataBuffer.h" #include "AliTOFDecoder.h" #include "AliTOFGeometry.h" diff --git a/TOF/AliTOFDecoder.h b/TOF/AliTOFDecoder.h index c26f941dfa1..360ba8621fd 100644 --- a/TOF/AliTOFDecoder.h +++ b/TOF/AliTOFDecoder.h @@ -1,8 +1,6 @@ #ifndef ALITOFDECODER_H #define ALITOFDECODER_H -#include "AliTOFGeometry.h" - /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ @@ -88,7 +86,11 @@ #include "TObject.h" #include "AliTOFRawDataFormat.h" -#include "AliTOFHitDataBuffer.h" +#include "AliTOFHitData.h" +//#include "AliTOFHitDataBuffer.h" +//#include "AliTOFGeometry.h" + +class AliTOFHitDataBuffer; class AliTOFDecoder : public TObject { diff --git a/TOF/AliTOFDigitizer.cxx b/TOF/AliTOFDigitizer.cxx index 4b5bf0a213c..bd7f394554a 100644 --- a/TOF/AliTOFDigitizer.cxx +++ b/TOF/AliTOFDigitizer.cxx @@ -25,9 +25,9 @@ // // //_________________________________________________________________________// -#include "Riostream.h" +//#include "Riostream.h" -#include "TFile.h" +//#include "TFile.h" #include "TH1F.h" #include "TTree.h" #include "TRandom.h" @@ -40,7 +40,7 @@ #include "AliRun.h" #include "AliTOFcalib.h" -#include "AliTOFChannelOnline.h" +//#include "AliTOFChannelOnline.h" #include "AliTOFChannelOffline.h" #include "AliTOFDigitizer.h" #include "AliTOFdigit.h" @@ -50,7 +50,7 @@ #include "AliTOF.h" extern TDirectory *gDirectory; -extern TFile *gFile; +//extern TFile *gFile; extern TRandom *gRandom; extern AliRun *gAlice; diff --git a/TOF/AliTOFGeometry.cxx b/TOF/AliTOFGeometry.cxx index ea00f8d6e2b..a735b1c8cb5 100644 --- a/TOF/AliTOFGeometry.cxx +++ b/TOF/AliTOFGeometry.cxx @@ -106,10 +106,14 @@ Revision 0.01 2003/12/04 S.Arcelli /////////////////////////////////////////////////////////////////////////////// #include "TGeoManager.h" -#include "AliTOFGeometry.h" +//#include "TGeoMatrix.h" +#include "TMath.h" + #include "AliLog.h" #include "AliConst.h" +#include "AliTOFGeometry.h" + extern TGeoManager *gGeoManager; ClassImp(AliTOFGeometry) diff --git a/TOF/AliTOFGeometry.h b/TOF/AliTOFGeometry.h index 711c3c14dd7..4929a504aa7 100644 --- a/TOF/AliTOFGeometry.h +++ b/TOF/AliTOFGeometry.h @@ -15,6 +15,8 @@ #include "TGeoMatrix.h" #include "TObject.h" +//class TGeoMatrix; + class AliTOFGeometry: public TObject{ public: diff --git a/TOF/AliTOFHitDataBuffer.cxx b/TOF/AliTOFHitDataBuffer.cxx index ce5a90e7482..3ac2c33a44e 100644 --- a/TOF/AliTOFHitDataBuffer.cxx +++ b/TOF/AliTOFHitDataBuffer.cxx @@ -32,6 +32,8 @@ container for TOF raw data //////////////////////////////////////////////////////////////////////// #include "AliLog.h" + +//#include "AliTOFHitData.h" #include "AliTOFHitDataBuffer.h" ClassImp(AliTOFHitDataBuffer) diff --git a/TOF/AliTOFHitDataBuffer.h b/TOF/AliTOFHitDataBuffer.h index 8d9963614e8..2200609dbed 100644 --- a/TOF/AliTOFHitDataBuffer.h +++ b/TOF/AliTOFHitDataBuffer.h @@ -14,6 +14,8 @@ #include "TObject.h" #include "AliTOFHitData.h" +//class AliTOFHitData; + //data buffer size #define DATA_BUFFER_SIZE 1000 diff --git a/TOF/AliTOFQAChecker.cxx b/TOF/AliTOFQAChecker.cxx index 4189c8b8f6b..ae128392f2e 100644 --- a/TOF/AliTOFQAChecker.cxx +++ b/TOF/AliTOFQAChecker.cxx @@ -24,11 +24,13 @@ // // ///////////////////////////////////////////////////////////////////// -#include "AliLog.h" #include "TH1.h" #include "TList.h" -#include "AliQA.h" -#include "AliQAChecker.h" + +#include "AliLog.h" +//#include "AliQA.h" +//#include "AliQAChecker.h" + #include "AliTOFQAChecker.h" ClassImp(AliTOFQAChecker) diff --git a/TOF/AliTOFQAChecker.h b/TOF/AliTOFQAChecker.h index 9cbab9910a3..3d396f878ed 100644 --- a/TOF/AliTOFQAChecker.h +++ b/TOF/AliTOFQAChecker.h @@ -11,11 +11,12 @@ // // ///////////////////////////////////////////////////////////////////// -class TFile ; -class TH1F ; -class TH1I ; #include "AliQACheckerBase.h" +//class TFile ; +//class TH1F ; +//class TH1I ; + class AliTOFQAChecker: public AliQACheckerBase { public: diff --git a/TOF/AliTOFQADataMakerRec.cxx b/TOF/AliTOFQADataMakerRec.cxx index 44aaba24c49..77d0529c3f0 100644 --- a/TOF/AliTOFQADataMakerRec.cxx +++ b/TOF/AliTOFQADataMakerRec.cxx @@ -22,19 +22,22 @@ /////////////////////////////////////////////////////////////////////// #include -#include -#include +//#include +//#include #include #include + +#include "AliLog.h" #include "AliESDEvent.h" #include "AliESDtrack.h" -#include "AliTOFcluster.h" -#include "AliTOFQADataMakerRec.h" #include "AliQAChecker.h" #include "AliRawReader.h" + +#include "AliTOFcluster.h" +#include "AliTOFQADataMakerRec.h" #include "AliTOFRawStream.h" #include "AliTOFrawData.h" -#include "AliLog.h" +#include "AliTOFGeometry.h" ClassImp(AliTOFQADataMakerRec) diff --git a/TOF/AliTOFQADataMakerSim.cxx b/TOF/AliTOFQADataMakerSim.cxx index faf92b698c4..caac702b7c1 100644 --- a/TOF/AliTOFQADataMakerSim.cxx +++ b/TOF/AliTOFQADataMakerSim.cxx @@ -22,19 +22,20 @@ /////////////////////////////////////////////////////////////////////// #include -#include -#include +//#include +//#include #include #include #include #include +#include "AliLog.h" + #include "AliTOFdigit.h" #include "AliTOFSDigit.h" #include "AliTOFhitT0.h" #include "AliTOFQADataMakerSim.h" #include "AliQAChecker.h" -#include "AliLog.h" #include "AliTOFGeometry.h" diff --git a/TOF/AliTOFRawStream.cxx b/TOF/AliTOFRawStream.cxx index 2faa25dddfd..b5a2a6771ee 100644 --- a/TOF/AliTOFRawStream.cxx +++ b/TOF/AliTOFRawStream.cxx @@ -100,6 +100,7 @@ Revision 0.01 2005/07/22 A. De Caro #include "AliTOFRawMap.h" #include "AliTOFRawStream.h" +#include "AliTOFHitData.h" ClassImp(AliTOFRawStream) diff --git a/TOF/AliTOFRawStream.h b/TOF/AliTOFRawStream.h index 851167184e6..06a1dc992c7 100644 --- a/TOF/AliTOFRawStream.h +++ b/TOF/AliTOFRawStream.h @@ -12,10 +12,12 @@ /////////////////////////////////////////////////////////////// #include "TObject.h" -#include "AliTOFHitData.h" + +//#include "AliTOFHitData.h" #include "AliTOFHitDataBuffer.h" #include "AliTOFDecoder.h" +class AliTOFHitData; /********************************** * OLD DEFINITIONS diff --git a/TOF/AliTOFReconstructor.cxx b/TOF/AliTOFReconstructor.cxx index 282d654670d..e4669690251 100644 --- a/TOF/AliTOFReconstructor.cxx +++ b/TOF/AliTOFReconstructor.cxx @@ -21,7 +21,7 @@ // // /////////////////////////////////////////////////////////////////////////////// -#include "TFile.h" +//#include "TFile.h" #include "TObjArray.h" #include "TString.h" @@ -36,11 +36,13 @@ #include "AliTOFReconstructor.h" class TTree; +//class TFile; +//class TDirectory; class AliESDEvent; -extern TDirectory *gDirectory; -extern TFile *gFile; +//extern TDirectory *gDirectory; +//extern TFile *gFile; ClassImp(AliTOFReconstructor) diff --git a/TOF/AliTOFSDigit.cxx b/TOF/AliTOFSDigit.cxx index b848272d505..20f1fe8aa8f 100644 --- a/TOF/AliTOFSDigit.cxx +++ b/TOF/AliTOFSDigit.cxx @@ -31,7 +31,7 @@ // -- Authors: F. Pierella, A. Seganti, D. Vicinanza // //_________________________________________________________________________// -#include "TArrayI.h" +//#include "TArrayI.h" #include "AliLog.h" diff --git a/TOF/AliTOFSDigit.h b/TOF/AliTOFSDigit.h index 0670b90394c..b18e8e9655e 100644 --- a/TOF/AliTOFSDigit.h +++ b/TOF/AliTOFSDigit.h @@ -13,7 +13,7 @@ /* $Id$ */ #include "TObject.h" -#include "TArrayF.h" +//#include "TArrayF.h" #include "TArrayI.h" class AliTOFSDigit : public TObject { diff --git a/TOF/AliTOFSDigitizer.cxx b/TOF/AliTOFSDigitizer.cxx index d42404bd296..910b55d0aa5 100644 --- a/TOF/AliTOFSDigitizer.cxx +++ b/TOF/AliTOFSDigitizer.cxx @@ -49,6 +49,7 @@ #include "AliTOFSDigit.h" #include "AliTOF.h" +extern TROOT *gROOT; ClassImp(AliTOFSDigitizer) diff --git a/TOF/AliTOFT0.cxx b/TOF/AliTOFT0.cxx index 191ef3afed1..481ec576acb 100644 --- a/TOF/AliTOFT0.cxx +++ b/TOF/AliTOFT0.cxx @@ -82,7 +82,7 @@ #include #include #include -#include +//#include #include #include #include @@ -99,6 +99,12 @@ #include "AliTOFT0.h" #include "AliTOF.h" +extern TROOT *gROOT; +extern TRandom *gRandom; +extern TBenchmark *gBenchmark; + +extern AliRun *gAlice; + ClassImp(AliTOFT0) //____________________________________________________________________________ diff --git a/TOF/AliTOFcalib.cxx b/TOF/AliTOFcalib.cxx index b17b43253a1..391b83104df 100644 --- a/TOF/AliTOFcalib.cxx +++ b/TOF/AliTOFcalib.cxx @@ -85,13 +85,14 @@ author: Chiara Zampolli, zampolli@bo.infn.it #include "TFile.h" #include "TH1F.h" #include "TH2F.h" -#include "TList.h" -#include "TROOT.h" -#include "TStyle.h" +//#include "TList.h" +//#include "TROOT.h" +//#include "TStyle.h" #include "TTree.h" #include "TChain.h" #include "TProfile.h" #include "TGrid.h" +#include "TMath.h" #include "AliCDBEntry.h" #include "AliCDBRunRange.h" @@ -99,8 +100,8 @@ author: Chiara Zampolli, zampolli@bo.infn.it #include "AliCDBManager.h" #include "AliCDBStorage.h" #include "AliCDBMetaData.h" -#include "AliESDtrack.h" -#include "AliESD.h" +//#include "AliESDtrack.h" +//#include "AliESD.h" #include "AliLog.h" #include "AliTOFcalib.h" @@ -110,6 +111,9 @@ author: Chiara Zampolli, zampolli@bo.infn.it #include "AliTOFGeometry.h" #include "AliTOFRecoParam.h" +class TROOT; +class TStyle; + extern TROOT *gROOT; extern TStyle *gStyle; diff --git a/TOF/AliTOFcalib.h b/TOF/AliTOFcalib.h index fdab46b9735..eebfcee9a97 100644 --- a/TOF/AliTOFcalib.h +++ b/TOF/AliTOFcalib.h @@ -33,7 +33,7 @@ class TObjArray; class TTree; class TChain; -class AliESD; +//class AliESD; class AliTOFCal; class AliTOFRecoParam; diff --git a/TOF/AliTOFcluster.cxx b/TOF/AliTOFcluster.cxx index 3e66184bba9..7b5ff21f924 100644 --- a/TOF/AliTOFcluster.cxx +++ b/TOF/AliTOFcluster.cxx @@ -31,9 +31,9 @@ Revision 0.01 2005/07/25 A. De Caro //////////////////////////////////////////////////////// #include "AliTOFcluster.h" -#include "AliLog.h" -#include "AliGeomManager.h" -#include "TGeoMatrix.h" +//#include "AliLog.h" +//#include "AliGeomManager.h" +//#include "TGeoMatrix.h" ClassImp(AliTOFcluster) diff --git a/TOF/AliTOFtracker.cxx b/TOF/AliTOFtracker.cxx index 28243e0f345..8665a97c547 100644 --- a/TOF/AliTOFtracker.cxx +++ b/TOF/AliTOFtracker.cxx @@ -29,26 +29,29 @@ #include #include +#include #include #include #include #include #include -#include "AliAlignObj.h" +//#include "AliAlignObj.h" +#include "AliGeomManager.h" #include "AliESDtrack.h" #include "AliESDEvent.h" #include "AliLog.h" #include "AliTrackPointArray.h" +#include "AliCDBManager.h" #include "AliTOFcalib.h" +#include "AliTOFpidESD.h" #include "AliTOFRecoParam.h" #include "AliTOFcluster.h" #include "AliTOFGeometry.h" #include "AliTOFtracker.h" #include "AliTOFtrack.h" -#include "AliCDBManager.h" extern TGeoManager *gGeoManager; extern TROOT *gROOT; diff --git a/TOF/AliTOFtracker.h b/TOF/AliTOFtracker.h index ce15729c576..eaea1fe327c 100644 --- a/TOF/AliTOFtracker.h +++ b/TOF/AliTOFtracker.h @@ -20,17 +20,19 @@ //----------------------------------------------------------------------// #include "AliTracker.h" -#include "AliTOFpidESD.h" +//#include "AliTOFpidESD.h" class TClonesArray; +class TH1F; +class TH2F; + class AliESDEvent; class AliTOFcluster; class AliTOFRecoParam; class AliTOFGeometry; -class TH1F; -class TH2F; +class AliTOFpidESD; class AliTOFtracker : public AliTracker { @@ -43,63 +45,63 @@ public: AliTOFtracker& operator=(const AliTOFtracker &source); // ass. op. virtual ~AliTOFtracker(); - virtual Int_t Clusters2Tracks(AliESDEvent* /*event*/) {return -1;}; - virtual Int_t PropagateBack(AliESDEvent* event); - virtual Int_t RefitInward(AliESDEvent* /*event*/) {return -1;}; - virtual Int_t LoadClusters(TTree * cTree); // Load Clusters - virtual void UnloadClusters();// UnLoad Clusters - virtual AliCluster *GetCluster(Int_t /*index*/) const {return NULL;}; - Bool_t GetTrackPoint(Int_t index, AliTrackPoint& p) const; - void InitCheckHists(); - void SaveCheckHists(); + virtual Int_t Clusters2Tracks(AliESDEvent* /*event*/) {return -1;}; + virtual Int_t PropagateBack(AliESDEvent* event); + virtual Int_t RefitInward(AliESDEvent* /*event*/) {return -1;}; + virtual Int_t LoadClusters(TTree * cTree); // Load Clusters + virtual void UnloadClusters();// UnLoad Clusters + virtual AliCluster *GetCluster(Int_t /*index*/) const {return NULL;}; + Bool_t GetTrackPoint(Int_t index, AliTrackPoint& p) const; + void InitCheckHists(); + void SaveCheckHists(); private: - Int_t FindClusterIndex(Double_t z) const; // Returns cluster index - void MatchTracks(Bool_t mLastStep); // Matching Algorithm - void CollectESD(); // Select starting Set for Matching - Float_t GetTimeZerofromTOF(AliESDEvent* /*event*/) const; // T0 from TOF - Float_t GetTimeZerofromT0(AliESDEvent* event) const; // T0 from T0 - Float_t CorrectTimeWalk(Float_t dist,Float_t tof); // Time Walk correction - - AliTOFRecoParam* fRecoParam; // Pointer to TOF Recon. Pars - AliTOFGeometry* fGeom; // Pointer to TOF geometry - AliTOFpidESD* fPid; // Pointer to TOF PID - AliTOFcluster *fClusters[kMaxCluster]; // pointers to the TOF clusters - - Int_t fN; // Number of Clusters - Int_t fNseeds; // Number of track seeds - Int_t fNseedsTOF; // TPC BP tracks - Int_t fngoodmatch; // Correctly matched tracks - Int_t fnbadmatch; // Wrongly matched tracks - Int_t fnunmatch; // Unmatched tracks - Int_t fnmatch; // Total matched tracks + Int_t FindClusterIndex(Double_t z) const; // Returns cluster index + void MatchTracks(Bool_t mLastStep); // Matching Algorithm + void CollectESD(); // Select starting Set for Matching + Float_t GetTimeZerofromTOF(AliESDEvent* /*event*/) const; // T0 from TOF + Float_t GetTimeZerofromT0(AliESDEvent* event) const; // T0 from T0 + Float_t CorrectTimeWalk(Float_t dist,Float_t tof); // Time Walk correction + + AliTOFRecoParam* fRecoParam; // Pointer to TOF Recon. Pars + AliTOFGeometry* fGeom; // Pointer to TOF geometry + AliTOFpidESD* fPid; // Pointer to TOF PID + AliTOFcluster *fClusters[kMaxCluster]; // pointers to the TOF clusters + + Int_t fN; // Number of Clusters + Int_t fNseeds; // Number of track seeds + Int_t fNseedsTOF; // TPC BP tracks + Int_t fngoodmatch; // Correctly matched tracks + Int_t fnbadmatch; // Wrongly matched tracks + Int_t fnunmatch; // Unmatched tracks + Int_t fnmatch; // Total matched tracks - TClonesArray* fTracks; //! pointer to the TClonesArray with TOF tracks - TClonesArray* fSeeds; //! pointer to the TClonesArray with ESD tracks - //Digits/Reco QA histos - - TH2F * fHDigClusMap; //Digits QA, Cluster Map - TH1F * fHDigNClus; //Digits QA, # of clusters on TOF/event - TH1F * fHDigClusTime;//Digits QA, Cluster Time (ns) - TH1F * fHDigClusToT; //Digits QA, Cluster ToT (ns) - TH1F * fHRecNClus; //Reco QA, cluster occupancy in search window - TH1F * fHRecDist;//Reco QA, track-TOF cluster closest distance (cm) - TH2F * fHRecSigYVsP;//Reco QA, track error in Y at TOF inner surface (cm) - TH2F * fHRecSigZVsP; //Reco QA, track error in Z at TOF inner surface (cm) - TH2F * fHRecSigYVsPWin;//Reco QA, search window size in Y (cm) - TH2F * fHRecSigZVsPWin;//Reco QA, search window size in X (cm) - TTree * fCalTree; // Tree for on-the-fly offline Calibration - // internal variables in tree for on-the-fly TOF Calibration - - Int_t fIch; //TOF channel number - Float_t fToT; // Time over Threshold, ns - Float_t fTime; //TOF time, ps - Float_t fExpTimePi; // exp time, Pions - Float_t fExpTimeKa; // exp time, Kaons - Float_t fExpTimePr; // exp time, Protons - - ClassDef(AliTOFtracker, 2) // TOF tracker + TClonesArray* fTracks; //! pointer to the TClonesArray with TOF tracks + TClonesArray* fSeeds; //! pointer to the TClonesArray with ESD tracks + //Digits/Reco QA histos + + TH2F * fHDigClusMap; //Digits QA, Cluster Map + TH1F * fHDigNClus; //Digits QA, # of clusters on TOF/event + TH1F * fHDigClusTime;//Digits QA, Cluster Time (ns) + TH1F * fHDigClusToT; //Digits QA, Cluster ToT (ns) + TH1F * fHRecNClus; //Reco QA, cluster occupancy in search window + TH1F * fHRecDist;//Reco QA, track-TOF cluster closest distance (cm) + TH2F * fHRecSigYVsP;//Reco QA, track error in Y at TOF inner surface (cm) + TH2F * fHRecSigZVsP; //Reco QA, track error in Z at TOF inner surface (cm) + TH2F * fHRecSigYVsPWin;//Reco QA, search window size in Y (cm) + TH2F * fHRecSigZVsPWin;//Reco QA, search window size in X (cm) + TTree * fCalTree; // Tree for on-the-fly offline Calibration + // internal variables in tree for on-the-fly TOF Calibration + + Int_t fIch; //TOF channel number + Float_t fToT; // Time over Threshold, ns + Float_t fTime; //TOF time, ps + Float_t fExpTimePi; // exp time, Pions + Float_t fExpTimeKa; // exp time, Kaons + Float_t fExpTimePr; // exp time, Protons + + ClassDef(AliTOFtracker, 2) // TOF tracker }; #endif diff --git a/TOF/AliTOFtrackerMI.cxx b/TOF/AliTOFtrackerMI.cxx index f6ae8062eb8..49e8907b487 100644 --- a/TOF/AliTOFtrackerMI.cxx +++ b/TOF/AliTOFtrackerMI.cxx @@ -24,11 +24,11 @@ #include #include "TClonesArray.h" -#include "TGeoManager.h" +//#include "TGeoManager.h" #include "TTree.h" #include "TTreeStream.h" -#include "AliRun.h" +//#include "AliRun.h" #include "AliESDEvent.h" #include "AliESDtrack.h" @@ -38,6 +38,9 @@ #include "AliTOFGeometry.h" #include "AliTOFtrackerMI.h" #include "AliTOFtrack.h" +#include "AliTOFpidESD.h" + +class TGeoManager; extern TGeoManager *gGeoManager; diff --git a/TOF/AliTOFtrackerMI.h b/TOF/AliTOFtrackerMI.h index 426108899af..3ae7f33ebcb 100644 --- a/TOF/AliTOFtrackerMI.h +++ b/TOF/AliTOFtrackerMI.h @@ -16,7 +16,7 @@ #include "AliTracker.h" -#include "AliTOFpidESD.h" +//#include "AliTOFpidESD.h" class TTreeSRedirector; class TClonesArray; @@ -27,6 +27,7 @@ class AliTOFcluster; class AliTOFRecoParam; class AliTOFGeometry; class AliTOFtrack; +class AliTOFpidESD; class AliTOFtrackerMI : public AliTracker { @@ -89,36 +90,36 @@ public: private: - Int_t InsertCluster(AliTOFcluster *c); // Fills TofClusters Array - Int_t FindClusterIndex(Double_t z) const; // Returns cluster index - void MatchTracks(Bool_t mLastStep); // Matching Algorithm - void MatchTracksMI(Bool_t mLastStep); // Matching Algorithm - void CollectESD(); // Select starting Set for Matching - //void Init(); - Float_t GetLinearDistances(AliTOFtrack * track, AliTOFcluster *cluster, Float_t distances[5]); - AliTOFRecoParam* fRecoParam; // Pointer to TOF Recontr. Params - AliTOFGeometry* fGeom; // Pointer to TOF geometry - AliTOFpidESD* fPid; // Pointer to TOF PID - AliTOFcluster *fClusters[kMaxCluster]; // pointers to the TOF clusters - - Int_t fN; // Number of Clusters - Int_t fNseeds; // Number of track seeds - Int_t fNseedsTOF; // TPC BP tracks - Int_t fngoodmatch; // Correctly matched tracks - Int_t fnbadmatch; // Wrongly matched tracks - Int_t fnunmatch; // Unmatched tracks - Int_t fnmatch; // Total matched tracks + Int_t InsertCluster(AliTOFcluster *c); // Fills TofClusters Array + Int_t FindClusterIndex(Double_t z) const; // Returns cluster index + void MatchTracks(Bool_t mLastStep); // Matching Algorithm + void MatchTracksMI(Bool_t mLastStep); // Matching Algorithm + void CollectESD(); // Select starting Set for Matching + //void Init(); + Float_t GetLinearDistances(AliTOFtrack * track, AliTOFcluster *cluster, Float_t distances[5]); + AliTOFRecoParam* fRecoParam; // Pointer to TOF Recontr. Params + AliTOFGeometry* fGeom; // Pointer to TOF geometry + AliTOFpidESD* fPid; // Pointer to TOF PID + AliTOFcluster *fClusters[kMaxCluster]; // pointers to the TOF clusters + + Int_t fN; // Number of Clusters + Int_t fNseeds; // Number of track seeds + Int_t fNseedsTOF; // TPC BP tracks + Int_t fngoodmatch; // Correctly matched tracks + Int_t fnbadmatch; // Wrongly matched tracks + Int_t fnunmatch; // Unmatched tracks + Int_t fnmatch; // Total matched tracks - Float_t fR; // Intermediate radius in TOF, used in matching - Float_t fTOFHeigth; // Inner TOF radius for propagation - Float_t fdCut; // Cut on minimum distance track-pad in matching - Float_t fDx; // Pad Size in X - Float_t fDy; // Pad Size in Y (== X TOF convention) - Float_t fDz; // Pad Size in Z - TClonesArray* fTracks; //! pointer to the TClonesArray with TOF tracks - TClonesArray* fSeeds; //! pointer to the TClonesArray with ESD tracks - TTreeSRedirector *fDebugStreamer; //!debug streamer - ClassDef(AliTOFtrackerMI, 1) // TOF trackerMI + Float_t fR; // Intermediate radius in TOF, used in matching + Float_t fTOFHeigth; // Inner TOF radius for propagation + Float_t fdCut; // Cut on minimum distance track-pad in matching + Float_t fDx; // Pad Size in X + Float_t fDy; // Pad Size in Y (== X TOF convention) + Float_t fDz; // Pad Size in Z + TClonesArray* fTracks; //! pointer to the TClonesArray with TOF tracks + TClonesArray* fSeeds; //! pointer to the TClonesArray with ESD tracks + TTreeSRedirector *fDebugStreamer; //!debug streamer + ClassDef(AliTOFtrackerMI, 1) // TOF trackerMI }; #endif diff --git a/TOF/AliTOFtrackerV1.cxx b/TOF/AliTOFtrackerV1.cxx index 58b01e85108..564027a34d7 100644 --- a/TOF/AliTOFtrackerV1.cxx +++ b/TOF/AliTOFtrackerV1.cxx @@ -34,12 +34,15 @@ #include #include #include +#include -#include "AliAlignObj.h" +//#include "AliAlignObj.h" #include "AliESDtrack.h" #include "AliESDEvent.h" #include "AliLog.h" #include "AliTrackPointArray.h" +#include "AliGeomManager.h" +#include "AliCDBManager.h" #include "AliTOFcalib.h" #include "AliTOFRecoParam.h" @@ -47,8 +50,7 @@ #include "AliTOFGeometry.h" #include "AliTOFtrackerV1.h" #include "AliTOFtrack.h" - -#include "AliCDBManager.h" +#include "AliTOFpidESD.h" extern TROOT *gROOT; diff --git a/TOF/AliTOFtrackerV1.h b/TOF/AliTOFtrackerV1.h index b24aa2e6627..7b381b4dd4e 100644 --- a/TOF/AliTOFtrackerV1.h +++ b/TOF/AliTOFtrackerV1.h @@ -20,16 +20,17 @@ //----------------------------------------------------------------------// #include "AliTracker.h" -#include "AliTOFpidESD.h" +//#include "AliTOFpidESD.h" class TClonesArray; +class TH1F; +class TH2F; class AliESDEvent; class AliTOFcluster; class AliTOFRecoParam; -class TH1F; -class TH2F; +class AliTOFpidESD; class AliTOFtrackerV1 : public AliTracker { @@ -42,54 +43,54 @@ public: AliTOFtrackerV1& operator=(const AliTOFtrackerV1 &source); // ass. op. virtual ~AliTOFtrackerV1(); - virtual Int_t Clusters2Tracks(AliESDEvent* /*event*/) {return -1;}; - virtual Int_t PropagateBack(AliESDEvent* event); - virtual Int_t RefitInward(AliESDEvent* /*event*/) {return -1;}; - virtual Int_t LoadClusters(TTree * cTree); // Load Clusters - virtual void UnloadClusters();// UnLoad Clusters - virtual AliCluster *GetCluster(Int_t /*index*/) const {return NULL;}; - Bool_t GetTrackPoint(Int_t index, AliTrackPoint& p) const; - void InitCheckHists(); - void SaveCheckHists(); + virtual Int_t Clusters2Tracks(AliESDEvent* /*event*/) {return -1;}; + virtual Int_t PropagateBack(AliESDEvent* event); + virtual Int_t RefitInward(AliESDEvent* /*event*/) {return -1;}; + virtual Int_t LoadClusters(TTree * cTree); // Load Clusters + virtual void UnloadClusters();// UnLoad Clusters + virtual AliCluster *GetCluster(Int_t /*index*/) const {return NULL;}; + Bool_t GetTrackPoint(Int_t index, AliTrackPoint& p) const; + void InitCheckHists(); + void SaveCheckHists(); private: - Int_t FindClusterIndex(Double_t z) const; // Returns cluster index - void MatchTracks(); // Matching Algorithm - void CollectESD(); // Select starting Set for Matching - Float_t GetTimeZerofromTOF(AliESDEvent* /*event*/) const; // T0 from TOF - Float_t GetTimeZerofromT0(AliESDEvent* event) const; // T0 from T0 - Float_t CorrectTimeWalk(Float_t dist,Float_t tof); // Time Walk correction - - AliTOFRecoParam* fRecoParam; // Pointer to TOF Recon. Pars - AliTOFpidESD* fPid; // Pointer to TOF PID - AliTOFcluster *fClusters[kMaxCluster]; // pointers to the TOF clusters - - Int_t fN; // Number of Clusters - Int_t fNseeds; // Number of track seeds - Int_t fNseedsTOF; // TPC BP tracks - Int_t fngoodmatch; // Correctly matched tracks - Int_t fnbadmatch; // Wrongly matched tracks - Int_t fnunmatch; // Unmatched tracks - Int_t fnmatch; // Total matched tracks + Int_t FindClusterIndex(Double_t z) const; // Returns cluster index + void MatchTracks(); // Matching Algorithm + void CollectESD(); // Select starting Set for Matching + Float_t GetTimeZerofromTOF(AliESDEvent* /*event*/) const; // T0 from TOF + Float_t GetTimeZerofromT0(AliESDEvent* event) const; // T0 from T0 + Float_t CorrectTimeWalk(Float_t dist,Float_t tof); // Time Walk correction + + AliTOFRecoParam* fRecoParam; // Pointer to TOF Recon. Pars + AliTOFpidESD* fPid; // Pointer to TOF PID + AliTOFcluster *fClusters[kMaxCluster]; // pointers to the TOF clusters + + Int_t fN; // Number of Clusters + Int_t fNseeds; // Number of track seeds + Int_t fNseedsTOF; // TPC BP tracks + Int_t fngoodmatch; // Correctly matched tracks + Int_t fnbadmatch; // Wrongly matched tracks + Int_t fnunmatch; // Unmatched tracks + Int_t fnmatch; // Total matched tracks - TClonesArray* fTracks; //! pointer to the TClonesArray with TOF tracks - TClonesArray* fSeeds; //! pointer to the TClonesArray with ESD tracks - //Digits/Reco QA histos - - TH2F * fHDigClusMap; //Digits QA, Cluster Map - TH1F * fHDigNClus; //Digits QA, # of clusters on TOF/event - TH1F * fHDigClusTime;//Digits QA, Cluster Time (ns) - TH1F * fHDigClusToT; //Digits QA, Cluster ToT (ns) - TH1F * fHRecNClus; //Reco QA, cluster occupancy in search window - TH1F * fHRecChi2;//Reco QA, track-best TOF cluster chi2 - TH1F * fHRecDistZ;//Reco QA, track-TOF cluster closest distance (cm) - TH2F * fHRecSigYVsP;//Reco QA, track error in Y at TOF inner surface (cm) - TH2F * fHRecSigZVsP; //Reco QA, track error in Z at TOF inner surface (cm) - TH2F * fHRecSigYVsPWin;//Reco QA, search window size in Y (cm) - TH2F * fHRecSigZVsPWin;//Reco QA, search window size in X (cm) - - ClassDef(AliTOFtrackerV1, 1) // TOF tracker + TClonesArray* fTracks; //! pointer to the TClonesArray with TOF tracks + TClonesArray* fSeeds; //! pointer to the TClonesArray with ESD tracks + //Digits/Reco QA histos + + TH2F * fHDigClusMap; //Digits QA, Cluster Map + TH1F * fHDigNClus; //Digits QA, # of clusters on TOF/event + TH1F * fHDigClusTime;//Digits QA, Cluster Time (ns) + TH1F * fHDigClusToT; //Digits QA, Cluster ToT (ns) + TH1F * fHRecNClus; //Reco QA, cluster occupancy in search window + TH1F * fHRecChi2;//Reco QA, track-best TOF cluster chi2 + TH1F * fHRecDistZ;//Reco QA, track-TOF cluster closest distance (cm) + TH2F * fHRecSigYVsP;//Reco QA, track error in Y at TOF inner surface (cm) + TH2F * fHRecSigZVsP; //Reco QA, track error in Z at TOF inner surface (cm) + TH2F * fHRecSigYVsPWin;//Reco QA, search window size in Y (cm) + TH2F * fHRecSigZVsPWin;//Reco QA, search window size in X (cm) + + ClassDef(AliTOFtrackerV1, 1) // TOF tracker }; #endif diff --git a/TOF/AliTOFv6T0.cxx b/TOF/AliTOFv6T0.cxx index 8551f5f406c..1aa8fcbf4b2 100644 --- a/TOF/AliTOFv6T0.cxx +++ b/TOF/AliTOFv6T0.cxx @@ -89,6 +89,7 @@ Revision 0.1 2007 March G. Cara Romeo and A. De Caro // // /////////////////////////////////////////////////////////////////////////////// +#include "TDirectory.h" #include "TBRIK.h" #include "TGeometry.h" #include "TLorentzVector.h" -- 2.43.0