Transition to NewIO

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

diff --git a/TPC/AliTPCParam.cxx b/TPC/AliTPCParam.cxx
index 5c1823a8191f35c3f415d9539e458502d26f0bbe..5b66a57d39d827fd2e2a0c0476253e812db75098 100644 (file)
--- a/TPC/AliTPCParam.cxx
+++ b/TPC/AliTPCParam.cxx
@@ -13,60 +13,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-Revision 1.13  2002/03/18 17:59:13  kowal2
-Chnges in the pad geometry - 3 pad lengths introduced.
-
-Revision 1.12  2002/02/05 09:12:26  hristov
-Small mods for gcc 3.02
-
-Revision 1.11  2000/11/02 07:33:48  kowal2
-Automatic streamer generation.
-
-Revision 1.10  2000/07/10 20:57:39  hristov
-Update of TPC code and macros by M.Kowalski
-
-Revision 1.9  2000/06/30 12:07:50  kowal2
-Updated from the TPC-PreRelease branch
-
-Revision 1.8.4.4  2000/06/26 07:39:42  kowal2
-Changes to obey the coding rules
-
-Revision 1.8.4.3  2000/06/25 08:38:41  kowal2
-Splitted from AliTPCtracking
-  
-Revision 1.8.4.2  2000/06/14 16:48:24  kowal2
-Parameter setting improved. Removed compiler warnings
-
-Revision 1.8.4.1  2000/06/09 07:12:21  kowal2  
-
-Updated defaults
-
-Revision 1.8  2000/04/17 09:37:33  kowal2
-removed obsolete AliTPCDigitsDisplay.C
-
-Revision 1.7.8.2  2000/04/10 08:44:51  kowal2
-
-New transformations added
-Different pad and pad-rows geometries for different sectors
-
-Revision 1.7.8.1  2000/04/10 07:56:53  kowal2
-Not used anymore - removed
-
-Revision 1.7  1999/10/08 13:10:35  fca
-Values in SetDefault are in radiants
-
-Revision 1.6  1999/10/08 06:27:59  fca
-Defaults updated
-
-Revision 1.5  1999/10/05 17:18:27  fca
-Correct GetWire check on even/odd fnWires
-
-Revision 1.4  1999/09/29 09:24:34  fca
-Introduction of the Copyright and cvs Log
-
-*/
+/* $Id$ */
 
 ///////////////////////////////////////////////////////////////////////
 //  Manager and of geomety  classes for set: TPC                     //
@@ -81,7 +28,7 @@ Introduction of the Copyright and cvs Log
 
 //
 
-#include <iostream.h>
+#include <Riostream.h>
 #include <TMath.h>
 #include <TObject.h>
 #include <TRandom.h>
@@ -140,7 +87,7 @@ Int_t  AliTPCParam::Transform0to1(Float_t *xyz, Int_t * index)  const
       if ( (xyz[0]>0) && (xyz[1]<0) ) angle=2*TMath::Pi()+angle;
     }
 
-  sector=Int_t((angle-fInnerAngleShift)/fInnerAngle);      
+  sector=Int_t(TMath::Nint((angle-fInnerAngleShift)/fInnerAngle));      
  
   Float_t cos,sin;
   AdjustCosSin(sector,cos,sin);
@@ -148,7 +95,7 @@ Int_t  AliTPCParam::Transform0to1(Float_t *xyz, Int_t * index)  const
 
   if (x1>fOuterRadiusLow)
     {
-      sector=Int_t((angle-fOuterAngleShift)/fOuterAngle)+fNInnerSector;      
+      sector=Int_t(TMath::Nint((angle-fOuterAngleShift)/fOuterAngle))+fNInnerSector;      
       if (xyz[2]<0)    sector+=(fNOuterSector>>1);            
     }
     else   
@@ -267,7 +214,7 @@ Float_t  AliTPCParam::GetOuterAngleShift() const
 } 
 
 
-Int_t AliTPCParam::GetIndex(Int_t sector, Int_t row)
+Int_t AliTPCParam::GetIndex(Int_t sector, Int_t row) const
 {
   //
   //give index of the given sector and pad row 
@@ -330,14 +277,14 @@ void AliTPCParam::SetDefault()
   const static Int_t    kNInnerWiresPerPad = 3;
   const static Int_t    kInnerDummyWire = 2;
   const static Float_t  kInnerWWPitch = 0.25;
-  const static Float_t  kRInnerFirstWire = 84.475;
-  const static Float_t  kRInnerLastWire = 132.475;
+  const static Float_t  kRInnerFirstWire = 84.445;
+  const static Float_t  kRInnerLastWire = 132.445;
   const static Float_t  kInnerOffWire = 0.5;
   const static Int_t    kNOuter1WiresPerPad = 4;
   const static Int_t    kNOuter2WiresPerPad = 6;
   const static Float_t  kOuterWWPitch = 0.25;  
-  const static Float_t  kROuterFirstWire = 134.225;
-  const static Float_t  kROuterLastWire = 246.975;
+  const static Float_t  kROuterFirstWire = 134.305;
+  const static Float_t  kROuterLastWire = 247.055;
   const static Int_t    kOuterDummyWire = 2;
   const static Float_t  kOuterOffWire = 0.5;
   //