Using the magnetic field as second argument of the GetOmegaTau m,ethod (Sylwester)

diff --git a/TRD/AliTRDcalibDB.cxx b/TRD/AliTRDcalibDB.cxx
index b724b66164302379156afdc37f8df07315494bf2..7168ade6b6a179ab1bb72cb692672a67a9672c5e 100644 (file)
--- a/TRD/AliTRDcalibDB.cxx
+++ b/TRD/AliTRDcalibDB.cxx
@@ -73,6 +73,7 @@ AliTRDcalibDB* AliTRDcalibDB::Instance()
     fgInstance = new AliTRDcalibDB();
   }
 
+  //cout << "Run id = " << fRun << endl;
   return fgInstance;
 }
 
@@ -759,11 +760,11 @@ const AliTRDCalMonitoring* AliTRDcalibDB::GetMonitoringObject()
   //
 
   return dynamic_cast<const AliTRDCalMonitoring *> (GetCachedCDBObject(kIDMonitoringData));
-
+   
 }
 
 //_____________________________________________________________________________
-Float_t AliTRDcalibDB::GetOmegaTau(Float_t vdrift)
+Float_t AliTRDcalibDB::GetOmegaTau(Float_t vdrift, Float_t bz)
 {
   //
   // Returns omega*tau (tan(Lorentz-angle)) for a given drift velocity <vd> 
@@ -774,16 +775,18 @@ Float_t AliTRDcalibDB::GetOmegaTau(Float_t vdrift)
   // However, currently it is in use by simulation and reconstruction.
   //
   
-  AliTRDCommonParam *commonParam = AliTRDCommonParam::Instance();
-  if (!commonParam) {
-    return -1;
-  }
-
-  Float_t fieldAbs = TMath::Abs(commonParam->GetField());
-  Float_t fieldSgn = 1.0;
-  if (fieldAbs > 0.0) {
-    fieldSgn = commonParam->GetField() / fieldAbs;
-  }
+  //AliTRDCommonParam *commonParam = AliTRDCommonParam::Instance();
+  //if (!commonParam) {
+  //  return -1;
+  //}
+
+  //Float_t fieldAbs = TMath::Abs(commonParam->GetField());
+  //Float_t fieldSgn = 1.0;
+  //if (fieldAbs > 0.0) {
+  //  fieldSgn = commonParam->GetField() / fieldAbs;
+  //}
+  Float_t fieldAbs = TMath::Abs(bz);
+  Float_t fieldSgn = (bz > 0.0)? 1.0 : -1.0;
 
   const Int_t kNb = 5;
   Float_t p0[kNb] = {  0.004810,  0.007412,  0.010252,  0.013409,  0.016888 };

diff --git a/TRD/AliTRDcalibDB.h b/TRD/AliTRDcalibDB.h
index f2f01a2c9a707dccdb7a211eeeb542b6e5c051dd..bb0b680adbdc42ddf8050a4b0fba8aa3fa6ee454 100644 (file)
--- a/TRD/AliTRDcalibDB.h
+++ b/TRD/AliTRDcalibDB.h
@@ -65,7 +65,7 @@ class AliTRDcalibDB : public TObject {
   const AliTRDCalPIDLQ      *GetPIDLQObject();
 
   // Related functions, these depend on calibration data
-  static Float_t GetOmegaTau(Float_t vdrift);
+  static Float_t GetOmegaTau(Float_t vdrift, Float_t bz);
   Int_t          PadResponse(Double_t signal, Double_t dist, Int_t plane, Double_t *pad) const;
   
  protected:

diff --git a/TRD/AliTRDdigitizer.cxx b/TRD/AliTRDdigitizer.cxx
index b6910798c981b3785f3e0e44a32068836275d3af..ebfbb21c3f14969f89ce2f14aee046e3ffd6f07d 100644 (file)
--- a/TRD/AliTRDdigitizer.cxx
+++ b/TRD/AliTRDdigitizer.cxx
@@ -2528,7 +2528,16 @@ void AliTRDdigitizer::RecalcDiffusion(Float_t vdrift)
     return;
   }
   
-  Float_t field = commonParam->GetField();
+  //Float_t field = commonParam->GetField();
+  
+  /**/
+  Double_t x[3] = { 0.0, 0.0, 0.0 };
+  Double_t b[3];        
+  gAlice->Field(x,b);  // b[] is in kilo Gauss          
+  Float_t field = b[2] * 0.1; // Tesla
+  /**/
+
+
   fDiffLastVdrift = vdrift;
   
   // DiffusionL
@@ -2564,8 +2573,9 @@ void AliTRDdigitizer::RecalcDiffusion(Float_t vdrift)
               + p3T[ibT] * vdrift*vdrift*vdrift;
 
   // OmegaTau
-  fOmegaTau = calibration->GetOmegaTau(vdrift);
-  
+  fOmegaTau = calibration->GetOmegaTau(vdrift, field);
+  cout << fOmegaTau << "\t" << field << endl;
+
   // Lorentzfactor
   if (commonParam->ExBOn()) {
     fLorentzFactor = 1.0 / (1.0 + fOmegaTau*fOmegaTau);