diff --git a/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredInDetPreProcessingTRT.py b/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredInDetPreProcessingTRT.py
index bf91fd9e6f8a176b45fdfb32aaeab8da7153b19e..a4289a2f4d3d8fe32565fd55634ca37775f6e43a 100644
--- a/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredInDetPreProcessingTRT.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredInDetPreProcessingTRT.py
@@ -114,35 +114,45 @@ class ConfiguredInDetPreProcessingTRT:
MaxDriftTime = 60.0*ns
LowGate = 14.0625*ns # 4.5*3.125 ns
HighGate = 42.1875*ns # LowGate + 9*3.125 ns
+ LowGateArgon = LowGate
+ HighGateArgon = HighGate
+
if InDetFlags.doCosmics():
LowGate = 19.0*ns
HighGate = 44.0*ns
+ LowGateArgon = 19.0*ns
+ HighGateArgon = 44.0*ns
+
if globalflags.DataSource == 'data':
MinTrailingEdge = 11.0*ns
MaxDriftTime = 60.0*ns
- LowGate = 14.0625*ns # 4.5*3.125 ns
- HighGate = 42.1875*ns # LowGate + 9*3.125 ns
+ LowGate = 17.1875*ns
+ HighGate = 45.3125*ns
+ LowGateArgon = 18.75*ns
+ HighGateArgon = 43.75*ns
if InDetFlags.doCosmics():
LowGate = 19.0*ns
HighGate = 44.0*ns
+ LowGateArgon = 19.0*ns
+ HighGateArgon = 44.0*ns
InDetTRT_DriftCircleTool = InDet__TRT_DriftCircleTool(name = prefix+"DriftCircleTool",
TRTDriftFunctionTool = InDetTRT_DriftFunctionTool,
ConditionsSummaryTool = InDetTRTStrawStatusSummaryTool,
UseConditionsStatus = True,
UseConditionsHTStatus = True,
- SimpleOutOfTimePileupSupression = InDetFlags.doCosmics(),
+ SimpleOutOfTimePileupSupression = False,
RejectIfFirstBit = False, # fixes 50 nsec issue
MinTrailingEdge = MinTrailingEdge,
MaxDriftTime = MaxDriftTime,
- ValidityGateSuppression = not InDetFlags.doCosmics(),
+ ValidityGateSuppression = InDetFlags.InDet25nsec(),
LowGate = LowGate,
HighGate = HighGate,
- SimpleOutOfTimePileupSupressionArgon = InDetFlags.doCosmics(),
+ SimpleOutOfTimePileupSupressionArgon = False,
RejectIfFirstBitArgon = False, # fixes 50 nsec issue
MinTrailingEdgeArgon = MinTrailingEdge,
MaxDriftTimeArgon = MaxDriftTime,
- ValidityGateSuppressionArgon = not InDetFlags.doCosmics(),
+ ValidityGateSuppressionArgon = InDetFlags.InDet25nsec(),
LowGateArgon = LowGate,
HighGateArgon = HighGate,
useDriftTimeHTCorrection = True,
@@ -151,14 +161,6 @@ class ConfiguredInDetPreProcessingTRT:
from InDetRecExample import TrackingCommon
InDetTRT_DriftCircleTool.LumiDataKey = TrackingCommon.getLumiCondDataKeyForTRTMuScaling()
- from AthenaCommon.BeamFlags import jobproperties
- if InDetFlags.InDet25nsec() and jobproperties.Beam.beamType()=="collisions":
- InDetTRT_DriftCircleTool.ValidityGateSuppression=True
- InDetTRT_DriftCircleTool.SimpleOutOfTimePileupSupression=False
- if jobproperties.Beam.beamType()=="cosmics":
- InDetTRT_DriftCircleTool.SimpleOutOfTimePileupSupression=False
-
-
ToolSvc += InDetTRT_DriftCircleTool
if (InDetFlags.doPrintConfigurables()):
printfunc (InDetTRT_DriftCircleTool)
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigCommonTools.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigCommonTools.py
index fec9295de25df6771e132d5f3d0d7af894ff0fa3..d0d684c84850d5e656ec4c88a64e2551bdfdba3a 100644
--- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigCommonTools.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigCommonTools.py
@@ -83,14 +83,22 @@ from TRT_DriftCircleTool.TRT_DriftCircleToolConf import InDet__TRT_DriftCircleTo
import AthenaCommon.SystemOfUnits as Units
MinTrailingEdge = 11.0*Units.ns
MaxDriftTime = 60.0*Units.ns
-LowGate = 18.0*Units.ns
-HighGate = 38.0*Units.ns
+LowGate = 14.0625*Units.ns # 4.5*3.125 ns
+HighGate = 42.1875*Units.ns # LowGate + 9*3.125 ns
+LowGateArgon = LowGate
+HighGateArgon = HighGate
+
from AthenaCommon.GlobalFlags import globalflags
-if globalflags.DataSource != 'data':
- MinTrailingEdge = 16.0*Units.ns
- MaxDriftTime = 65.0*Units.ns
- LowGate = 23.0*Units.ns
- HighGate = 43.0*Units.ns
+from InDetTrigRecExample.InDetTrigFlags import InDetTrigFlags
+
+if globalflags.DataSource == 'data':
+ MinTrailingEdge = 11.0*Units.ns
+ MaxDriftTime = 60.0*Units.ns
+ LowGate = 17.1875*Units.ns
+ HighGate = 45.3125*Units.ns
+ LowGateArgon = 18.75*Units.ns
+ HighGateArgon = 43.75*Units.ns
+
InDetTrigTRT_DriftCircleTool = InDet__TRT_DriftCircleTool( name = "InDetTrigTRT_DriftCircleTool",
@@ -98,32 +106,24 @@ InDetTrigTRT_DriftCircleTool = InDet__TRT_DriftCircleTool( name = "InDetTrigTRT_
ConditionsSummaryTool = InDetTrigTRTStrawStatusSummaryTool,
UseConditionsStatus = True,
UseConditionsHTStatus = True,
- SimpleOutOfTimePileupSupression = True,
+ SimpleOutOfTimePileupSupression = False,
RejectIfFirstBit = False, # fixes 50 nsec issue
MinTrailingEdge = MinTrailingEdge,
MaxDriftTime = MaxDriftTime,
- ValidityGateSuppression = False,
+ ValidityGateSuppression = InDetTrigFlags.InDet25nsec(),
LowGate = LowGate,
HighGate = HighGate,
SimpleOutOfTimePileupSupressionArgon = False,# no OOT rejection for argon
RejectIfFirstBitArgon = False, # no OOT rejection for argon
- MinTrailingEdgeArgon = 0, # no OOT rejection for argon
- MaxDriftTimeArgon = 99*Units.ns,# no OOT rejection for argon
- ValidityGateSuppressionArgon = False,# no OOT rejection for argon
- LowGateArgon = 0,# no OOT rejection for argon
- HighGateArgon = 75*Units.ns,# no OOT rejection for argon
+ MinTrailingEdgeArgon = MinTrailingEdge,
+ MaxDriftTimeArgon = MaxDriftTime,
+ ValidityGateSuppressionArgon = InDetTrigFlags.InDet25nsec(),
+ LowGateArgon = LowGateArgon,
+ HighGateArgon = HighGateArgon,
useDriftTimeHTCorrection = True,
-
useDriftTimeToTCorrection = True, # reenable ToT
)
-from InDetTrigRecExample.InDetTrigFlags import InDetTrigFlags
-if InDetTrigFlags.InDet25nsec():
- InDetTrigTRT_DriftCircleTool.ValidityGateSuppression=True
- InDetTrigTRT_DriftCircleTool.SimpleOutOfTimePileupSupression=False
-#if jobproperties.Beam.beamType()=="cosmics":
-# InDetTRT_DriftCircleTool.SimpleOutOfTimePileupSupression=False
-
ToolSvc += InDetTrigTRT_DriftCircleTool
log.debug(InDetTrigTRT_DriftCircleTool)
diff --git a/Tools/PROCTools/data/master_q431_AOD_digest.ref b/Tools/PROCTools/data/master_q431_AOD_digest.ref
index 83524e312f5e124fb56c41ca175df124a9e61386..a32d623da9412ea1d858ef3d3a7ab8d7e6334e2a 100644
--- a/Tools/PROCTools/data/master_q431_AOD_digest.ref
+++ b/Tools/PROCTools/data/master_q431_AOD_digest.ref
@@ -1,23 +1,23 @@
run event nTopo nIdTracks nJets nMuons
330470 1183722158 1 0 0 0
330470 1183722342 394 415 18 0
- 330470 1183727953 532 569 11 4
- 330470 1183732647 467 452 12 1
- 330470 1183733040 381 285 6 1
+ 330470 1183727953 532 570 13 4
+ 330470 1183732647 467 453 12 1
+ 330470 1183733040 381 286 6 1
330470 1183734651 361 363 14 3
- 330470 1183735332 406 372 9 1
- 330470 1183736475 741 654 15 2
+ 330470 1183735332 406 372 10 1
+ 330470 1183736475 741 654 15 3
330470 1183738728 1 0 0 0
- 330470 1183738949 368 420 9 1
+ 330470 1183738949 368 421 9 1
330470 1183742489 152 125 2 1
330470 1183743040 285 305 5 0
- 330470 1183746343 492 465 14 0
+ 330470 1183746343 492 465 12 0
330470 1183746710 6 0 0 0
330470 1183751782 239 235 4 0
330470 1183752624 347 342 8 2
330470 1183753006 357 377 11 3
330470 1183754806 470 406 15 0
- 330470 1183769295 342 317 8 1
+ 330470 1183769295 342 318 8 1
330470 1183769939 348 340 11 3
330470 1183773832 307 198 7 0
330470 1183775209 57 0 0 0