diff --git a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CollisionCalibTemplate.py b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CollisionCalibTemplate.py
index 844c24b7e98635f8cd9e6bcd9825a47c8b3890d9..cd191c1bec3ca91c16c351f9e5b4e9ded19ce82a 100644
--- a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CollisionCalibTemplate.py
+++ b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CollisionCalibTemplate.py
@@ -227,9 +227,13 @@ from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_StrawNeighbour
TRTStrawNeighbourSvc=TRT_StrawNeighbourSvc()
ServiceMgr += TRTStrawNeighbourSvc
-#from TRT_ConditionsTools.TRT_ConditionsToolsConf import TRTCalDbTool
-#TRTCalibDBTool=TRTCalDbTool()
-#ToolSvc+=TRTCalibDBTool
+from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_CalDbTool
+InDetCalDbTool=TRT_CalDbTool(name = "TRT_CalDbTool",
+ isGEANT4=(globalflags.DataSource == 'geant4'))
+
+from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_StrawStatusSummaryTool
+InDetStrawSummaryTool=TRT_StrawStatusSummaryTool(name = "TRT_StrawStatusSummaryTool",
+ isGEANT4=(globalflags.DataSource == 'geant4'))
from TRT_CalibTools.TRT_CalibToolsConf import FitTool
TRTCalFitTool = FitTool (name = 'TRTCalFitTool')
@@ -245,13 +249,14 @@ print TRTCondStream
from TRT_CalibTools.TRT_CalibToolsConf import FillAlignTrkInfo
FillAlignTrkInfo = FillAlignTrkInfo ( name = 'FillAlignTrkInfo',
TrackSummaryTool = InDetTrackSummaryTool)
+
ToolSvc += FillAlignTrkInfo
print FillAlignTrkInfo
from TRT_CalibTools.TRT_CalibToolsConf import FillAlignTRTHits
FillAlignTRTHits = FillAlignTRTHits ( name = 'FillAlignTRTHits',
- NeighbourSvc=TRTStrawNeighbourSvc,
- TRTCalDbSvc=TRTCalibDBSvc)
+ TRTCalDbTool = InDetCalDbTool,
+ TRTStrawSummaryTool = InDetStrawSummaryTool)
ToolSvc += FillAlignTRTHits
print FillAlignTRTHits
@@ -282,7 +287,9 @@ TRTCalibrator = TRTCalibrator ( name = 'TRTCalibrator',
TrtManagerLocation = InDetKeys.TRT_Manager(),
DoShortStrawCorrection = False,
NeighbourSvc=TRTStrawNeighbourSvc,
- TRTCalDbSvc=TRTCalibDBSvc)
+ TRTCalDbTool = InDetCalDbTool,
+ TRTStrawSummaryTool = InDetStrawSummaryTool)
+
ToolSvc += TRTCalibrator
print TRTCalibrator
diff --git a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CollisionTemplate.py b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CollisionTemplate.py
index b2b288eeae33c05a763eb84ee1bbd4c35ca38c68..37cd6ffd8098ed55aace1d606ec011daf65ebfd8 100644
--- a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CollisionTemplate.py
+++ b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CollisionTemplate.py
@@ -218,14 +218,18 @@ ServiceMgr.EventSelector.InputCollections = [ """
from AthenaCommon.AppMgr import ToolSvc
-from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_CalDbSvc
-TRTCalibDBSvc=TRT_CalDbSvc()
-ServiceMgr += TRTCalibDBSvc
+from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_CalDbTool
+InDetCalDbTool=TRT_CalDbTool(name = "TRT_CalDbTool",
+ isGEANT4=(globalflags.DataSource == 'geant4'))
+
+from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_StrawStatusSummaryTool
+InDetStrawSummaryTool=TRT_StrawStatusSummaryTool(name = "TRT_StrawStatusSummaryTool",
+ isGEANT4=(globalflags.DataSource == 'geant4'))
from TRT_DriftFunctionTool.TRT_DriftFunctionToolConf import TRT_DriftFunctionTool
InDetTRT_DriftFunctionTool = TRT_DriftFunctionTool(name = "InDetTRT_DriftFunctionTool",
- TRTCalDbTool=TRTCalibDBSvc,
+ TRTCalDbTool=InDetCalDbTool,
IsMC=(globalflags.DataSource == 'geant4'))
ToolSvc += InDetTRT_DriftFunctionTool
@@ -258,7 +262,9 @@ FillAlignTRTHits = FillAlignTRTHits ( name = 'FillAlignTRTHits',
minTimebinsOverThreshold=0,
NeighbourSvc=TRTStrawNeighbourSvc,
TRTDriftFunctionTool = "InDetTRT_DriftFunctionTool",
- TRTCalDbSvc=TRTCalibDBSvc)
+ TRTCalDbTool = InDetCalDbTool,
+ TRTStrawSummaryTool = InDetStrawSummaryTool)
+
ToolSvc += FillAlignTRTHits
print FillAlignTRTHits
@@ -278,7 +284,7 @@ InDetTRT_DriftCircleTool = InDet__TRT_DriftCircleTool(name
TRTDriftFunctionTool = InDetTRT_DriftFunctionTool,
TrtDescrManageLocation = InDetKeys.TRT_Manager(),
#ConditionsSummaryTool = InDetTRTConditionsSummaryService,
- ConditionsSummaryTool = InDetTRTStrawStatusSummarySvc,
+ ConditionsSummaryTool = InDetTRTStrawSummaryTool,
#HighGateArgon = 75.0,
#LowGateArgon = 0,
#MaxDriftTimeArgon = 99.0,
@@ -324,7 +330,6 @@ RecalibrationFitter = Trk__GlobalChi2Fitter(name = 'RecalibrationFitter',
NavigatorTool = InDetNavigator,
PropagatorTool = InDetPropagator,
RotCreatorTool = InDetRefitRotCreator,
- # RotCreatorTool = InDetRotCreator,
BroadRotCreatorTool = BroadInDetRotCreator,
MeasurementUpdateTool = InDetUpdator,
StraightLine = not InDetFlags.solenoidOn(),
@@ -380,7 +385,9 @@ TRTCondWrite = TRTCondWrite( name = \"TRTCondWrite\")
topSequence+=TRTCondWrite
-
+from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_CalDbSvc
+TRTCalibDBSvc=TRT_CalDbSvc()
+ServiceMgr += TRTCalibDBSvc
TRTCalibDBSvc.StreamTool=TRTCondStream
diff --git a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CosmicCalibTemplate.py b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CosmicCalibTemplate.py
index 196e0e83e62dd49894a4c4a9d03eb0f26cc3306f..fef9e132a0c93524a4399e021a6271c90562c4e6 100644
--- a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CosmicCalibTemplate.py
+++ b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CosmicCalibTemplate.py
@@ -223,9 +223,14 @@ from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_StrawNeighbour
TRTStrawNeighbourSvc=TRT_StrawNeighbourSvc()
ServiceMgr += TRTStrawNeighbourSvc
-#from TRT_ConditionsTools.TRT_ConditionsToolsConf import TRTCalDbTool
-#TRTCalibDBTool=TRTCalDbTool()
-#ToolSvc+=TRTCalibDBTool
+from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_CalDbTool
+InDetCalDbTool=TRT_CalDbTool(name = "TRT_CalDbTool",
+ isGEANT4=(globalflags.DataSource == 'geant4'))
+
+from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_StrawStatusSummaryTool
+InDetStrawSummaryTool=TRT_StrawStatusSummaryTool(name = "TRT_StrawStatusSummaryTool",
+ isGEANT4=(globalflags.DataSource == 'geant4'))
+
from TRT_CalibTools.TRT_CalibToolsConf import FitTool
TRTCalFitTool = FitTool (name = 'TRTCalFitTool')
@@ -247,7 +252,9 @@ print FillAlignTrkInfo
from TRT_CalibTools.TRT_CalibToolsConf import FillAlignTRTHits
FillAlignTRTHits = FillAlignTRTHits ( name = 'FillAlignTRTHits',
NeighbourSvc=TRTStrawNeighbourSvc,
- TRTCalDbSvc=TRTCalibDBSvc)
+ TRTCalDbTool = InDetCalDbTool,
+ TRTStrawSummaryTool = InDetStrawSummaryTool)
+
ToolSvc += FillAlignTRTHits
print FillAlignTRTHits
@@ -278,7 +285,9 @@ TRTCalibrator = TRTCalibrator ( name = 'TRTCalibrator',
TrtManagerLocation = InDetKeys.TRT_Manager(),
DoShortStrawCorrection = False,
NeighbourSvc=TRTStrawNeighbourSvc,
- TRTCalDbSvc=TRTCalibDBSvc)
+ TRTCalDbTool = InDetCalDbTool,
+ TRTStrawSummaryTool = InDetStrawSummaryTool)
+
ToolSvc += TRTCalibrator
print TRTCalibrator
diff --git a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CosmicMCCalibTemplate.py b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CosmicMCCalibTemplate.py
index e431010ad87da18219f39280bf2cfb9d9b791854..dee7d30f661074ac8b4de17b5450d35a124c4556 100644
--- a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CosmicMCCalibTemplate.py
+++ b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CosmicMCCalibTemplate.py
@@ -218,10 +218,6 @@ from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_StrawNeighbour
TRTStrawNeighbourSvc=TRT_StrawNeighbourSvc()
ServiceMgr += TRTStrawNeighbourSvc
-#from TRT_ConditionsTools.TRT_ConditionsToolsConf import TRTCalDbTool
-#TRTCalibDBTool=TRTCalDbTool()
-#ToolSvc+=TRTCalibDBTool
-
from TRT_CalibTools.TRT_CalibToolsConf import FitTool
TRTCalFitTool = FitTool (name = 'TRTCalFitTool')
ToolSvc += TRTCalFitTool
@@ -233,6 +229,15 @@ TRTCondStream=AthenaOutputStreamTool(name="CondStream1",OutputFile="trtcalibout.
ToolSvc += TRTCondStream
print TRTCondStream
+from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_CalDbTool
+InDetCalDbTool=TRT_CalDbTool(name = "TRT_CalDbTool",
+ isGEANT4=(globalflags.DataSource == 'geant4'))
+
+from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_StrawStatusSummaryTool
+InDetStrawSummaryTool=TRT_StrawStatusSummaryTool(name = "TRT_StrawStatusSummaryTool",
+ isGEANT4=(globalflags.DataSource == 'geant4'))
+
+
from TRT_CalibTools.TRT_CalibToolsConf import FillAlignTrkInfo
FillAlignTrkInfo = FillAlignTrkInfo ( name = 'FillAlignTrkInfo',
TrackSummaryTool = InDetTrackSummaryTool)
@@ -242,7 +247,9 @@ print FillAlignTrkInfo
from TRT_CalibTools.TRT_CalibToolsConf import FillAlignTRTHits
FillAlignTRTHits = FillAlignTRTHits ( name = 'FillAlignTRTHits',
NeighbourSvc=TRTStrawNeighbourSvc,
- TRTCalDbSvc=TRTCalibDBSvc)
+ TRTCalDbTool = InDetCalDbTool,
+ TRTStrawSummaryTool = InDetStrawSummaryTool)
+
ToolSvc += FillAlignTRTHits
print FillAlignTRTHits
@@ -268,7 +275,9 @@ TRTCalibrator = TRTCalibrator ( name = 'TRTCalibrator',
ostring+="""
TrtManagerLocation = InDetKeys.TRT_Manager(),
NeighbourSvc=TRTStrawNeighbourSvc,
- TRTCalDbSvc=TRTCalibDBSvc)
+ TRTCalDbTool = InDetCalDbTool,
+ TRTStrawSummaryTool = InDetStrawSummaryTool)
+
ToolSvc += TRTCalibrator
print TRTCalibrator
diff --git a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CosmicMCTemplate.py b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CosmicMCTemplate.py
index 01d9eea4538dd0914b718e49cbbf7d413cb90b94..d7ce8992a3e696404299ce2b2aa6a03b29883062 100644
--- a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CosmicMCTemplate.py
+++ b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CosmicMCTemplate.py
@@ -217,9 +217,14 @@ if doReadBS:
from AthenaCommon.AppMgr import ToolSvc
from AthenaCommon.AppMgr import ServiceMgr
-#from TRT_ConditionsTools.TRT_ConditionsToolsConf import TRTCalDbTool
-#TRTCalibDBTool=TRTCalDbTool()
-#ToolSvc+=TRTCalibDBTool
+from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_CalDbTool
+InDetCalDbTool=TRT_CalDbTool(name = "TRT_CalDbTool",
+ isGEANT4=(globalflags.DataSource == 'geant4'))
+
+from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_StrawStatusSummaryTool
+InDetStrawSummaryTool=TRT_StrawStatusSummaryTool(name = "TRT_StrawStatusSummaryTool",
+ isGEANT4=(globalflags.DataSource == 'geant4'))
+
from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_CalDbSvc
TRTCalibDBSvc=TRT_CalDbSvc()
@@ -246,24 +251,12 @@ print FillAlignTrkInfo
from TRT_CalibTools.TRT_CalibToolsConf import FillAlignTRTHits
FillAlignTRTHits = FillAlignTRTHits ( name = 'FillAlignTRTHits',
NeighbourSvc='TRT_StrawNeighbourSvc',
- TRTCalDbSvc=TRTCalibDBSvc)
+ TRTCalDbTool = InDetCalDbTool,
+ TRTStrawSummaryTool = InDetStrawSummaryTool)
+
ToolSvc += FillAlignTRTHits
print FillAlignTRTHits
-#from TRT_CalibTools.TRT_CalibToolsConf import TRTCalAccumulator
-#TRTCalAccumulator = TRTCalAccumulator ( name = "TRTCalAccumulator",
-# TRTCalDBTool=TRTCalibDBTool,
-# storeAllWires = True,
-# calibrateRt = False,
-# createStrawTuple = True,
-# rtParameterizationType = 1,
-# rtPolyOrder = 0,
-# minEntriesPerStraw = 0, #2'
-# maxTrackChisquarePerDof = 3, #10.,
-# minTimebinsOverThreshold = 2)
-
-#ToolSvc += TRTCalAccumulator
-#print TRTCalAccumulator
# select good quality tracks
from TRT_AlignAlgs.TRT_AlignAlgsConf import TRTTrackSelectionAlg
diff --git a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/ESDCalibTemplate.py b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/ESDCalibTemplate.py
index ec7a20aea07d99d2d0cef7b8094d2d6c9db155fb..4c9bc810e3c9bb6f851ed1cc9477dab8c633130e 100644
--- a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/ESDCalibTemplate.py
+++ b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/ESDCalibTemplate.py
@@ -237,10 +237,20 @@ from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_StrawNeighbour
TRTStrawNeighbourSvc=TRT_StrawNeighbourSvc()
ServiceMgr += TRTStrawNeighbourSvc
+from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_CalDbTool
+InDetCalDbTool=TRT_CalDbTool(name = "TRT_CalDbTool",
+ isGEANT4=(globalflags.DataSource == 'geant4'))
+
+from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_StrawStatusSummaryTool
+InDetStrawSummaryTool=TRT_StrawStatusSummaryTool(name = "TRT_StrawStatusSummaryTool",
+ isGEANT4=(globalflags.DataSource == 'geant4'))
+
+
+
from TRT_DriftFunctionTool.TRT_DriftFunctionToolConf import TRT_DriftFunctionTool
InDetTRT_DriftFunctionTool = TRT_DriftFunctionTool(name = "InDetTRT_DriftFunctionTool",
AllowDataMCOverride = True,
- TRTCalDbTool=TRTCalSvc,
+ TRTCalDbTool=InDetCalDbTool,
ForceData = True,
IsMC=(globalflags.DataSource == 'geant4'))
@@ -263,7 +273,9 @@ from TRT_CalibTools.TRT_CalibToolsConf import FillAlignTRTHits
FillAlignTRTHits = FillAlignTRTHits ( name = 'FillAlignTRTHits',
TRTCalDbSvc = TRTCalSvc,
minTimebinsOverThreshold=0,
- NeighbourSvc=TRTStrawNeighbourSvc)
+ TRTCalDbTool = InDetCalDbTool,
+ TRTStrawSummaryTool = InDetStrawSummaryTool)
+
ToolSvc += FillAlignTRTHits
print FillAlignTRTHits
@@ -321,7 +333,9 @@ TRTCalibrator = TRTCalibrator ( name = 'TRTCalibrator',
ostring+="""
TrtManagerLocation = InDetKeys.TRT_Manager(),
NeighbourSvc=TRTStrawNeighbourSvc,
- TRTCalDbSvc=TRTCalSvc)
+ TRTCalDbTool = InDetCalDbTool,
+ TRTStrawSummaryTool = InDetStrawSummaryTool)
+
ToolSvc += TRTCalibrator
print TRTCalibrator
diff --git a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/RAWCalibTemplate.py b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/RAWCalibTemplate.py
index 9538467dee17727860a2dcf63364b1f3dad3a612..d6eb17cdf97cfd00aa824c009d6daf1699233d7c 100644
--- a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/RAWCalibTemplate.py
+++ b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/RAWCalibTemplate.py
@@ -20,9 +20,15 @@ from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_StrawNeighbour
TRTStrawNeighbourSvc=TRT_StrawNeighbourSvc()
ServiceMgr += TRTStrawNeighbourSvc
-#from TRT_ConditionsTools.TRT_ConditionsToolsConf import TRTCalDbTool
-#TRTCalibDBTool=TRTCalDbTool()
-#ToolSvc+=TRTCalibDBTool
+from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_CalDbTool
+InDetCalDbTool=TRT_CalDbTool(name = "TRT_CalDbTool",
+ isGEANT4=(globalflags.DataSource == 'geant4'))
+
+from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_StrawStatusSummaryTool
+InDetStrawSummaryTool=TRT_StrawStatusSummaryTool(name = "TRT_StrawStatusSummaryTool",
+ isGEANT4=(globalflags.DataSource == 'geant4'))
+
+
from TRT_CalibTools.TRT_CalibToolsConf import FitTool
TRTCalFitTool = FitTool (name = 'TRTCalFitTool')
@@ -44,7 +50,9 @@ print FillAlignTrkInfo
from TRT_CalibTools.TRT_CalibToolsConf import FillAlignTRTHits
FillAlignTRTHits = FillAlignTRTHits ( name = 'FillAlignTRTHits',
NeighbourSvc=TRTStrawNeighbourSvc,
- TRTCalDbSvc=TRTCalibDBSvc)
+ TRTCalDbTool = InDetCalDbTool,
+ TRTStrawSummaryTool = InDetStrawSummaryTool)
+
ToolSvc += FillAlignTRTHits
print FillAlignTRTHits
@@ -79,36 +87,11 @@ TRTCalibrator = TRTCalibrator ( name = 'TRTCalibrator',
if config["DoArXe"]:
ostring+=""" DoArXenonSep = True,
"""
- ostring+=""" TRTCalDbSvc=TRTCalibDBSvc)
+ ostring+=""" TRTCalDbTool=InDetCalibDbTool)
ToolSvc += TRTCalibrator
print TRTCalibrator
# select good quality tracks
-#from TRT_AlignAlgs.TRT_AlignAlgsConf import TRTTrackSelectionAlg
-#SelectTRTAlignTracks = TRTTrackSelectionAlg( name = "SelectTRTAlignTracks",
-# DoPtCut = False,
-# D0Max = 10000,
-# D0Min = -10000,
-# # PtMin = 2000,
-# # PtMax = 'inf',
-# inputTrackList = "StandaloneTRTTracks",
-## UseCosmicTrackSelection = True,
-# MinEventPhase = -1000,
-# MaxEventPhase = 1000,
-# outputTrackList = "TRTCalibTracks",
-# SummaryTool = InDetTrackSummaryTool,
-# MaxChisqPerDof = 3, #50.,
-# MinPixelHits = -1000,
-# MinSCTHits = -1000,
-# MinTRTHits = 45,
-# EtaMin = -1000,
-# PhiMin = -1000,
-# EtaMax = 1000,
-# PhiMax = 1000)
-#
-#topSequence += SelectTRTAlignTracks
-#print SelectTRTAlignTracks
-
from InDetTrackSelectorTool.InDetTrackSelectorToolConf import InDet__InDetDetailedTrackSelectorTool
diff --git a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/RAWHITemplate.py b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/RAWHITemplate.py
index 24f9e7dfcb4663f81bbbee6bcde17210bc9bcf17..1a1d69c53e3851615f812962e1388ded05f37c87 100644
--- a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/RAWHITemplate.py
+++ b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/RAWHITemplate.py
@@ -294,6 +294,15 @@ TRTCalFitTool = FitTool (name = 'TRTCalFitTool')
ToolSvc += TRTCalFitTool
print TRTCalFitTool
+from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_CalDbTool
+InDetCalDbTool=TRT_CalDbTool(name = "TRT_CalDbTool",
+ isGEANT4=(globalflags.DataSource == 'geant4'))
+
+from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_StrawStatusSummaryTool
+InDetStrawSummaryTool=TRT_StrawStatusSummaryTool(name = "TRT_StrawStatusSummaryTool",
+ isGEANT4=(globalflags.DataSource == 'geant4'))
+
+
from AthenaServices.AthenaServicesConf import AthenaOutputStreamTool
TRTCondStream=AthenaOutputStreamTool(name="CondStream1",OutputFile="trtcalibout.pool.root")
@@ -304,6 +313,8 @@ print TRTCondStream
from TRT_CalibTools.TRT_CalibToolsConf import FillAlignTrkInfo
FillAlignTrkInfo = FillAlignTrkInfo ( name = 'FillAlignTrkInfo',
TrackSummaryTool = InDetTrackSummaryTool)
+
+
ToolSvc += FillAlignTrkInfo
print FillAlignTrkInfo
@@ -311,7 +322,9 @@ from TRT_CalibTools.TRT_CalibToolsConf import FillAlignTRTHits
FillAlignTRTHits = FillAlignTRTHits ( name = 'FillAlignTRTHits',
minTimebinsOverThreshold=0,
NeighbourSvc=TRTStrawNeighbourSvc,
- TRTCalDbSvc=TRTCalibDBSvc)
+ TRTCalDbTool = InDetCalDbTool,
+ TRTStrawSummaryTool = InDetStrawSummaryTool)
+
ToolSvc += FillAlignTRTHits
print FillAlignTRTHits
diff --git a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/RAWTemplate.py b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/RAWTemplate.py
index 01c3991036ee8864a97cc65b90697bf28e1b90fd..dbcb3b2f387de8228026c471ecb1bfcc0deabc5b 100644
--- a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/RAWTemplate.py
+++ b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/RAWTemplate.py
@@ -20,6 +20,14 @@ TRTCalFitTool = FitTool (name = 'TRTCalFitTool')
ToolSvc += TRTCalFitTool
print TRTCalFitTool
+from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_CalDbTool
+InDetCalDbTool=TRT_CalDbTool(name = "TRT_CalDbTool",
+ isGEANT4=(globalflags.DataSource == 'geant4'))
+
+from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_StrawStatusSummaryTool
+InDetStrawSummaryTool=TRT_StrawStatusSummaryTool(name = "TRT_StrawStatusSummaryTool",
+ isGEANT4=(globalflags.DataSource == 'geant4'))
+
from AthenaServices.AthenaServicesConf import AthenaOutputStreamTool
TRTCondStream=AthenaOutputStreamTool(name="CondStream1",OutputFile="trtcalibout.pool.root")
@@ -37,40 +45,12 @@ from TRT_CalibTools.TRT_CalibToolsConf import FillAlignTRTHits
FillAlignTRTHits = FillAlignTRTHits ( name = 'FillAlignTRTHits',
minTimebinsOverThreshold=0,
NeighbourSvc=TRTStrawNeighbourSvc,
- TRTCalDbSvc=TRTCalibDBSvc)
+ TRTCalDbTool = InDetCalDbTool,
+ TRTStrawSummaryTool = InDetStrawSummaryTool)
+
ToolSvc += FillAlignTRTHits
print FillAlignTRTHits
-# select good quality tracks
-#from TRT_AlignAlgs.TRT_AlignAlgsConf import TRTTrackSelectionAlg
-#SelectTRTAlignTracks = TRTTrackSelectionAlg( name = "SelectTRTAlignTracks",
-# inputTrackList = "CombinedInDetTracks",
-# inputTrackList = "StandaloneTRTTracks",
-# outputTrackList = "TRTCalibTracks",
-# SummaryTool = InDetTrackSummaryTool,
-# MaxChisqPerDof = 50.,
-# D0Max = 30 ,
-# D0Min = -30 ,
-# DoPtCut = True ,
-# PtMax = 9.9999999999999998e+23,
-# PtMin = 1000 ,
-# EtaMax = 10000 ,
-# EtaMin = -10000 ,
-# PhiMax = 10000 ,
-# PhiMin = -10000 ,
-# MaxEventPhase = 10000 ,
-# MinEventPhase = -10000 ,
-# MinTRTHits = 20 ,
-# MinBarrelHits = 0 ,
-# MinEndcapHits = 0 ,
-# RequireEndcapHits = False ,
-# MinPixelHits = -1000 ,
-# MinSCTHits = 6 ,
-## MinSCTHits = -1000 ,
-# UseBeamSpotConstraint = False )
-#
-#topSequence += SelectTRTAlignTracks
-#print SelectTRTAlignTracks
from InDetTrackSelectorTool.InDetTrackSelectorToolConf import InDet__InDetDetailedTrackSelectorTool
diff --git a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/joboptionsFullReco.py b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/joboptionsFullReco.py
index f47740da2928a54ed5c29072d6149dd641bf564c..0d8dec01b9a5070c1231dc16c7e78f080efeef98 100755
--- a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/joboptionsFullReco.py
+++ b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/joboptionsFullReco.py
@@ -234,9 +234,19 @@ FillAlignTrkInfo = FillAlignTrkInfo ( name = 'FillAlignTrkInfo',
ToolSvc += FillAlignTrkInfo
print FillAlignTrkInfo
+from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_CalDbTool
+InDetCalDbTool=TRT_CalDbTool(name = "TRT_CalDbTool",
+ isGEANT4=(globalflags.DataSource == 'geant4'))
+
+from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_StrawStatusSummaryTool
+InDetStrawSummaryTool=TRT_StrawStatusSummaryTool(name = "TRT_StrawStatusSummaryTool",
+ isGEANT4=(globalflags.DataSource == 'geant4'))
+
+
+
from TRT_DriftFunctionTool.TRT_DriftFunctionToolConf import TRT_DriftFunctionTool
InDetTRT_DriftFunctionTool = TRT_DriftFunctionTool(name = "InDetTRT_DriftFunctionTool",
- TRTCalDbTool=TRTCalibDBSvc,
+ TRTCalDbTool=InDetCalDbTool,
IsMC=(globalflags.DataSource == 'geant4'))
ToolSvc += InDetTRT_DriftFunctionTool
@@ -246,8 +256,9 @@ from TRT_CalibTools.TRT_CalibToolsConf import FillAlignTRTHits
FillAlignTRTHits = FillAlignTRTHits ( name = 'FillAlignTRTHits',
minTimebinsOverThreshold=0,
NeighbourSvc=TRTStrawNeighbourSvc,
- TRTDriftFunctionTool = "InDetTRT_DriftFunctionTool",
- TRTCalDbSvc=TRTCalibDBSvc)
+ TRTCalDbTool = InDetCalDbTool,
+ TRTStrawSummaryTool = InDetStrawSummaryTool)
+
ToolSvc += FillAlignTRTHits
print FillAlignTRTHits
diff --git a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/joboptionsRefitting.py b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/joboptionsRefitting.py
index b6727028a5e5a5a63875fe8f9c90e39c918f48ef..d22ca789c3311dc73542e5be55d2fab6ca39b145 100644
--- a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/joboptionsRefitting.py
+++ b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/joboptionsRefitting.py
@@ -206,9 +206,19 @@ from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_CalDbSvc
TRTCalibDBSvc=TRT_CalDbSvc()
ServiceMgr += TRTCalibDBSvc
+from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_CalDbTool
+InDetCalDbTool=TRT_CalDbTool(name = "TRT_CalDbTool",
+ isGEANT4=(globalflags.DataSource == 'geant4'))
+
+from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_StrawStatusSummaryTool
+InDetStrawSummaryTool=TRT_StrawStatusSummaryTool(name = "TRT_StrawStatusSummaryTool",
+ isGEANT4=(globalflags.DataSource == 'geant4'))
+
+
+
from TRT_DriftFunctionTool.TRT_DriftFunctionToolConf import TRT_DriftFunctionTool
InDetTRT_DriftFunctionTool = TRT_DriftFunctionTool(name = "InDetTRT_DriftFunctionTool",
- TRTCalDbTool=TRTCalibDBSvc,
+ TRTCalDbTool=InDetCalDbTool,
IsMC=(globalflags.DataSource == 'geant4'))
ToolSvc += InDetTRT_DriftFunctionTool
@@ -240,8 +250,9 @@ from TRT_CalibTools.TRT_CalibToolsConf import FillAlignTRTHits
FillAlignTRTHits = FillAlignTRTHits ( name = 'FillAlignTRTHits',
minTimebinsOverThreshold=0,
NeighbourSvc=TRTStrawNeighbourSvc,
- TRTDriftFunctionTool = "InDetTRT_DriftFunctionTool",
- TRTCalDbSvc=TRTCalibDBSvc)
+ TRTCalDbTool = InDetCalDbTool,
+ TRTStrawSummaryTool = InDetStrawSummaryTool)
+
ToolSvc += FillAlignTRTHits
print FillAlignTRTHits
@@ -261,7 +272,7 @@ InDetTRT_DriftCircleTool = InDet__TRT_DriftCircleTool(name
TRTDriftFunctionTool = InDetTRT_DriftFunctionTool,
TrtDescrManageLocation = InDetKeys.TRT_Manager(),
#ConditionsSummaryTool = InDetTRTConditionsSummaryService,
- ConditionsSummaryTool = InDetTRTStrawStatusSummarySvc,
+ ConditionsSummaryTool = InDetStrawSummaryTool,
#HighGateArgon = 75.0,
#LowGateArgon = 0,
#MaxDriftTimeArgon = 99.0,
diff --git a/InnerDetector/InDetCalibTools/TRT_CalibTools/src/FillAlignTRTHits.cxx b/InnerDetector/InDetCalibTools/TRT_CalibTools/src/FillAlignTRTHits.cxx
index b3ea5fd9ce5b03f6e4697fe6c203163541675979..1db966294169f598ec92986a55999598e58e31bb 100755
--- a/InnerDetector/InDetCalibTools/TRT_CalibTools/src/FillAlignTRTHits.cxx
+++ b/InnerDetector/InDetCalibTools/TRT_CalibTools/src/FillAlignTRTHits.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
/********************************************************************
@@ -35,8 +35,6 @@ PURPOSE: Tool
#include "TrkToolInterfaces/IUpdator.h"
#include "TRT_DriftFunctionTool/ITRT_DriftFunctionTool.h"
-#include "TRT_ConditionsServices/ITRT_CalDbSvc.h"
-#include "TRT_ConditionsServices/ITRT_StrawNeighbourSvc.h"
//#include "VxVertex/VxContainer.h"
#include "xAODTracking/VertexContainer.h"
@@ -46,9 +44,9 @@ FillAlignTRTHits::FillAlignTRTHits(const std::string& type, const std::string& n
AthAlgTool(type, name, parent),
m_DetID(nullptr), m_TRTID(nullptr),
// m_driftFunctionTool("TRT_DriftFunctionTool"),
- m_trtcaldbSvc("ITRT_CalDbSvc", name),
+ m_trtcaldbTool("ITRT_CalDbTool", this),
m_neighbourSvc("ITRT_StrawNeighbourSvc", name),
- m_TRTStrawSummarySvc("InDetTRTStrawStatusSummarySvc",name),
+ m_TRTStrawSummaryTool("InDetTRTStrawStatusSummaryTool",this),
m_updator(nullptr),
m_maxDistance(2.8),
m_maxTimeResidual(150),
@@ -62,14 +60,14 @@ FillAlignTRTHits::FillAlignTRTHits(const std::string& type, const std::string& n
{
declareInterface<IFillAlignTrkInfo>(this);
// declareProperty("TRTDriftFunctionTool", m_driftFunctionTool);
- declareProperty("TRTCalDbSvc",m_trtcaldbSvc);
+ declareProperty("TRTCalDbTool",m_trtcaldbTool);
declareProperty("NeighbourSvc",m_neighbourSvc);
declareProperty("maxDistance",m_maxDistance) ;
declareProperty("maxTimeResidual",m_maxTimeResidual) ;
declareProperty("minTimebinsOverThreshold",m_minTimebinsOverThreshold) ;
declareProperty("maxTrackChisquarePerDof",m_maxTrackChisquarePerDof) ;
declareProperty("DoMCCosmicTimeShift",m_DoMCCosmicTimeShift);
- declareProperty("TRTStrawSummarySvc", m_TRTStrawSummarySvc);
+ declareProperty("TRTStrawSummaryTool", m_TRTStrawSummaryTool);
}
StatusCode FillAlignTRTHits::initialize(){
@@ -82,8 +80,8 @@ StatusCode FillAlignTRTHits::initialize(){
msg(MSG::FATAL) << "Problem retrieving TRTID helper" << endmsg;
return StatusCode::FAILURE;
}
- if(m_trtcaldbSvc.retrieve().isFailure()) {
- msg(MSG::FATAL) << "Could not get TRTCalDbSvc !" << endmsg;
+ if(m_trtcaldbTool.retrieve().isFailure()) {
+ msg(MSG::FATAL) << "Could not get TRT_CalDbTool !" << endmsg;
return StatusCode::FAILURE;
}
if(StatusCode::SUCCESS!=m_neighbourSvc.retrieve() ) {
@@ -115,12 +113,12 @@ StatusCode FillAlignTRTHits::initialize(){
}
// The tool to get the argon status:
- if (!m_TRTStrawSummarySvc.empty() && m_TRTStrawSummarySvc.retrieve().isFailure() ) {
- ATH_MSG_ERROR ("Failed to retrieve StrawStatus Summary " << m_TRTStrawSummarySvc);
+ if (m_TRTStrawSummaryTool.retrieve().isFailure() ) {
+ ATH_MSG_ERROR ("Failed to retrieve StrawStatus Summary " << m_TRTStrawSummaryTool);
ATH_MSG_ERROR ("configure as 'None' to avoid its loading.");
return StatusCode::FAILURE;
} else {
- if ( !m_TRTStrawSummarySvc.empty()) msg(MSG::INFO) << "Retrieved tool " << m_TRTStrawSummarySvc << endmsg;
+ msg(MSG::INFO) << "Retrieved tool " << m_TRTStrawSummaryTool << endmsg;
}
m_f = new TFile("basic.root","RECREATE");
@@ -264,12 +262,12 @@ bool FillAlignTRTHits::fill(const Trk::Track* aTrack, TRT::TrackInfo* output,
// I'd also like to store the drift velocity
if (!isvalid) (*newhit)[TRT::Hit::driftTime] = -1.0;
- (*newhit)[TRT::Hit::t0] = m_trtcaldbSvc->getT0(ident) ;
+ (*newhit)[TRT::Hit::t0] = m_trtcaldbTool->getT0(ident) ;
//(*newhit)[TRT::Hit::TimeoverThreshold]= dcp ? dcp->timeOverThreshold() : -1.0;
(*newhit)[TRT::Hit::TimeoverThreshold] = dcp->timeOverThreshold() ;
//CORRECT FOR TUBEHITS!!!:
//const TRTCond::RtRelation*
- rtrelation = m_trtcaldbSvc->getRtRelation(ident) ;
+ rtrelation = m_trtcaldbTool->getRtRelation(ident) ;
// added High Level Threshold information
(*newhit)[TRT::Hit::HTLevel] = dcp->highLevel();
// Extract the correction in the db for the ToT:
@@ -309,8 +307,8 @@ bool FillAlignTRTHits::fill(const Trk::Track* aTrack, TRT::TrackInfo* output,
// Prepare for Xe-Ar mixed conditions:
int isArgonStraw = 0;
- if (!m_TRTStrawSummarySvc.empty()) {
- if (m_TRTStrawSummarySvc->getStatusHT(ident) != TRTCond::StrawStatus::Good) {
+ if (!m_TRTStrawSummaryTool.empty()) {
+ if (m_TRTStrawSummaryTool->getStatusHT(ident) != TRTCond::StrawStatus::Good) {
isArgonStraw = 1;
}
}
@@ -410,7 +408,7 @@ bool FillAlignTRTHits::fill(const Trk::Track* aTrack, TRT::TrackInfo* output,
drrtrackunbias,
(*newhit)[TRT::Hit::trackDriftTime],
ttrackunbias,
- m_trtcaldbSvc->getT0(ident),
+ m_trtcaldbTool->getT0(ident),
(float)timecor,
(float)phi ,
(float)theta,
diff --git a/InnerDetector/InDetCalibTools/TRT_CalibTools/src/FillAlignTRTHits.h b/InnerDetector/InDetCalibTools/TRT_CalibTools/src/FillAlignTRTHits.h
index c302a6a15dbea7577710a6d63fcda15cae5eebc4..491046f2b9029c18c9aa61665249d23629681725 100755
--- a/InnerDetector/InDetCalibTools/TRT_CalibTools/src/FillAlignTRTHits.h
+++ b/InnerDetector/InDetCalibTools/TRT_CalibTools/src/FillAlignTRTHits.h
@@ -1,6 +1,6 @@
// -*- c++ -*-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRT_CALIBTOOLS__FILLALIGNTRTHITS_H
@@ -22,8 +22,8 @@ PURPOSE: Tool to fill Hit info into the TRT::Hit messenger class
#include <string>
#include "TRT_CalibTools/IFillAlignTrkInfo.h"
#include "TRT_ConditionsServices/ITRT_StrawNeighbourSvc.h"
-#include "TRT_ConditionsServices/ITRT_CalDbSvc.h"
-#include "TRT_ConditionsServices/ITRT_StrawStatusSummarySvc.h"
+#include "TRT_ConditionsServices/ITRT_CalDbTool.h"
+#include "TRT_ConditionsServices/ITRT_StrawStatusSummaryTool.h"
#include "TRT_DriftCircleTool/ITRT_DriftCircleTool.h"
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/ToolHandle.h"
@@ -33,10 +33,8 @@ PURPOSE: Tool to fill Hit info into the TRT::Hit messenger class
#include <TFile.h>
#include "TRT_DriftFunctionTool/ITRT_DriftFunctionTool.h"
-class ITRT_StrawSummarySvc;
class AtlasDetectorID;
class TRT_ID;
-class ITRT_CalDbSvc;
namespace Trk {
class IPropagator;
@@ -68,11 +66,9 @@ private:
ToolHandle< ITRT_DriftFunctionTool > m_driftFunctionTool{this, "TRTDriftFunctionTool", "TRT_DriftFunctionTool", "Drift function tool name"};
ToolHandle<Trk::IUpdator> m_updatorHandle{this, "UpdatorTool", "Trk::KalmanUpdator/TrkKalmanUpdator", "Measurement updator to calculate unbiased track states"};
- // ToolHandle<ITRTCalDbTool> m_trtcaldbtool ;
- // ToolHandle<ITRTStrawNeighbourTool> m_neighbourtool;
- ServiceHandle<ITRT_CalDbSvc> m_trtcaldbSvc ;
+ ToolHandle<ITRT_CalDbTool> m_trtcaldbTool ;
ServiceHandle<ITRT_StrawNeighbourSvc> m_neighbourSvc ;
- ServiceHandle<ITRT_StrawStatusSummarySvc> m_TRTStrawSummarySvc; //!< The ConditionsSummaryTool
+ ToolHandle<ITRT_StrawStatusSummaryTool> m_TRTStrawSummaryTool; //!< The ConditionsSummaryTool
Trk::IUpdator* m_updator; //!< updator for unbiased states
diff --git a/InnerDetector/InDetCalibTools/TRT_CalibTools/src/TRTCalibrator.cxx b/InnerDetector/InDetCalibTools/TRT_CalibTools/src/TRTCalibrator.cxx
index b9934f8d445166aa454dee8530720942d493a91c..dabae4e5363d399eefe0fe8f4a6a6d0473e00836 100755
--- a/InnerDetector/InDetCalibTools/TRT_CalibTools/src/TRTCalibrator.cxx
+++ b/InnerDetector/InDetCalibTools/TRT_CalibTools/src/TRTCalibrator.cxx
@@ -33,8 +33,6 @@ PURPOSE: Tool for calibrating the TRT
#include "TRT_ConditionsData/DinesRtRelation.h"
#include "TRT_ConditionsData/BinnedRtRelation.h"
#include "CommissionEvent/ComTime.h"
-#include "TRT_ConditionsServices/ITRT_CalDbSvc.h"
-#include "TRT_ConditionsServices/ITRT_StrawNeighbourSvc.h"
#include "InDetReadoutGeometry/TRT_DetectorManager.h"
#include <TNtuple.h>
@@ -47,9 +45,9 @@ TRTCalibrator::TRTCalibrator(const std::string& type, const std::string& name, c
m_DetID(nullptr),
m_TRTID(nullptr),
m_trtmanager(nullptr),
- m_trtcaldbSvc("ITRT_CalDbSvc", name),
+ m_trtcaldbTool("ITRT_CalDbTool", this),
m_neighbourSvc("ITRT_StrawNeighbourSvc", name),
- m_TRTStrawSummarySvc("InDetTRTStrawStatusSummarySvc",name),
+ m_TRTStrawSummaryTool("InDetTRTStrawStatusSummaryTool",this),
m_maxDistance(2.8),
m_maxTimeResidual(150),
m_minTimebinsOverThreshold(2),
@@ -77,7 +75,7 @@ TRTCalibrator::TRTCalibrator(const std::string& type, const std::string& name, c
m_histfile(nullptr)
{
declareInterface<ITRTCalibrator>(this);
- declareProperty("TRTCalDbSvc",m_trtcaldbSvc);
+ declareProperty("TRTCalDbTool",m_trtcaldbTool);
declareProperty("NeighbourSvc",m_neighbourSvc);
declareProperty("maxDistance",m_maxDistance) ;
declareProperty("maxTimeResidual",m_maxTimeResidual) ;
@@ -107,7 +105,7 @@ TRTCalibrator::TRTCalibrator(const std::string& type, const std::string& name, c
declareProperty("T0Offset",m_t0offset);
declareProperty("DoShortStrawCorrection",m_DoShortStrawCorrection);
declareProperty("DoArXenonSep",m_DoArXenonSep);
- declareProperty("TRTStrawSummarySvc", m_TRTStrawSummarySvc);
+ declareProperty("TRTStrawSummaryTool", m_TRTStrawSummaryTool);
}
@@ -129,7 +127,7 @@ StatusCode TRTCalibrator::initialize()
msg(MSG::FATAL) << "Problem retrieving TRTID helper" << endmsg;
return StatusCode::FAILURE;
}
- if(m_trtcaldbSvc.retrieve().isFailure()) {
+ if(m_trtcaldbTool.retrieve().isFailure()) {
msg(MSG::FATAL) << "Could not get TRTCalDbTool !" << endmsg;
return StatusCode::FAILURE;
}
@@ -141,12 +139,11 @@ StatusCode TRTCalibrator::initialize()
// The tool to get the argon status:
- if (!m_TRTStrawSummarySvc.empty() && m_TRTStrawSummarySvc.retrieve().isFailure() ) {
- ATH_MSG_ERROR ("Failed to retrieve StrawStatus Summary " << m_TRTStrawSummarySvc);
- ATH_MSG_ERROR ("configure as 'None' to avoid its loading.");
+ if (m_TRTStrawSummaryTool.retrieve().isFailure() ) {
+ ATH_MSG_ERROR ("Failed to retrieve StrawStatus Summary " << m_TRTStrawSummaryTool);
return StatusCode::FAILURE;
} else {
- if ( !m_TRTStrawSummarySvc.empty()) msg(MSG::INFO) << "Retrieved tool " << m_TRTStrawSummarySvc << endmsg;
+ msg(MSG::INFO) << "Retrieved tool " << m_TRTStrawSummaryTool << endmsg;
}
@@ -616,12 +613,12 @@ bool TRTCalibrator::calibrate() {
std::vector<float> rvalues ;
const float defaultpcal[] = {0,0,0,0} ;
if (isdines){
- const TRTCond::DinesRtRelation* rtr = dynamic_cast<const TRTCond::DinesRtRelation*>(m_trtcaldbSvc->getRtRelation(ident)) ;
+ const TRTCond::DinesRtRelation* rtr = dynamic_cast<const TRTCond::DinesRtRelation*>(m_trtcaldbTool->getRtRelation(ident)) ;
pcal = rtr ? rtr->cal() : defaultpcal ;
}
else {
- const TRTCond::BasicRtRelation* rtr = dynamic_cast<const TRTCond::BasicRtRelation*>(m_trtcaldbSvc->getRtRelation(ident)) ;
+ const TRTCond::BasicRtRelation* rtr = dynamic_cast<const TRTCond::BasicRtRelation*>(m_trtcaldbTool->getRtRelation(ident)) ;
pcal = rtr ? rtr->cal() : defaultpcal ;
}
hitdata.rtpar[0]=pcal[0];
@@ -646,7 +643,7 @@ bool TRTCalibrator::calibrate() {
hitdata.res=0;
hitdata.t=0;
hitdata.r=0;
- hitdata.t0=m_trtcaldbSvc->getT0(ident);
+ hitdata.t0=m_trtcaldbTool->getT0(ident);
hitdata.x=(strawelement->center(ident)).x();
hitdata.y=(strawelement->center(ident)).y();
hitdata.z=(strawelement->center(ident)).z();
@@ -654,8 +651,8 @@ bool TRTCalibrator::calibrate() {
//in the short straws corrections, autodetect if it was applied on the previous step
if ( m_DoShortStrawCorrection && hitdata.lay==0 && hitdata.stl<9){
//If correction was done in ctes in db (readed), undo the correction: This fixes problem on t0 averaging....
- double t0test1=m_trtcaldbSvc->getT0((Identifier)301998432);
- double t0test2=m_trtcaldbSvc->getT0((Identifier)302001504);
+ double t0test1=m_trtcaldbTool->getT0((Identifier)301998432);
+ double t0test2=m_trtcaldbTool->getT0((Identifier)302001504);
if (t0test1 != t0test2) hitdata.t0+=0.75; //short straw compensation
}
@@ -664,13 +661,10 @@ bool TRTCalibrator::calibrate() {
// Prepare for Xe-Ar mixed conditions:
int isArgonStraw = 0;
- if (!m_TRTStrawSummarySvc.empty()) {
- if (m_TRTStrawSummarySvc->getStatusHT(ident) != TRTCond::StrawStatus::Good) {
+ if (m_TRTStrawSummaryTool->getStatusHT(ident) != TRTCond::StrawStatus::Good) {
isArgonStraw = 1;
- }
}
-
//add histogram to the Calibrators (A and C side separated)
if(!m_DoArXenonSep){
@@ -888,7 +882,7 @@ bool TRTCalibrator::calibrate() {
//hitdata.t=t-t0+averageT0-20.0;
hitdata.t=t-t0;
hitdata.r=fabs(rtrack);
- hitdata.t0=m_trtcaldbSvc->getT0(ident);
+ hitdata.t0=m_trtcaldbTool->getT0(ident);
hitdata.rt0=reft0map[std::string(Form("_%i_%i_%i",hitdata.det,hitdata.brd,hitdata.chp))];
hitdata.x=(strawelement->center(ident)).x();
hitdata.y=(strawelement->center(ident)).y();
diff --git a/InnerDetector/InDetCalibTools/TRT_CalibTools/src/TRTCalibrator.h b/InnerDetector/InDetCalibTools/TRT_CalibTools/src/TRTCalibrator.h
index 18b7a3a161a51daa654395c927ea558e789dcd8d..4628bb2a65661d35e382f8c2ea31aed4a152f7bd 100755
--- a/InnerDetector/InDetCalibTools/TRT_CalibTools/src/TRTCalibrator.h
+++ b/InnerDetector/InDetCalibTools/TRT_CalibTools/src/TRTCalibrator.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRT_CALIBTOOLS__TRTCALIBRATOR_H
@@ -20,8 +20,8 @@ PURPOSE: Tool for calibrating the TRT
#include "TRT_CalibTools/ITRTCalibrator.h"
#include "TRT_ConditionsServices/ITRT_StrawNeighbourSvc.h"
-#include "TRT_ConditionsServices/ITRT_StrawStatusSummarySvc.h"
-#include "TRT_ConditionsServices/ITRT_CalDbSvc.h"
+#include "TRT_ConditionsServices/ITRT_StrawStatusSummaryTool.h"
+#include "TRT_ConditionsServices/ITRT_CalDbTool.h"
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ServiceHandle.h"
@@ -31,10 +31,8 @@ PURPOSE: Tool for calibrating the TRT
#include <map>
#include <set>
-class ITRT_StrawSummarySvc;
class AtlasDetectorID;
class TRT_ID;
-class ITRT_CalDbSvc ;
class TFile;
namespace InDetDD{
class TRT_DetectorManager;
@@ -115,9 +113,9 @@ private:
const AtlasDetectorID* m_DetID;
const TRT_ID* m_TRTID;
const InDetDD::TRT_DetectorManager* m_trtmanager;
- ServiceHandle<ITRT_CalDbSvc> m_trtcaldbSvc ;
+ ToolHandle<ITRT_CalDbTool> m_trtcaldbTool ;
ServiceHandle<ITRT_StrawNeighbourSvc> m_neighbourSvc ;
- ServiceHandle<ITRT_StrawStatusSummarySvc> m_TRTStrawSummarySvc; //!< The ConditionsSummaryTool
+ ToolHandle<ITRT_StrawStatusSummaryTool> m_TRTStrawSummaryTool; //!< The ConditionsSummaryTool
float m_maxDistance ;
float m_maxTimeResidual ;
int m_minTimebinsOverThreshold ;