From b669392e9aa1ead2d8b875eefdaee5c13d4014c3 Mon Sep 17 00:00:00 2001 From: fca Date: Wed, 12 Jul 2000 05:32:20 +0000 Subject: [PATCH] Correcting several syntax problem with static members --- ITS/AliITS.cxx | 5 +++- ITS/AliITS.h | 2 +- ITS/AliITSClusterFinderSSD.cxx | 7 +++++- ITS/AliITSClusterFinderSSD.h | 4 +-- ITS/AliITSetfSDD.cxx | 46 ++++++++++++++++++---------------- ITS/AliITSetfSDD.h | 27 ++++++++++---------- ITS/AliITSpackageSSD.cxx | 25 ++++++++++++++++-- ITS/AliITSpackageSSD.h | 4 +-- 8 files changed, 76 insertions(+), 44 deletions(-) diff --git a/ITS/AliITS.cxx b/ITS/AliITS.cxx index 8525fde4de0..87dfc1635af 100644 --- a/ITS/AliITS.cxx +++ b/ITS/AliITS.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.17 2000/07/10 16:07:18 fca +Release version of ITS code + Revision 1.9.2.3 2000/02/02 13:42:09 barbera fixed AliITS.cxx for new AliRun structure. Added ITS hits list to list of hits which will have their track numbers updated @@ -104,7 +107,7 @@ the AliITS class. #include "AliITSsegmentationSSD.h" #include "AliITSresponseSSD.h" - +const Int_t AliITS::fgkNTYPES=3; ClassImp(AliITS) diff --git a/ITS/AliITS.h b/ITS/AliITS.h index e4d71f5c3f0..c450149dc2c 100644 --- a/ITS/AliITS.h +++ b/ITS/AliITS.h @@ -134,7 +134,7 @@ class AliITS : public AliDetector { protected: - static const Int_t fgkNTYPES=3; // Number of detector types + static const Int_t fgkNTYPES; // Number of detector types AliITSgeom *fITSgeom; // Pointer to ITS geometry TObjArray *fITSmodules; // Pointer to ITS modules diff --git a/ITS/AliITSClusterFinderSSD.cxx b/ITS/AliITSClusterFinderSSD.cxx index cf436464607..a0e76b0f65b 100644 --- a/ITS/AliITSClusterFinderSSD.cxx +++ b/ITS/AliITSClusterFinderSSD.cxx @@ -18,6 +18,8 @@ Adding rekonstruction facilities Piotr Krzysztof Skowronski December 1999. + +$Log$ */ /* @@ -35,7 +37,10 @@ Automatic combination routines improved (traps) #include "AliITSpackageSSD.h" -const Int_t debug=0; +const Bool_t AliITSClusterFinderSSD::fgkSIDEP=kTRUE; +const Bool_t AliITSClusterFinderSSD::fgkSIDEN=kFALSE; + +static const Int_t debug=0; ClassImp(AliITSClusterFinderSSD) diff --git a/ITS/AliITSClusterFinderSSD.h b/ITS/AliITSClusterFinderSSD.h index f8c0d0af934..048f523f371 100644 --- a/ITS/AliITSClusterFinderSSD.h +++ b/ITS/AliITSClusterFinderSSD.h @@ -139,8 +139,8 @@ public: Float_t fPNsignalRatio; - static const Bool_t fgkSIDEP=kTRUE; - static const Bool_t fgkSIDEN=kFALSE; + static const Bool_t fgkSIDEP; + static const Bool_t fgkSIDEN; Int_t fSFF; //forward stepping factor Int_t fSFB; //backward stepping factor diff --git a/ITS/AliITSetfSDD.cxx b/ITS/AliITSetfSDD.cxx index b28e796cf29..2b87db07930 100644 --- a/ITS/AliITSetfSDD.cxx +++ b/ITS/AliITSetfSDD.cxx @@ -23,6 +23,8 @@ // November 23 1999 // //_____________________________________________________________________________ + + ClassImp(AliITSetfSDD) Int_t ppower(Int_t b, Int_t e) { @@ -38,11 +40,11 @@ AliITSetfSDD::AliITSetfSDD(Double_t timestep) fSamplingTime = timestep; fT0 = 0.; - fDf = ppower(10,9)/(fkMaxNofSamples*fSamplingTime); + fDf = ppower(10,9)/(kMaxNofSamples*fSamplingTime); fA0 = 9000.; Int_t i,j; - for(i=0; i +static const Int_t kMaxNofPoles = 5; +static const Int_t kMaxNofSamples = 1024; + class AliITSetfSDD : public TObject { //////////////////////////////////////////////////////////////////////// @@ -25,28 +28,26 @@ class AliITSetfSDD : public TObject { Double_t GetWeightImag(Int_t n) { return fWI[n]; } Double_t GetTraFunReal(Int_t n) { return fTfR[n]; } Double_t GetTraFunImag(Int_t n) { return fTfI[n]; } - Int_t GetSamples() { return fkMaxNofSamples; } + Int_t GetSamples() { return kMaxNofSamples; } void PrintElectronics(); // Print Electronics parameters private: - static const Int_t fkMaxNofPoles = 5; - static const Int_t fkMaxNofSamples = 1024; Double_t fSamplingTime; // Double_t fT0; // Double_t fDf; // Double_t fA0; // - Double_t fZeroM[fkMaxNofPoles]; // - Double_t fZeroR[fkMaxNofPoles]; // - Double_t fZeroI[fkMaxNofPoles]; // - Double_t fPoleM[fkMaxNofPoles]; // - Double_t fPoleR[fkMaxNofPoles]; // - Double_t fPoleI[fkMaxNofPoles]; // - Double_t fTfR[fkMaxNofSamples]; // Transfer function (real part) - Double_t fTfI[fkMaxNofSamples]; // Transfer function (imaginary part) - Double_t fWR[fkMaxNofSamples]; // Fourier Weights (real part) - Double_t fWI[fkMaxNofSamples]; // Fourier Weights (imaginary part) + Double_t fZeroM[kMaxNofPoles]; // + Double_t fZeroR[kMaxNofPoles]; // + Double_t fZeroI[kMaxNofPoles]; // + Double_t fPoleM[kMaxNofPoles]; // + Double_t fPoleR[kMaxNofPoles]; // + Double_t fPoleI[kMaxNofPoles]; // + Double_t fTfR[kMaxNofSamples]; // Transfer function (real part) + Double_t fTfI[kMaxNofSamples]; // Transfer function (imaginary part) + Double_t fWR[kMaxNofSamples]; // Fourier Weights (real part) + Double_t fWI[kMaxNofSamples]; // Fourier Weights (imaginary part) ClassDef(AliITSetfSDD,1) // Class for SDD electornics }; diff --git a/ITS/AliITSpackageSSD.cxx b/ITS/AliITSpackageSSD.cxx index e2214e8b6a7..a9656e2dac0 100644 --- a/ITS/AliITSpackageSSD.cxx +++ b/ITS/AliITSpackageSSD.cxx @@ -1,6 +1,24 @@ +/************************************************************************** + * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * + * * + * Author: The ALICE Off-line Project. * + * Contributors are mentioned in the code where appropriate. * + * * + * Permission to use, copy, modify and distribute this software and its * + * documentation strictly for non-commercial purposes is hereby granted * + * without fee, provided that the above copyright notice appears in all * + * copies and that both the copyright notice and this permission notice * + * 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$ +*/ + #include #include - #include "AliITSpackageSSD.h" //************************************************ @@ -9,7 +27,10 @@ //skowron@if.pw.edu.pl // -const Int_t debug=0; +const Bool_t AliITSpackageSSD::fgkSIDEP=kTRUE; +const Bool_t AliITSpackageSSD::fgkSIDEN=kFALSE; + +static const Int_t debug=0; ClassImp(AliITSpackageSSD) diff --git a/ITS/AliITSpackageSSD.h b/ITS/AliITSpackageSSD.h index 905f8a60911..469136e7669 100644 --- a/ITS/AliITSpackageSSD.h +++ b/ITS/AliITSpackageSSD.h @@ -82,8 +82,8 @@ protected: TArrayI *fClusterNIndexes; TArrayI *fClusterPIndexes; - static const Bool_t fgkSIDEP=kTRUE; - static const Bool_t fgkSIDEN=kFALSE; + static const Bool_t fgkSIDEP; + static const Bool_t fgkSIDEN; /***************/ -- 2.39.3