Merge branch 'segT0Fit' into 'master'

Cleanup of MdtSegmentT0Fitter

See merge request atlas/athena!34681

MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MdtSegmentT0Fitter/CMakeLists.txt

@@ -5,21 +5,6 @@
 # Declare the package name:
 atlas_subdir( MdtSegmentT0Fitter )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc
-                          MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerInterfaces
-                          Tracking/TrkUtilityPackages/TrkDriftCircleMath
-                          PRIVATE
-                          MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibData
-                          MuonSpectrometer/MuonCalib/MuonCalibTools
-                          MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
-                          MuonSpectrometer/MuonIdHelpers
-                          MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData
-                          MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonRIO_OnTrack )
-
 # External dependencies:
 find_package( ROOT COMPONENTS Minuit Core Tree MathCore Hist RIO pthread MathMore Minuit2 Matrix Physics HistPainter Rint )
 
@@ -32,4 +17,3 @@ atlas_add_component( MdtSegmentT0Fitter
 
 # Install files from the package:
 atlas_install_headers( MdtSegmentT0Fitter )
-

MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MdtSegmentT0Fitter/MdtSegmentT0Fitter/MdtSegmentT0Fitter.h

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 // Fitting for in situ calibration of segments
@@ -19,9 +19,7 @@
 #include <vector>
 #include <memory>
 
-class IIdToFixedIdTool;
-class MdtCalibrationDbTool;
-class TMinuit;
+#include "TMinuit.h"
 
 namespace TrkDriftCircleMath {
 
@@ -29,13 +27,12 @@ namespace TrkDriftCircleMath {
     public:
 
       MdtSegmentT0Fitter(const std::string&,const std::string&,const IInterface*);
-      virtual ~MdtSegmentT0Fitter ();
+      virtual ~MdtSegmentT0Fitter()=default;
       virtual StatusCode initialize() override;
-      virtual StatusCode finalize  () override;
+      virtual StatusCode finalize() override;
       
       virtual bool fit( Segment& result, const Line& line, const DCOnTrackVec& dcs, double t0Seed ) const override;
       virtual bool fit( Segment& result, const Line& line, const DCOnTrackVec& dcs, const HitSelection& selection, double t0Seed ) const override;
-
  
       virtual const DCSLFitter* getFitter() const override { return this; }
 
@@ -60,23 +57,21 @@ namespace TrkDriftCircleMath {
       };
 
     private:
-      bool m_trace; // debug - traces operation
-      bool m_dumpToFile; // debug - dumps some performance info
-      bool m_dumpNoFit; // debug - print hit info where fit doesn't run		
-
-      bool m_useInternalRT; // whether to use an internal RT function or the one from Calibration Service
-      ToolHandle<MdtCalibrationDbTool> m_calibrationDbTool;
-
-      int m_minHits; // minimum number of selected hits for t0 fit. Otherwise use default
-
-      bool m_constrainShifts; // whether to constrain t0 shifts to a 50 ns window
-      double m_constrainT0Error; // t0 error that is used in the constraint
-      bool   m_rejectWeakTopologies; // Reject topolgies that do not have at least one +- combination in one Multilayer
-      bool m_scaleErrors; //!< rescale errors in fit
-
-      bool m_propagateErrors; //!< propagate errors
-
-      TMinuit* m_minuit;
+      ToolHandle<MdtCalibrationDbTool> m_calibrationDbTool{this,"CalibrationDbTool","MdtCalibrationDbTool"};
+
+      Gaudi::Property<bool> m_trace{this,"TraceOperation",false,"debug - traces operation"};
+      Gaudi::Property<bool> m_dumpToFile{this,"DumpToFile",false,"debug - dumps some performance info"};
+      Gaudi::Property<bool> m_dumpNoFit{this,"DumpNoFit",false,"debug - print hit info where fit does not run"};
+      Gaudi::Property<bool> m_useInternalRT{this,"UseInternalRT",false,"whether to use an internal RT function or the one from Calibration Service"};
+      Gaudi::Property<bool> m_constrainShifts{this,"ConstrainShifts",false,"whether to constrain t0 shifts to a 50 ns window"};
+      Gaudi::Property<bool> m_rejectWeakTopologies{this,"RejectWeakTopologies",true,"reject topolgies that do not have at least one +- combination in one multilayer"};
+      Gaudi::Property<bool> m_scaleErrors{this,"RescaleErrors",true,"rescale errors in fit"};
+      Gaudi::Property<bool> m_propagateErrors{this,"PropagateErrors",true,"propagate errors"};
+      Gaudi::Property<int> m_minHits{this,"MinimumHits",4,"minimum number of selected hits for t0 fit. Otherwise use default"};
+      Gaudi::Property<double> m_constrainT0Error{this,"ConstrainT0Error",10,"t0 error that is used in the constraint"};
+      Gaudi::Property<float> m_dRTol{this,"dRTolerance",0.1};
+
+      std::unique_ptr<TMinuit> m_minuit;
 
       // counters
       mutable std::atomic_uint m_ntotalCalls;
@@ -86,7 +81,6 @@ namespace TrkDriftCircleMath {
       mutable std::atomic_uint m_npassedMinHits;
       mutable std::atomic_uint m_npassedMinuitFit;
 
-      std::unique_ptr<MdtSegmentT0FcnData> m_fcnData; //!< Struct to hold data to pass to/from TMinuit fit function
     };
     
   inline bool MdtSegmentT0Fitter::fit( Segment& result, const Line& line, const DCOnTrackVec& dcs, double t0Seed ) const { 
@@ -95,6 +89,4 @@ namespace TrkDriftCircleMath {
   }
 }
 
-
-
 #endif