use lorentz angle to define better fit range

Author: glegras

Detectors/TRD/calibration/src/CalibratorVdExB.cxx

@@ -24,7 +24,7 @@
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonUtils/NameConf.h"
 #include "CommonUtils/MemFileHelper.h"
-//#include "DetectorsBase/Propagator.h"
+#include "DetectorsBase/Propagator.h"
 #include <TFile.h>
 #include <TTree.h>
 
@@ -107,17 +107,16 @@ void CalibratorVdExB::initProcessing()
   }
 
   // fit is done in region where ion tails are small, close to lorentz angle
-  // we want an approximate value of the lorentz angle in order to define better fit boundaries
-  // TODO: find a way to obtain the magnetic field even in standalone calibration
-  //float bz = o2::base::Propagator::Instance()->getNominalBz();
+  // we want an approximate value of the lorentz angle in order to define better fit boundaries, coinciding with profile bin edges
+  float bz = o2::base::Propagator::Instance()->getNominalBz();
   // default angle with zero field is slightly shifted
   float lorentzAngleAvg = -1.f;
-  /*if (TMath::Abs(bz - 2) < 0.1f) { lorentzAngleAvg = 2.f;}
-  if (TMath::Abs(bz + 2) < 0.1f) { lorentzAngleAvg = -4.f;}
+  if (TMath::Abs(bz - 2) < 0.1f) { lorentzAngleAvg = 3.f;}
+  if (TMath::Abs(bz + 2) < 0.1f) { lorentzAngleAvg = -5.f;}
   if (TMath::Abs(bz - 5) < 0.1f) { lorentzAngleAvg = 7.f;}
-  if (TMath::Abs(bz + 5) < 0.1f) { lorentzAngleAvg = -9.5f;}
+  if (TMath::Abs(bz + 5) < 0.1f) { lorentzAngleAvg = -9.f;}
 
-  LOGP(info, "b field: {}  lorentz angle start: {}", bz, lorentzAngleAvg);*/
+  LOGP(info, "b field: {}  lorentz angle start: {}", bz, lorentzAngleAvg);
 
   mFitFunctor.lowerBoundAngleFit = (80 + lorentzAngleAvg) * TMath::DegToRad();
   mFitFunctor.upperBoundAngleFit = (100 + lorentzAngleAvg) * TMath::DegToRad();
@@ -249,7 +248,7 @@ void CalibratorVdExB::finalizeSlot(Slot& slot)
   auto flName = o2::ccdb::CcdbApi::generateFileName(clName);
   std::map<std::string, std::string> metadata; // TODO: do we want to store any meta data?
   long startValidity = slot.getStartTimeMS() - 10 * o2::ccdb::CcdbObjectInfo::SECOND;
-  mInfoVector.emplace_back("TRD/Calib/CalVdriftExB", clName, flName, metadata, startValidity, startValidity + 3 * o2::ccdb::CcdbObjectInfo::DAY);
+  mInfoVector.emplace_back("TRD/Calib/CalVdriftExB", clName, flName, metadata, startValidity, startValidity + 1 * o2::ccdb::CcdbObjectInfo::HOUR);
   mObjectVector.push_back(calObject);
 }
 

Detectors/TRD/workflow/include/TRDWorkflow/VdAndExBCalibSpec.h

@@ -147,7 +147,7 @@ DataProcessorSpec getTRDVdAndExBCalibSpec()
   auto ccdbRequest = std::make_shared<o2::base::GRPGeomRequest>(true,                           // orbitResetTime
                                                                 true,                           // GRPECS=true
                                                                 false,                          // GRPLHCIF
-                                                                false,                          // GRPMagField
+                                                                true,                          // GRPMagField
                                                                 false,                          // askMatLUT
                                                                 o2::base::GRPGeomRequest::None, // geometry
                                                                 inputs);