Correcting several syntax problem with static members

diff --git a/ITS/AliITS.cxx b/ITS/AliITS.cxx
index 8525fde..87dfc16 100644 (file)
--- 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 e4d71f5..c450149 100644 (file)
--- 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 cf43646..a0e76b0 100644 (file)
--- 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 f8c0d0a..048f523 100644 (file)
--- 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 b28e796..2b87db0 100644 (file)
--- 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<fkMaxNofPoles; i++) {
+  for(i=0; i<kMaxNofPoles; i++) {
     fZeroM[i] = 0.;
     fZeroR[i] = 0.;
     fZeroI[i] = 0.;
@@ -60,11 +62,11 @@ AliITSetfSDD::AliITSetfSDD(Double_t timestep)
    // Compute Transfer Function
 
   Double_t PI = acos(-1.);
-  for(i=0; i<=fkMaxNofSamples/2; i++) {
+  for(i=0; i<=kMaxNofSamples/2; i++) {
     Double_t frequency = fDf*i;
     Double_t VM = fA0;
     Double_t VA = 0.;
-    for(Int_t k=0; k<fkMaxNofPoles; k++) {
+    for(Int_t k=0; k<kMaxNofPoles; k++) {
       if(fZeroM[k]) {
         Double_t VZR = -fZeroR[k];
         Double_t VZI = frequency - fZeroI[k];
@@ -105,20 +107,20 @@ AliITSetfSDD::AliITSetfSDD(Double_t timestep)
       //cout << "fTfR[" << i << "] = " << fTfR[i] << endl;
       //cout << "fTfI[" << i << "] = " << fTfI[i] << endl;
       if(i) {
-        fTfR[fkMaxNofSamples-i] = fTfR[i];
-        fTfI[fkMaxNofSamples-i] = -fTfI[i];
+        fTfR[kMaxNofSamples-i] = fTfR[i];
+        fTfI[kMaxNofSamples-i] = -fTfI[i];
       }
     }
   }
   
   // Compute Fourier Weights
 
-  for(i=0; i<=fkMaxNofSamples/2; i++) {
-    fWR[i] = cos(-2.*PI*i/fkMaxNofSamples);
-    fWI[i] = sin(-2.*PI*i/fkMaxNofSamples);
+  for(i=0; i<=kMaxNofSamples/2; i++) {
+    fWR[i] = cos(-2.*PI*i/kMaxNofSamples);
+    fWI[i] = sin(-2.*PI*i/kMaxNofSamples);
     if(i) {
-      fWR[fkMaxNofSamples-i] = fWR[i];
-      fWI[fkMaxNofSamples-i] = -fWI[i];
+      fWR[kMaxNofSamples-i] = fWR[i];
+      fWI[kMaxNofSamples-i] = -fWI[i];
     }
   }
 
@@ -127,7 +129,7 @@ AliITSetfSDD::AliITSetfSDD(Double_t timestep)
 void AliITSetfSDD::PrintElectronics()
 {
   cout << "Sampling Time " << fSamplingTime << endl;
-  cout << "Number of Time Samples " << fkMaxNofSamples << endl;
+  cout << "Number of Time Samples " << kMaxNofSamples << endl;
   cout << "fT0 " << fT0 << endl;
   cout << "fDf " << fDf << endl;
   cout << "fA0 " << fA0 << endl;
@@ -135,29 +137,29 @@ void AliITSetfSDD::PrintElectronics()
   cout << "Zero's and Pole's" << endl;
   cout << "fZeroM " << endl;
   Int_t i;
-  for(i=0; i<fkMaxNofPoles; i++) cout << fZeroM[i] << endl;
+  for(i=0; i<kMaxNofPoles; i++) cout << fZeroM[i] << endl;
   cout << "fZero_R " << endl;
-  for(i=0; i<fkMaxNofPoles; i++) cout << fZeroR[i] << endl;
+  for(i=0; i<kMaxNofPoles; i++) cout << fZeroR[i] << endl;
   cout << "fZeroI " << endl;
-  for(i=0; i<fkMaxNofPoles; i++) cout << fZeroI[i] << endl;
+  for(i=0; i<kMaxNofPoles; i++) cout << fZeroI[i] << endl;
   cout << "fPoleM " << endl;
-  for(i=0; i<fkMaxNofPoles; i++) cout << fPoleM[i] << endl;
+  for(i=0; i<kMaxNofPoles; i++) cout << fPoleM[i] << endl;
   cout << "fPoleR " << endl;
-  for(i=0; i<fkMaxNofPoles; i++) cout << fPoleR[i] << endl;
+  for(i=0; i<kMaxNofPoles; i++) cout << fPoleR[i] << endl;
   cout << "fPoleI " << endl;
-  for(i=0; i<fkMaxNofPoles; i++) cout << fPoleI[i] << endl;
+  for(i=0; i<kMaxNofPoles; i++) cout << fPoleI[i] << endl;
 
   cout << "Transfer function" << endl;
   cout << "Real Part" << endl;
-  for(i=0; i<fkMaxNofSamples; i++) cout << fTfR[i] << endl;
+  for(i=0; i<kMaxNofSamples; i++) cout << fTfR[i] << endl;
   cout << "Imaginary Part " << endl;
-  for(i=0; i<fkMaxNofSamples; i++) cout << fTfI[i] << endl;
+  for(i=0; i<kMaxNofSamples; i++) cout << fTfI[i] << endl;
 
   cout << "Fourier Weights" << endl;
   cout << "Real Part" << endl;
-  for(i=0; i<fkMaxNofSamples; i++) cout << fWR[i] << endl;
+  for(i=0; i<kMaxNofSamples; i++) cout << fWR[i] << endl;
   cout << "Imaginary Part " << endl;
-  for(i=0; i<fkMaxNofSamples; i++) cout << fWI[i] << endl;
+  for(i=0; i<kMaxNofSamples; i++) cout << fWI[i] << endl;
 }
 
 

diff --git a/ITS/AliITSetfSDD.h b/ITS/AliITSetfSDD.h
index d60c091..1bc76f9 100644 (file)
--- a/ITS/AliITSetfSDD.h
+++ b/ITS/AliITSetfSDD.h
@@ -5,6 +5,9 @@
 
 #include <TObject.h>
 
+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 e2214e8..a9656e2 100644 (file)
--- 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 <iostream.h>
 #include <TClonesArray.h>
-
 #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 905f8a6..469136e 100644 (file)
--- 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;
 
 
 /***************/