TPC: adding material type for dedx calibration as parameter

Author: matthias-kleiner

Detectors/TPC/calibration/include/TPCCalibration/CalibdEdx.h

@@ -26,6 +26,7 @@
 #include "DataFormatsTPC/TrackCuts.h"
 #include "DataFormatsTPC/Defs.h"
 #include "DataFormatsTPC/CalibdEdxCorrection.h"
+#include "DetectorsBase/Propagator.h"
 
 // boost includes
 #include <boost/histogram.hpp>
@@ -97,6 +98,9 @@ class CalibdEdx
     mFitLowCutFactor = lowCutFactor;
   }
 
+  /// setting the material type for track propagation
+  void setMaterialType(o2::base::Propagator::MatCorrType materialType) { mMatType = materialType; }
+
   /// Fill histograms using tracks data.
   void fill(const TrackTPC& tracks);
   void fill(const gsl::span<const TrackTPC>);
@@ -152,7 +156,9 @@ class CalibdEdx
   Hist mHist;                   ///< dEdx multidimensional histogram
   CalibdEdxCorrection mCalib{}; ///< Calibration output
 
-  ClassDefNV(CalibdEdx, 2);
+  o2::base::Propagator::MatCorrType mMatType{}; ///< material type for track propagation
+
+  ClassDefNV(CalibdEdx, 3);
 };
 
 } // namespace o2::tpc

Detectors/TPC/calibration/include/TPCCalibration/CalibratordEdx.h

@@ -29,6 +29,7 @@
 #include "DetectorsCalibration/TimeSlot.h"
 #include "TPCCalibration/CalibdEdx.h"
 #include "CommonUtils/TreeStreamRedirector.h"
+#include "DetectorsBase/Propagator.h"
 
 namespace o2::tpc
 {
@@ -58,6 +59,7 @@ class CalibratordEdx final : public o2::calibration::TimeSlotCalibration<o2::tpc
   void setFitThresholds(int minEntriesSector, int minEntries1D, int minEntries2D) { mFitThreshold = {minEntriesSector, minEntries1D, minEntriesSector}; }
   void setApplyCuts(bool apply) { mApplyCuts = apply; }
   void setElectronCut(std::tuple<float, int, float> values) { mElectronCut = values; }
+  void setMaterialType(o2::base::Propagator::MatCorrType materialType) { mMatType = materialType; }
 
   /// \brief Check if there are enough data to compute the calibration.
   /// \return false if any of the histograms has less entries than mMinEntries
@@ -104,14 +106,15 @@ class CalibratordEdx final : public o2::calibration::TimeSlotCalibration<o2::tpc
   bool mApplyCuts{true};                        ///< Flag to enable tracks cuts
   std::tuple<float, int, float> mElectronCut{}; ///< Values passed to CalibdEdx::setElectronCut
   TrackCuts mCuts;                              ///< Cut object
+  o2::base::Propagator::MatCorrType mMatType{}; ///< material type for track propagation
 
   TFinterval mTFIntervals;     ///< start and end time frame IDs of each calibration time slots
   TimeInterval mTimeIntervals; ///< start and end times of each calibration time slots
   CalibVector mCalibs;         ///< vector of MIP positions, each element is filled in "process" when we finalize one slot (multiple can be finalized during the same "process", which is why we have a vector. Each element is to be considered the output of the device
 
   std::unique_ptr<o2::utils::TreeStreamRedirector> mDebugOutputStreamer; ///< Debug output streamer
 
-  ClassDefOverride(CalibratordEdx, 1);
+  ClassDefOverride(CalibratordEdx, 2);
 };
 
 } // namespace o2::tpc

Detectors/TPC/calibration/src/CalibdEdx.cxx

@@ -29,7 +29,6 @@
 #include "DataFormatsTPC/TrackCuts.h"
 #include "Framework/Logger.h"
 #include "TPCBase/ParameterGas.h"
-#include "DetectorsBase/Propagator.h"
 
 // root includes
 #include "TFile.h"
@@ -82,7 +81,7 @@ void CalibdEdx::fill(const TrackTPC& track)
     constexpr std::array<float, 4> xks{108.475f, 151.7f, 188.8f, 227.65f};
 
     // propagate track
-    const bool okProp = o2::base::Propagator::Instance()->PropagateToXBxByBz(cpTrack, xks[roc], 0.9f, 2., o2::base::Propagator::MatCorrType::USEMatCorrNONE);
+    const bool okProp = o2::base::Propagator::Instance()->PropagateToXBxByBz(cpTrack, xks[roc], 0.9f, 2., mMatType);
     if (!okProp) {
       continue;
     }

Detectors/TPC/calibration/src/CalibratordEdx.cxx

