Set the branch address only once

[u/mrichter/AliRoot.git] / TPC / AliTPCParamSR.cxx

diff --git a/TPC/AliTPCParamSR.cxx b/TPC/AliTPCParamSR.cxx
index 6c80a7a27ae68e868b5b030347b72a50dba167e8..5f12c4526da8aa3829bbaeac2c9c57dbf9db17c5 100644 (file)
--- a/TPC/AliTPCParamSR.cxx
+++ b/TPC/AliTPCParamSR.cxx
@@ -13,38 +13,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-Revision 1.7  2002/03/18 17:59:13  kowal2
-Chnges in the pad geometry - 3 pad lengths introduced.
-
-Revision 1.6  2002/02/25 11:02:56  kowal2
-Changes towards speeding up the code. Thanks to Marian Ivanov.
-
-Revision 1.5  2001/12/06 07:49:30  kowal2
-corrected number of pads calculation
-
-Revision 1.4  2000/11/02 07:33:15  kowal2
-Improvements of the code.
-
-Revision 1.3  2000/06/30 12:07:50  kowal2
-Updated from the TPC-PreRelease branch
-
-Revision 1.2.4.2  2000/06/14 16:48:24  kowal2
-Parameter setting improved. Removed compiler warnings
-
-Revision 1.2.4.1  2000/06/09 07:55:39  kowal2
-
-Updated defaults
-
-Revision 1.2  2000/04/17 09:37:33  kowal2
-removed obsolete AliTPCDigitsDisplay.C
-
-Revision 1.1.4.2  2000/04/10 11:36:13  kowal2
-
-New Detector parameters handling class
-
-*/
+/* $Id$ */
 
 ///////////////////////////////////////////////////////////////////////
 //  Manager and of geomety  classes for set: TPC                     //
@@ -59,7 +28,7 @@ New Detector parameters handling class
 ///////////////////////////////////////////////////////////////////////
 
 
-#include <iostream.h>
+#include <Riostream.h>
 #include <TMath.h>
 #include <TObject.h>
 #include <AliTPCParamSR.h>
@@ -69,11 +38,11 @@ New Detector parameters handling class
 
 
 ClassImp(AliTPCParamSR)
-const static  Int_t kMaxRows=600;
-const static  Float_t  kEdgeSectorSpace = 2.5;
-const static Float_t kFacSigmaPadRow=3.;
-const static Float_t kFacSigmaPad=3.;
-const static Float_t kFacSigmaTime=3.;
+static const  Int_t kMaxRows=600;
+static const  Float_t  kEdgeSectorSpace = 2.5;
+static const Float_t kFacSigmaPadRow=3.;
+static const Float_t kFacSigmaPad=3.;
+static const Float_t kFacSigmaTime=3.;
 
 
 AliTPCParamSR::AliTPCParamSR()
@@ -268,7 +237,7 @@ void AliTPCParamSR::XYZtoCRXYZ(Float_t *xyz,
   padrow = index[1];
 }
 
-Float_t AliTPCParamSR::GetPrimaryLoss(Float_t *x, Int_t *index, Float_t *angle)
+Float_t AliTPCParamSR::GetPrimaryLoss(Float_t */*x*/, Int_t *index, Float_t *angle)
 {
   //
   //
@@ -281,7 +250,7 @@ Float_t AliTPCParamSR::GetPrimaryLoss(Float_t *x, Int_t *index, Float_t *angle)
   return length*fNPrimLoss;
 }
 
-Float_t AliTPCParamSR::GetTotalLoss(Float_t *x, Int_t *index, Float_t *angle)
+Float_t AliTPCParamSR::GetTotalLoss(Float_t */*x*/, Int_t *index, Float_t *angle)
 {
   //
   //
@@ -296,7 +265,7 @@ Float_t AliTPCParamSR::GetTotalLoss(Float_t *x, Int_t *index, Float_t *angle)
 }
 
 
-void AliTPCParamSR::GetClusterSize(Float_t *x, Int_t *index, Float_t *angle, Int_t mode, Float_t *sigma)
+void AliTPCParamSR::GetClusterSize(Float_t *x, Int_t *index, Float_t */*angle*/, Int_t /*mode*/, Float_t *sigma)
 {
   //
   //return cluster sigma2 (x,y) for particle at position x
@@ -336,15 +305,15 @@ void AliTPCParamSR::GetClusterSize(Float_t *x, Int_t *index, Float_t *angle, Int
 
 
 
-void AliTPCParamSR::GetSpaceResolution(Float_t *x, Int_t *index, Float_t *angle, 
-                                      Float_t amplitude, Int_t mode, Float_t *sigma)
+void AliTPCParamSR::GetSpaceResolution(Float_t */*x*/, Int_t */*index*/, Float_t */*angle*/, 
+                                      Float_t /*amplitude*/, Int_t /*mode*/, Float_t */*sigma*/)
 {
   //
   //
   //
   
 }
-Float_t  AliTPCParamSR::GetAmp(Float_t *x, Int_t *index, Float_t *angle)
+Float_t  AliTPCParamSR::GetAmp(Float_t */*x*/, Int_t */*index*/, Float_t */*angle*/)
 {
   //
   //
@@ -564,7 +533,7 @@ Int_t  AliTPCParamSR::CalcResponseFast(Float_t* xyz, Int_t * index, Int_t row)
        if (index[1]<fNInnerSector)
          cweight=prfinner[apadrow][apad];
        else{
-         if(row < fNRowUp1)
+         if(row < fNRowUp1+1)
            cweight=prfouter1[apadrow][apad];
           else cweight=prfouter2[apadrow][apad];
        }