From 8022212fc6390a2e56b491e5746b7e949647d0d9 Mon Sep 17 00:00:00 2001
From: fca <fca@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Fri, 3 Sep 1999 08:27:19 +0000
Subject: [PATCH] New version from M.Kowalski

---
 TPC/AliTPC.cxx   |  4 ++--
 TPC/AliTPCv1.cxx |  2 +-
 TPC/AliTPCv2.cxx | 14 +++++++++-----
 TPC/AliTPCv3.cxx |  2 +-
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/TPC/AliTPC.cxx b/TPC/AliTPC.cxx
index 58f1e8e53e0..583fca3eee6 100644
--- a/TPC/AliTPC.cxx
+++ b/TPC/AliTPC.cxx
@@ -1735,7 +1735,7 @@ Float_t AliTPC::GetSignal(TObjArray *p1, Int_t ntr, Int_t np, TMatrix *m1, TMatr
      PadNumber=CentralPad;
    }
    else if (absy < range){
-     PadNumber=(Int_t) ((absy-0.5*fTPCParam->GetPadPitchWidth())/fTPCParam->GetPadPitchWidth());
+     PadNumber=(Int_t) ((absy-0.5*fTPCParam->GetPadPitchWidth())/fTPCParam->GetPadPitchWidth()+1.);
      PadNumber=(Int_t) (TMath::Sign((Float_t)PadNumber, y)+CentralPad);
    }
    else continue; // electron out of pad-range , lost at the sector edge
@@ -2133,7 +2133,7 @@ void AliTPC::GetCrossTalk (Int_t iFlag,TObjArray *p,Int_t ntracks,Int_t *npads,
        PadNumber=CentralPad;
      }
      else if (absy < range){
-       PadNumber=(Int_t) ((absy-0.5*fTPCParam->GetPadPitchWidth())/fTPCParam->GetPadPitchWidth());
+       PadNumber=(Int_t) ((absy-0.5*fTPCParam->GetPadPitchWidth())/fTPCParam->GetPadPitchWidth() +1.);
        PadNumber=(Int_t) (TMath::Sign((Float_t)PadNumber, y)+CentralPad);
      }
      else continue; // electron out of sense wire range, lost at the sector edge
diff --git a/TPC/AliTPCv1.cxx b/TPC/AliTPCv1.cxx
index df337d8f46e..e4243016c97 100644
--- a/TPC/AliTPCv1.cxx
+++ b/TPC/AliTPCv1.cxx
@@ -777,7 +777,7 @@ void AliTPCv1::CreateGeometry()
   gMC->Gsord("TGAS", 6);
   gMC->Gsord("TPSG", 6);
   gMC->Gsord("TSGA", 3);
-  gMC->Gsord("TLGA", 2);
+  gMC->Gsord("TLGA", 4);
 
 } // end of function
 
diff --git a/TPC/AliTPCv2.cxx b/TPC/AliTPCv2.cxx
index 6936304493e..631d881ee75 100644
--- a/TPC/AliTPCv2.cxx
+++ b/TPC/AliTPCv2.cxx
@@ -363,7 +363,7 @@ void AliTPCv2::CreateGeometry()
 
     }    
 
-    gMC->Gsord("TLGA", 2);
+    gMC->Gsord("TLGA", 4);
 
   } // if strips selected
 
@@ -987,9 +987,13 @@ void AliTPCv2::StepManager()
   //
   // parameters used for the energy loss calculations
   //
-  const Float_t prim = 14.35; // number of primary collisions per 1 cm
-  const Float_t poti = 20.77e-9; // first ionization potential for Ne/CO2
-  const Float_t w_ion = 35.97e-9; // energy for the ion-electron pair creation 
+   const Float_t prim = 14.35; // number of primary collisions per 1 cm
+   const Float_t poti = 20.77e-9; // first ionization potential for Ne/CO2
+   const Float_t w_ion = 35.97e-9; // energy for the ion-electron pair creation 
+
+  //  const Float_t prim = 17.65;
+  //  const Float_t poti = 19.02e-9;
+  // const Float_t w_ion = 33.06e-9;
  
  
   const Float_t big = 1.e10;
@@ -1084,7 +1088,7 @@ void AliTPCv2::StepManager()
   Float_t ptot=mom.Rho();
   Float_t beta_gamma = ptot/gMC->TrackMass();
   
-  if(gMC->TrackPid() <= 3 && ptot > 0.002)
+  if(gMC->IdFromPDG(gMC->TrackPid()) <= 3 && ptot > 0.002)
     { 
       pp = prim*1.58; // electrons above 20 MeV/c are on the plateau!
     }
diff --git a/TPC/AliTPCv3.cxx b/TPC/AliTPCv3.cxx
index a507daf98d8..553c0d6b3e9 100644
--- a/TPC/AliTPCv3.cxx
+++ b/TPC/AliTPCv3.cxx
@@ -769,7 +769,7 @@ void AliTPCv3::StepManager()
   Float_t ptot=mom.Rho();
   Float_t beta_gamma = ptot/gMC->TrackMass();
   
-  if(gMC->TrackPid() <= 3 && ptot > 0.002)
+  if(gMC->IdFromPDG(gMC->TrackPid()) <= 3 && ptot > 0.002)
     { 
       pp = prim*1.58; // electrons above 20 MeV/c are on the plateau!
     }
-- 
2.43.0