diff --git a/MuonSpectrometer/MuonConfig/python/MuonSegmentFindingConfig.py b/MuonSpectrometer/MuonConfig/python/MuonSegmentFindingConfig.py
index 1638457f065987dde501a94503b5a8fdc4b72f7d..4dba5351d37e3164d5a690065f41d5fc7f3c6a98 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonSegmentFindingConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonSegmentFindingConfig.py
@@ -244,7 +244,6 @@ def MdtDriftCircleOnTrackCreatorAdjustableT0(flags,**kwargs):
kwargs.setdefault("TimingMode", 3)
kwargs.setdefault("DoTofCorrection", True)
kwargs.setdefault("TimeWindowSetting", mdtCalibWindowNumber('Collision_data'))
- kwargs.setdefault("MuonTofTool", AdjustableT0Tool(flags))
return MdtDriftCircleOnTrackCreator(name,**kwargs)
def AdjustableT0Tool(flags,**kwargs):
@@ -373,7 +372,6 @@ def DCMathSegmentMakerCfg(flags, **kwargs):
# ToolHandle<MuonEDMPrinterTool> m_printer; //<! printer helper tool
# ToolHandle<MuonEDMHelperTool> m_helper; //<! printer helper tool
# ToolHandle<IMdtSegmentFinder> m_segmentFinder; //<! segment finder tool MdtSegmentFinder
- # mutable ToolHandle<AdjT0::IAdjustableT0Tool> m_tofTool; //<! tof tool
# ToolHandle<IMuonSegmentFittingTool> m_segmentFitter; //<! segment fitting tool
# ToolHandle<IMuonSegmentSelectionTool> m_segmentSelectionTool; //<! segment selection tool
# ToolHandle<IDCSLFitProvider> m_dcslFitProvider;
@@ -408,13 +406,11 @@ def DCMathSegmentMakerCfg(flags, **kwargs):
kwargs.setdefault("RecoverBadRpcCabling", True)
if doSegmentT0Fit:
- tof_tool = AdjustableT0Tool(flags)
acc, mdt_creator = MuonConfig.MuonRIO_OnTrackCreatorConfig.MdtDriftCircleOnTrackCreatorCfg(flags, name="MdtDriftCircleOnTrackCreatorAdjustableT0", TimingMode=3, \
- DoTofCorrection=True, TimeWindowSetting=mdtCalibWindowNumber('Collision_data'), MuonTofTool=tof_tool)
+ DoTofCorrection=True, TimeWindowSetting=mdtCalibWindowNumber('Collision_data'))
acc.addPublicTool(mdt_creator)
result.merge(acc)
kwargs.setdefault("MdtCreatorT0", mdt_creator) # TODO - is this correct?
- kwargs.setdefault("TofTool", tof_tool(flags))
mdt_math_segment_finder = MdtMathSegmentFinder(flags, doSegmentT0Fit=True)
else:
mdt_math_segment_finder = MdtMathSegmentFinder(flags)
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MdtDriftCircleOnTrackCreator/MdtDriftCircleOnTrackCreator/MdtDriftCircleOnTrackCreator.h b/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MdtDriftCircleOnTrackCreator/MdtDriftCircleOnTrackCreator/MdtDriftCircleOnTrackCreator.h
index 0d45a2ecf0c8f1a2bf9a6e95308cfdb30726b48d..48ac14b1f951e46d35f6ca140d0a4796ac043c05 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MdtDriftCircleOnTrackCreator/MdtDriftCircleOnTrackCreator/MdtDriftCircleOnTrackCreator.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MdtDriftCircleOnTrackCreator/MdtDriftCircleOnTrackCreator/MdtDriftCircleOnTrackCreator.h
@@ -102,6 +102,7 @@ namespace Muon {
virtual const MdtDriftCircleOnTrack* createRIO_OnTrack( const MdtPrepData& prd,
const Amg::Vector3D& globalPos,
const Amg::Vector3D* gdir = 0,
+ float t0Shift = 0,
const MuonDriftCircleErrorStrategy* strategy = 0 ) const;
/** @brief Update of the sign of the drift radius. The method creates a new MdtDriftCircleOnTrack, the old input MdtDriftCircleOnTrack is
@@ -172,10 +173,11 @@ namespace Muon {
/** preform the mdt calibration */
CalibrationOutput getLocalMeasurement( const MdtPrepData& DC,
- const Amg::Vector3D& gpos,
- const Amg::Vector3D* gdir,
- MdtCalibrationSvcInput& inputData,
- const MuonDriftCircleErrorStrategy* strategy = 0 ) const;
+ const Amg::Vector3D& gpos,
+ const Amg::Vector3D* gdir,
+ MdtCalibrationSvcInput& inputData,
+ const MuonDriftCircleErrorStrategy* strategy = 0,
+ float t0Shift = 0) const;
/** currently returns 0. */
double getTriggerTime() const { return 0.; }
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MdtDriftCircleOnTrackCreator/src/MdtDriftCircleOnTrackCreator.cxx b/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MdtDriftCircleOnTrackCreator/src/MdtDriftCircleOnTrackCreator.cxx
index abe0da0b57fdd0d3e37afc5125b1566e0dabe5a6..22ef2b8d54c04b85d86f84fbc798e374109cff51 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MdtDriftCircleOnTrackCreator/src/MdtDriftCircleOnTrackCreator.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MdtDriftCircleOnTrackCreator/src/MdtDriftCircleOnTrackCreator.cxx
@@ -167,16 +167,8 @@ StatusCode Muon::MdtDriftCircleOnTrackCreator::initialize()
}
if( m_timeCorrectionType == COSMICS_TOF ){
- if( m_tofTool.empty() ) {
- ATH_MSG_ERROR( "The time of flight tool is not configured. Please check your configuration" );
- return StatusCode::FAILURE;
- }
- if( m_tofTool.retrieve().isSuccess() ){
- ATH_MSG_DEBUG("Retrieved " << m_tofTool );
- }else{
- ATH_MSG_ERROR( "Could not get " << m_tofTool );
- return StatusCode::FAILURE;
- }
+ if( m_tofTool.empty() ) ATH_MSG_DEBUG("no TOF tool, TOF will be calculated directly from T0 shift provided");
+ else ATH_CHECK(m_tofTool.retrieve());
if( !m_errorStrategy.creationParameter(MuonDriftCircleErrorStrategy::TofCorrection) ){
ATH_MSG_WARNING( "Detected bad default configuration, using Cosmic TOF witout time of flight corrections does not work" );
}
@@ -200,6 +192,7 @@ const Muon::MdtDriftCircleOnTrack* Muon::MdtDriftCircleOnTrackCreator::createRIO
const MdtPrepData& mdtPrd,
const Amg::Vector3D& GP,
const Amg::Vector3D* GD,
+ float t0Shift,
const MuonDriftCircleErrorStrategy* strategy ) const
{
const MuonDriftCircleErrorStrategy* myStrategy = 0==strategy?&m_errorStrategy:strategy;
@@ -262,7 +255,7 @@ const Muon::MdtDriftCircleOnTrack* Muon::MdtDriftCircleOnTrackCreator::createRIO
inputData.trackDirection = GD;
inputData.nominalWireSurface = nominalSurf;
inputData.wireSurface = saggedSurf;
- CalibrationOutput calibOutput = getLocalMeasurement( mdtPrd, GP, GD,inputData, myStrategy );
+ CalibrationOutput calibOutput = getLocalMeasurement( mdtPrd, GP, GD,inputData, myStrategy, t0Shift );
// This basically determines the error etc and is where the bulk of the work is done.
// hack to determine whether we are before or after the spectrum, until we sort this out properly
@@ -365,7 +358,8 @@ Muon::MdtDriftCircleOnTrackCreator::getLocalMeasurement(const MdtPrepData& DC,
const Amg::Vector3D& gpos,
const Amg::Vector3D* /**gdir*/,
MdtCalibrationSvcInput& inputData,
- const MuonDriftCircleErrorStrategy* strategy ) const
+ const MuonDriftCircleErrorStrategy* strategy,
+ float t0Shift) const
{
const MuonDriftCircleErrorStrategy* myStrategy = 0==strategy?&m_errorStrategy:strategy;
@@ -416,7 +410,8 @@ Muon::MdtDriftCircleOnTrackCreator::getLocalMeasurement(const MdtPrepData& DC,
break;
case COSMICS_TOF:
// case for normal cosmic data with rpc trigger or simulation including TOF
- inputData.tof = m_tofTool->timeOfFlight( DC.identify(), gpos );
+ if(!m_tofTool.empty()) inputData.tof = m_tofTool->timeOfFlight( DC.identify(), gpos );
+ else inputData.tof=t0Shift+gpos.mag()/299.792458;
ATH_MSG_VERBOSE( " running in COSMICS_TOF mode, tof: " << inputData.tof );
break;
default:
@@ -504,7 +499,7 @@ const Muon::MdtDriftCircleOnTrack* Muon::MdtDriftCircleOnTrackCreator::correct(
return 0;
}
- return createRIO_OnTrack(*mdtPrd,tp.position(),&tp.momentum(),strategy);
+ return createRIO_OnTrack(*mdtPrd,tp.position(),&tp.momentum(),0,strategy);
}
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonRecTools.py b/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonRecTools.py
index f7077514bfc4410e18c60c47f83b21a145d87089..27c0e32e054565a3c1d66040bed06b39aa9a1cad 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonRecTools.py
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonRecTools.py
@@ -137,7 +137,6 @@ def MdtDriftCircleOnTrackCreatorAdjustableT0(name="MdtDriftCircleOnTrackCreatorA
kwargs.setdefault("TimingMode", 3)
kwargs.setdefault("DoTofCorrection", True)
kwargs.setdefault("TimeWindowSetting", mdtCalibWindowNumber('Collision_data'))
- kwargs.setdefault("MuonTofTool", "AdjustableT0Tool")
return MdtDriftCircleOnTrackCreator(name,**kwargs)
# default RIO_OnTrackCreator for muons
@@ -399,7 +398,6 @@ def DCMathSegmentMaker(name='DCMathSegmentMaker',extraFlags=None,**kwargs):
if doSegmentT0Fit:
kwargs.setdefault("MdtCreatorT0", "MdtDriftCircleOnTrackCreatorAdjustableT0")
- kwargs.setdefault("TofTool", "AdjustableT0Tool")
kwargs.setdefault("MdtSegmentFinder", "MdtMathT0FitSegmentFinder" )
else:
kwargs.setdefault("MdtSegmentFinder", "MdtMathSegmentFinder")
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecToolInterfaces/MuonRecToolInterfaces/IMdtDriftCircleOnTrackCreator.h b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecToolInterfaces/MuonRecToolInterfaces/IMdtDriftCircleOnTrackCreator.h
index 5d93e85f006bed8917a0c1d4c3dbdbf02667773b..9f80aef3a186e6cd1f66e4826b4b8bab18134472 100755
--- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecToolInterfaces/MuonRecToolInterfaces/IMdtDriftCircleOnTrackCreator.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecToolInterfaces/MuonRecToolInterfaces/IMdtDriftCircleOnTrackCreator.h
@@ -39,6 +39,7 @@ namespace Muon {
virtual const MdtDriftCircleOnTrack* createRIO_OnTrack( const MdtPrepData& DC,
const Amg::Vector3D& GP,
const Amg::Vector3D* GD = 0,
+ float t0Shift = 0,
const MuonDriftCircleErrorStrategy* strategy = 0 ) const = 0;
/** @brief Update of the sign of the drift radius.
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/DCMathSegmentMaker/src/DCMathSegmentMaker.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/DCMathSegmentMaker/src/DCMathSegmentMaker.cxx
index 867bd91307670257d0a3bd8249959883cf4011ca..24f4704c94d82a514e9d2ad5485853c842bad001 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/DCMathSegmentMaker/src/DCMathSegmentMaker.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/DCMathSegmentMaker/src/DCMathSegmentMaker.cxx
@@ -65,7 +65,6 @@
#include "MuonReadoutGeometry/MuonDetectorManager.h"
#include "MuonIdHelpers/MdtIdHelper.h"
-#include "MuonRecToolInterfaces/IAdjustableT0Tool.h"
#include "EventPrimitives/EventPrimitivesHelpers.h"
#include "EventPrimitives/EventPrimitivesToStringConverter.h"
#include "GeoPrimitives/GeoPrimitivesToStringConverter.h"
@@ -89,7 +88,6 @@ namespace Muon {
m_printer("Muon::MuonEDMPrinterTool/MuonEDMPrinterTool"),
m_helper("Muon::MuonEDMHelperTool/MuonEDMHelperTool"),
m_segmentFinder("Muon::MdtMathSegmentFinder/MdtMathSegmentFinder"),
- m_tofTool(""),
m_segmentFitter("Muon::MuonSegmentFittingTool/MuonSegmentFittingTool"),
m_segmentSelectionTool("Muon::MuonSegmentSelectionTool/MuonSegmentSelectionTool"),
m_dcslFitProvider(""),
@@ -108,7 +106,6 @@ namespace Muon {
declareProperty("EDMPrinter", m_printer);
declareProperty("EDMHelper", m_helper);
declareProperty("MdtSegmentFinder", m_segmentFinder);
- declareProperty("TofTool", m_tofTool);
declareProperty("SegmentFitter", m_segmentFitter);
declareProperty("SegmentSelector", m_segmentSelectionTool);
declareProperty("DCFitProvider", m_dcslFitProvider );
@@ -162,10 +159,6 @@ namespace Muon {
ATH_CHECK( m_segmentFinder.retrieve() );
ATH_CHECK( m_segmentSelectionTool.retrieve() );
- if( !m_tofTool.empty() ){
- ATH_CHECK( m_tofTool.retrieve() );
- }
-
if( m_refitParameters ){
ATH_CHECK( m_segmentFitter.retrieve() );
}
@@ -1772,14 +1765,13 @@ namespace Muon {
Trk::DriftCircleSide side = locPos[Trk::driftRadius] < 0 ? Trk::LEFT : Trk::RIGHT;
const MdtDriftCircleOnTrack* constDC = 0;
- bool hasT0 = segment.hasT0Shift() && !m_tofTool.empty();
+ bool hasT0 = segment.hasT0Shift();
if( !hasT0 ){
//ATH_MSG_VERBOSE(" recalibrate MDT hit");
constDC = m_mdtCreator->createRIO_OnTrack(*riodc->prepRawData(),mdtGP,&gdir);
}else{
ATH_MSG_VERBOSE(" recalibrate MDT hit with shift " << segment.t0Shift());
- m_tofTool->ResetSetTShift( segment.t0Shift() );
- constDC = m_mdtCreatorT0->createRIO_OnTrack(*riodc->prepRawData(),mdtGP,&gdir);
+ constDC = m_mdtCreatorT0->createRIO_OnTrack(*riodc->prepRawData(),mdtGP,&gdir,segment.t0Shift());
}
if( !constDC ){
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/DCMathSegmentMaker/src/DCMathSegmentMaker.h b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/DCMathSegmentMaker/src/DCMathSegmentMaker.h
index 85ee4c8c08a965db21b83c88102a147816535379..55ed24d9f2088a9923370032433c0a161f8a84f2 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/DCMathSegmentMaker/src/DCMathSegmentMaker.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/DCMathSegmentMaker/src/DCMathSegmentMaker.h
@@ -49,10 +49,6 @@ namespace MuonGM {
class MuonDetectorManager;
}
-namespace AdjT0 {
- class IAdjustableT0Tool;
-}
-
namespace Muon {
class IMuonCompetingClustersOnTrackCreator;
class IMdtDriftCircleOnTrackCreator;
@@ -408,7 +404,6 @@ class MdtDriftCircleOnTrack;
ToolHandle<MuonEDMPrinterTool> m_printer; //<! printer helper tool
ToolHandle<MuonEDMHelperTool> m_helper; //<! printer helper tool
ToolHandle<IMdtSegmentFinder> m_segmentFinder; //<! segment finder tool
- mutable ToolHandle<AdjT0::IAdjustableT0Tool> m_tofTool; //<! tof tool
ToolHandle<IMuonSegmentFittingTool> m_segmentFitter; //<! segment fitting tool
ToolHandle<IMuonSegmentSelectionTool> m_segmentSelectionTool; //<! segment selection tool
ToolHandle<IDCSLFitProvider> m_dcslFitProvider;
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MooTrackBuilder.cxx b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MooTrackBuilder.cxx
index f6d016633b8623a787207637d650224f70c024f4..59fa6f0b916e67ce9b52dac1b27ae7cdbcc7bda0 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MooTrackBuilder.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MooTrackBuilder.cxx
@@ -23,7 +23,6 @@
#include "MuonRecHelperTools/MuonEDMHelperTool.h"
#include "MuonRecHelperTools/MuonEDMPrinterTool.h"
#include "MuonIdHelpers/MuonIdHelperTool.h"
-#include "MuonRecToolInterfaces/IAdjustableT0Tool.h"
#include "MuonRecToolInterfaces/IMuonCompetingClustersOnTrackCreator.h"
#include "MuonRecToolInterfaces/IMdtDriftCircleOnTrackCreator.h"
@@ -64,7 +63,6 @@ namespace Muon {
m_muonChamberHoleRecoverTool("Muon::MuonChamberHoleRecoveryTool/MuonChamberHoleRecoveryTool"),
m_trackExtrapolationTool("Muon::MuonTrackExtrapolationTool/MuonTrackExtrapolationTool"),
m_errorOptimisationTool(""),
- m_tofTool(""),
m_magFieldSvc("AtlasFieldSvc",n),
m_magFieldProperties(Trk::FullField),
m_ncalls(0),
@@ -83,7 +81,6 @@ namespace Muon {
declareProperty("MdtRotCreator",m_mdtRotCreator,"Tool to recalibrate MdtDriftCircleOnTrack objects");
declareProperty("CompetingClustersCreator",m_compRotCreator,"Tool to create CompetingMuonClustersOnTrack objects");
declareProperty("Propagator",m_propagator,"propagator");
- declareProperty("TofTool", m_tofTool);
declareProperty("MagFieldSvc", m_magFieldSvc );
declareProperty("IdHelper",m_idHelper);
declareProperty("HitRecoveryTool",m_hitRecoverTool);
@@ -108,7 +105,6 @@ namespace Muon {
ATH_CHECK( m_fitter.retrieve() );
ATH_CHECK( m_slFitter.retrieve() );
- if( !m_tofTool.empty() ) ATH_CHECK( m_tofTool.retrieve() );
ATH_CHECK(m_magFieldSvc.retrieve() );
if( !m_errorOptimisationTool.empty() ) ATH_CHECK( m_errorOptimisationTool.retrieve() );
ATH_CHECK( m_candidateHandler.retrieve() );
@@ -147,36 +143,6 @@ namespace Muon {
return m_errorOptimisationTool->optimiseErrors(track);
}
- Trk::Track* MooTrackBuilder::refit( const MuPatTrack& trkCan ) const {
-
- if( !trkCan.hasMomentum() || !m_magFieldSvc->toroidOn() ) return m_slFitter->refit(trkCan);
-
- // if configured to use t0s check whether there are any segments with fitted T0
- if( !m_tofTool.empty() ){
- m_tofTool->ResetSetTShift( 0. );
- std::vector<MuPatSegment*>::const_iterator sit = trkCan.segments().begin();
- std::vector<MuPatSegment*>::const_iterator sit_end = trkCan.segments().end();
- for( ;sit!=sit_end;++sit ){
-
- // sanity checks
- if( !*sit || !(*sit)->segment ) continue;
-
- // check whether segment has T0
- if( !(*sit)->segment->hasFittedT0() ) continue;
- std::set<Identifier> chIds = m_helper->chamberIds(*(*sit)->segment);
- for( std::set<Identifier>::iterator chit = chIds.begin();chit!=chIds.end();++chit ){
- const Identifier& id = *chit;
- int ieta = m_idHelper->mdtIdHelper().stationEta(id);
- int iphi = m_idHelper->mdtIdHelper().stationPhi(id);
- m_tofTool->SetStatTShift(m_idHelper->chamberNameString(id),ieta,iphi,-(*sit)->segment->time());
- ATH_MSG_DEBUG(" Adding t0 swift: " << m_idHelper->toStringChamber(id) << " --- " << (*sit)->segment->time() );
- }
- }
- }
-
- return refit(trkCan.track());
- }
-
MuPatTrack* MooTrackBuilder::refine( MuPatTrack& track ) const {
Trk::Track* finalTrack = m_hitRecoverTool->recover(track.track());
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MooTrackBuilder.h b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MooTrackBuilder.h
index 4122f12edfd2198d6cbda44de6b861473866866b..4d99054b30bf7d4e1fa36f2757672865df0b2729 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MooTrackBuilder.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MooTrackBuilder.h
@@ -25,10 +25,6 @@
class MsgStream;
-namespace AdjT0 {
- class IAdjustableT0Tool;
-}
-
namespace Trk {
class Track;
class PrepRawData;
@@ -98,12 +94,6 @@ namespace Muon {
/** @brief access to tool interface */
static const InterfaceID& interfaceID() { return IID_MooTrackBuilder; }
- /** @brief refit candidate
- @param trkCan the candidate
- @return a pointer to the resulting track, will return zero if combination failed. Ownership passed to user.
- */
- Trk::Track* refit( const MuPatTrack& trkCan ) const;
-
/** @brief refit track
@param track the track
@return a pointer to the resulting track, will return zero if combination failed. Ownership passed to user.
@@ -280,7 +270,6 @@ namespace Muon {
ToolHandle<IMuonTrackExtrapolationTool> m_trackExtrapolationTool; //<! track extrapolation tool
ToolHandle<IMuonErrorOptimisationTool> m_errorOptimisationTool;
- mutable ToolHandle<AdjT0::IAdjustableT0Tool> m_tofTool; //<! tof tool
ServiceHandle<MagField::IMagFieldSvc> m_magFieldSvc;
Trk::MagneticFieldProperties m_magFieldProperties; //!< magnetic field properties
diff --git a/Trigger/TrigAlgorithms/TrigMuonEF/python/TrigMuonEFCosmicConfig.py b/Trigger/TrigAlgorithms/TrigMuonEF/python/TrigMuonEFCosmicConfig.py
index 9c65c810255d59357822022946e9eacd9fd0c27e..68bb62e4e41cc7dc4b59aa5b0c6bf27069c08726 100755
--- a/Trigger/TrigAlgorithms/TrigMuonEF/python/TrigMuonEFCosmicConfig.py
+++ b/Trigger/TrigAlgorithms/TrigMuonEF/python/TrigMuonEFCosmicConfig.py
@@ -70,8 +70,7 @@ TMEF_MdtDriftCircleOnTrackCreatorAdjustableT0Cosmic = Muon__MdtDriftCircleOnTrac
TimingMode = 3,
DoFixedError = True,
FixedError = 2.0,
- DoTofCorrection = True,
- MuonTofTool = TMEF_AdjustableT0Tool,
+ DoTofCorrection = True
)
ToolSvc += TMEF_MdtDriftCircleOnTrackCreatorAdjustableT0Cosmic
@@ -122,7 +121,6 @@ TMEF_DCMathSegmentMakerCosmic = Muon__DCMathSegmentMaker("TMEF_DCMathSegmentMake
if doT0Fit:
if muonRecFlags.doSegmentT0Fit():
TMEF_DCMathSegmentMakerCosmic.MdtCreator = TMEF_MdtDriftCircleOnTrackCreatorAdjustableT0Cosmic
- TMEF_DCMathSegmentMakerCosmic.TofTool = TMEF_AdjustableT0Tool
ToolSvc += TMEF_DCMathSegmentMakerCosmic