Add support for 64 bits

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

diff --git a/TPC/AliTPCv1.cxx b/TPC/AliTPCv1.cxx
index b0838f68423709656ba1bc9056c0d29cf6440487..538402fc95ef31be854e69d4509c678d55820bb5 100644 (file)
--- a/TPC/AliTPCv1.cxx
+++ b/TPC/AliTPCv1.cxx
@@ -13,90 +13,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-Revision 1.29  2001/05/08 16:03:06  kowal2
-Geometry update according to the latest technical spec.
-
-Revision 1.28  2001/04/27 15:23:07  kowal2
-Correct materian in the central part of the inner containment vessel
-
-Revision 1.27  2001/04/26 06:15:12  kowal2
-Corrected bug in the inner containment vessel (cones)
-
-Revision 1.26  2001/04/24 11:17:33  kowal2
-New TPC geometry.
-
-Revision 1.25  2001/03/13 13:07:34  kowal2
-Corrected bug in the TPC mother volume geometry.
-Thanks to A. Morsch
-
-Revision 1.24  2000/11/30 11:48:50  kowal2
-TLorentzVector.h adde to satisfy the latest changes by Federico
-
-Revision 1.23  2000/11/14 10:48:57  kowal2
-Correct material used for TSA4. Thanks to J. Barbosa.
-
-Revision 1.22  2000/11/06 17:24:10  kowal2
-Corrected bug in the outer containment vessel and
-the outer field cage geometry.
-Thanks to J. Barbosa.
-
-Revision 1.21  2000/11/02 16:55:24  kowal2
-Corrected bug in the inner containment vessel geometry.
-Thanks to J. Belikov
-
-Revision 1.20  2000/11/02 07:24:11  kowal2
-Correction in the TPC geometry.
-Changes due to the new hit structure.
-
-Revision 1.19  2000/07/10 20:57:39  hristov
-Update of TPC code and macros by M.Kowalski
-
-Revision 1.18  2000/06/30 12:07:50  kowal2
-Updated from the TPC-PreRelease branch
-
-Revision 1.17.2.4  2000/06/26 07:39:42  kowal2
-Changes to obey the coding rules
-
-Revision 1.17.2.3  2000/06/25 08:38:41  kowal2
-Splitted from AliTPCtracking
-
-Revision 1.17.2.2  2000/06/16 12:58:13  kowal2
-Changed parameter settings
-
-Revision 1.17.2.1  2000/06/09 07:15:07  kowal2
-
-Defaults loaded automatically (hard-wired)
-Optional parameters can be set via macro called in the constructor
-
-Revision 1.17  2000/05/15 10:00:30  kowal2
-Corrected bug in the TPC geometry, thanks to Ivana Hrivnacova
-
-Revision 1.16  2000/04/17 09:37:33  kowal2
-removed obsolete AliTPCDigitsDisplay.C
-
-Revision 1.15.8.2  2000/04/10 08:29:48  kowal2
-
-Different pad geometry for different sectors
-Updated readouch chambers geometry
-
-Revision 1.15.8.1  2000/04/10 07:56:53  kowal2
-Not used anymore - removed
-
-Revision 1.15  1999/11/04 17:28:07  fca
-Correct barrel part of HV Degrader
-
-Revision 1.14  1999/10/08 06:27:23  fca
-Corrected bug in the HV degrader geometry, thanks to G.Tabary
-
-Revision 1.13  1999/10/04 13:39:54  fca
-Correct array index problem
-
-Revision 1.12  1999/09/29 09:24:34  fca
-Introduction of the Copyright and cvs Log
-
-*/
+/* $Id$ */
 
 //
 ///////////////////////////////////////////////////////////////////////////////
@@ -112,24 +29,23 @@ Introduction of the Copyright and cvs Log
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include <TMath.h>
+#include <Riostream.h>
+
+#include <TBRIK.h>
 #include <TGeometry.h>
+#include <TInterpreter.h>
+#include <TMath.h>
 #include <TNode.h>
-#include <TBRIK.h>
 #include <TTUBE.h>
-#include "AliTPCv1.h"
-#include "AliRun.h"
-#include <iostream.h>
-#include <fstream.h>
-#include "TLorentzVector.h"
+#include <TVirtualMC.h>
 
-#include "AliMC.h"
 #include "AliConst.h"
-
+#include "AliRun.h"
+#include "AliTPCDigitsArray.h"
 #include "AliTPCParam.h"
 #include "AliTPCParamSR.h"
-#include "AliTPCDigitsArray.h"
-#include <TInterpreter.h>
+#include "AliTPCv1.h"
+#include "TLorentzVector.h"
 
 ClassImp(AliTPCv1)
 
@@ -428,13 +344,13 @@ void AliTPCv1::CreateGeometry()
 
   dm[15]=250.6;
   dm[16]=258.;
-  dm[17]=275.5;
+  dm[17]=269.6;
 
   //
 
   dm[18]=253.6;
   dm[19]=258.;
-  dm[20]=275.5;
+  dm[20]=269.6;
 
   gMC->Gsvolu("TOFC","PCON",idtmed[4],dm,21);
 
@@ -1850,27 +1766,27 @@ void AliTPCv1::StepManager()
         hits[1]=p[1];
         hits[2]=p[2];
         hits[3]=0.; // this hit has no energy loss
-       // new(lhits[fNhits++]) AliTPChit(fIshunt,gAlice->CurrentTrack(),vol,hits);
+       // new(lhits[fNhits++]) AliTPChit(fIshunt,gAlice->GetCurrentTrackNumber(),vol,hits);
 
-        AddHit(gAlice->CurrentTrack(), vol,hits); // M.I. 
+        AddHit(gAlice->GetCurrentTrackNumber(), vol,hits); // M.I. 
 
         gMC->TrackPosition(p);
         hits[0]=p[0];
         hits[1]=p[1];
         hits[2]=p[2];
         hits[3]=0.; // this hit has no energy loss
-        // new(lhits[fNhits++]) AliTPChit(fIshunt,gAlice->CurrentTrack(),vol,hits);
+        // new(lhits[fNhits++]) AliTPChit(fIshunt,gAlice->GetCurrentTrackNumber(),vol,hits);
 
-       AddHit(gAlice->CurrentTrack(), vol,hits); // M.I. 
+       AddHit(gAlice->GetCurrentTrackNumber(), vol,hits); // M.I. 
 
       } 
 
       gMC->TrackPosition(p);
       for(i=0;i<3;++i) hits[i]=p[i];
       hits[3]=1; //I'd like to have something positive here (I.Belikov)
-      // new(lhits[fNhits++]) AliTPChit(fIshunt,gAlice->CurrentTrack(),vol,hits);
+      // new(lhits[fNhits++]) AliTPChit(fIshunt,gAlice->GetCurrentTrackNumber(),vol,hits);
 
-      AddHit(gAlice->CurrentTrack(), vol,hits); // M.I. 
+      AddHit(gAlice->GetCurrentTrackNumber(), vol,hits); // M.I. 
 
     }