@@ -76,6 +76,7 @@ CalibratordEdx::Slot& CalibratordEdx::emplaceNewSlot(bool front, TFType tstart,
   container->set2DFitThreshold(mFitThreshold[2]);
   const auto [cut, iterations, cutLowFactor] = mElectronCut;
   container->setElectronCut(cut, iterations, cutLowFactor);
+  container->setMaterialType(mMatType);
 
   slot.setContainer(std::move(container));
   return slot;

Detectors/TPC/workflow/src/CalibdEdxSpec.cxx

@@ -55,6 +55,7 @@ class CalibdEdxDevice : public Task
     const auto maxdEdx = ic.options().get<float>("max-dedx");
     const auto angularBins = ic.options().get<int>("angularbins");
     const auto fitSnp = ic.options().get<bool>("fit-snp");
+    auto materialType = static_cast<o2::base::Propagator::MatCorrType>(ic.options().get<int>("material-type"));
 
     mDumpToFile = ic.options().get<int>("file-dump");
 
@@ -64,6 +65,7 @@ class CalibdEdxDevice : public Task
     mCalib->set1DFitThreshold(minEntries1D);
     mCalib->set2DFitThreshold(minEntries2D);
     mCalib->setElectronCut(fitThreshold, fitPasses, fitThresholdLowFactor);
+    mCalib->setMaterialType(materialType);
   }
 
   void finaliseCCDB(o2::framework::ConcreteDataMatcher& matcher, void* obj) final
@@ -131,7 +133,7 @@ DataProcessorSpec getCalibdEdxSpec()
                                                                 false,                          // GRPECS=true
                                                                 false,                          // GRPLHCIF
                                                                 true,                           // GRPMagField
-                                                                false,                          // askMatLUT
+                                                                true,                           // askMatLUT
                                                                 o2::base::GRPGeomRequest::None, // geometry
                                                                 inputs,
                                                                 true,
@@ -156,7 +158,8 @@ DataProcessorSpec getCalibdEdxSpec()
       {"angularbins", VariantType::Int, 36, {"number of angular bins: Tgl and Snp"}},
       {"fit-snp", VariantType::Bool, false, {"enable Snp correction"}},
 
-      {"file-dump", VariantType::Int, 0, {"directly dump calibration to file"}}}};
+      {"file-dump", VariantType::Int, 0, {"directly dump calibration to file"}},
+      {"material-type", VariantType::Int, 2, {"Type for the material buget during track propagation: 0=None, 1=Geo, 2=LUT"}}}};
 }
 
 } // namespace o2::tpc

Detectors/TPC/workflow/src/CalibratordEdxSpec.cxx

@@ -32,6 +32,7 @@
 #include "TPCWorkflow/ProcessingHelpers.h"
 #include "DetectorsBase/GRPGeomHelper.h"
 #include "TPCBase/CDBInterface.h"
+#include "DetectorsBase/Propagator.h"
 
 using namespace o2::framework;
 
@@ -63,6 +64,7 @@ class CalibratordEdxDevice : public Task
     const auto fitSnp = ic.options().get<bool>("fit-snp");
 
     const auto dumpData = ic.options().get<bool>("file-dump");
+    auto materialType = static_cast<o2::base::Propagator::MatCorrType>(ic.options().get<int>("material-type"));
 
     mCalibrator = std::make_unique<tpc::CalibratordEdx>();
     mCalibrator->setHistParams(dEdxBins, mindEdx, maxdEdx, angularBins, fitSnp);
@@ -72,6 +74,7 @@ class CalibratordEdxDevice : public Task
     mCalibrator->setSlotLength(slotLength);
     mCalibrator->setMaxSlotsDelay(maxDelay);
     mCalibrator->setElectronCut({fitThreshold, fitPasses, fitThresholdLowFactor});
+    mCalibrator->setMaterialType(materialType);
 
     if (dumpData) {
       mCalibrator->enableDebugOutput("calibratordEdx.root");
@@ -141,7 +144,7 @@ DataProcessorSpec getCalibratordEdxSpec()
                                                                 true,                           // GRPECS=true
                                                                 false,                          // GRPLHCIF
                                                                 true,                           // GRPMagField
-                                                                false,                          // askMatLUT
+                                                                true,                           // askMatLUT
                                                                 o2::base::GRPGeomRequest::None, // geometry
                                                                 inputs,
                                                                 true,
@@ -169,7 +172,8 @@ DataProcessorSpec getCalibratordEdxSpec()
       {"angularbins", VariantType::Int, 36, {"number of angular bins: Tgl and Snp"}},
       {"fit-snp", VariantType::Bool, false, {"enable Snp correction"}},
 
-      {"file-dump", VariantType::Bool, false, {"directly dump calibration to file"}}}};
+      {"file-dump", VariantType::Bool, false, {"directly dump calibration to file"}},
+      {"material-type", VariantType::Int, 2, {"Type for the material buget during track propagation: 0=None, 1=Geo, 2=LUT"}}}};
 }
 
 } // namespace o2::tpc