ATO-18, ATO-19, PWGPP-102, ALIROOT-5603 - Separate dNdx:bg MC parameterization and...

diff --git a/TPC/TPCbase/AliTPCParam.cxx b/TPC/TPCbase/AliTPCParam.cxx
index 6a89611c89bc1365e87e40d2ffae1cb74852b533..e3f2177f26d39e72a93e37ab9e0d342aa7f21d99 100644 (file)
--- a/TPC/TPCbase/AliTPCParam.cxx
+++ b/TPC/TPCbase/AliTPCParam.cxx
@@ -115,7 +115,8 @@ AliTPCParam::AliTPCParam()
              fWmean(0.),
              fExp(0.),
              fEend(0.),
-             fBetheBloch(0x0),
+             fBetheBloch(0x0),   // dE/dx:BG  - used in the reconstruction
+             fBetheBlochMC(0x0), // dN_{prim}/dx:BG - used for the simulation of energy loss
             fGainSlopesHV(0),   // graph with the gain slope as function of HV - per chamber
             fGainSlopesPT(0),   // graph with the gain slope as function of P/T - per chamber
             fPadCoupling(0.),
@@ -516,6 +517,7 @@ void AliTPCParam::SetDefault()
   SetComposition(0.9,0.,0.1,0.,0.,0.);// Ne-CO2 90/10
   //
   SetBetheBloch(GetBetheBlochParamAlice());
+  SetBetheBlochMC(GetBetheBlochParamAlice());
   //
   //set electronivc parameters  
   //

diff --git a/TPC/TPCbase/AliTPCParam.h b/TPC/TPCbase/AliTPCParam.h
index 61f450879b57dfef1eda7d71cf6483cbc426a0be..a92047db457ef78941dce51896c97b21f1c3ebf6 100644 (file)
--- a/TPC/TPCbase/AliTPCParam.h
+++ b/TPC/TPCbase/AliTPCParam.h
@@ -202,6 +202,11 @@ public:
     fBetheBloch=0;
     if (v) fBetheBloch=new TVectorD(*v);
   }
+  void   SetBetheBlochMC(TVectorD *v){
+    if (fBetheBlochMC) delete fBetheBlochMC;
+    fBetheBlochMC=0;
+    if (v) fBetheBlochMC=new TVectorD(*v);
+  }
   static TVectorD * GetBetheBlochParamNa49();
   static TVectorD * GetBetheBlochParamAlice();
   static void RegisterBBParam(TVectorD* param, Int_t position);
@@ -344,6 +349,7 @@ public:
   Float_t  GetExp()const {return fExp;}
   Float_t  GetEend()const {return fEend;}
   TVectorD* GetBetheBlochParameters(){return fBetheBloch;} 
+  TVectorD* GetBetheBlochParametersMC(){return fBetheBlochMC;} 
   static Double_t BetheBlochAleph(Double_t bb, Int_t type=0);
   //
   //get Electronic parameters
@@ -484,6 +490,7 @@ protected :
   Float_t  fExp;             // de = f(E) - energy loss parametrization
   Float_t  fEend;            // upper cutoff for de generation
   TVectorD*  fBetheBloch;   // Bethe-Bloch parametrization
+  TVectorD*  fBetheBlochMC;   // Bethe-Bloch parametrization
   // gas mixture composition
   Float_t  fComposition[6]; 
   TGraphErrors * fGainSlopesHV;   // graph with the gain slope as function of HV - per chamber

diff --git a/TPC/TPCsim/AliTPCv2.cxx b/TPC/TPCsim/AliTPCv2.cxx
index d9efbbfc4e07926212c96dfcb5688bb9274599c8..6df5209495ce3cf6565ac0cf6d9cef1e9b54aa8d 100644 (file)
--- a/TPC/TPCsim/AliTPCv2.cxx
+++ b/TPC/TPCsim/AliTPCv2.cxx
@@ -2515,7 +2515,7 @@ void AliTPCv2::StepManager()
     //       {
     
     betaGamma = TMath::Max(betaGamma,(Float_t)7.e-3); // protection against too small bg
-    TVectorD *bbpar = fTPCParam->GetBetheBlochParameters(); //get parametrization from OCDB
+    TVectorD *bbpar = fTPCParam->GetBetheBlochParametersMC(); //get parametrization from OCDB
     pp=prim*AliMathBase::BetheBlochAleph(betaGamma,(*bbpar)(0),(*bbpar)(1),(*bbpar)(2),(*bbpar)(3),(*bbpar)(4));         
     //     }