diff --git a/Trigger/TrigAnalysis/TrigBunchCrossingTool/Root/BunchCrossingToolBase.cxx b/Trigger/TrigAnalysis/TrigBunchCrossingTool/Root/BunchCrossingToolBase.cxx index f98f25c5e6c53607d04809fb48180222885bb507..f512daa6c9a7c99d162432cb7814113a23c837cc 100644 --- a/Trigger/TrigAnalysis/TrigBunchCrossingTool/Root/BunchCrossingToolBase.cxx +++ b/Trigger/TrigAnalysis/TrigBunchCrossingTool/Root/BunchCrossingToolBase.cxx @@ -26,7 +26,7 @@ namespace Trig { m_bunchTrains() { /// Declare the properties of the tool: - declareProperty( "MaxBunchSpacing", m_maxBunchSpacing = 150 ); + declareProperty( "MaxBunchSpacing", m_maxBunchSpacing = 75 ); declareProperty( "FrontLength", m_frontLength = 300 ); declareProperty( "TailLength", m_tailLength = 300 ); } diff --git a/Trigger/TrigAnalysis/TrigBunchCrossingTool/python/BunchCrossingTool.py b/Trigger/TrigAnalysis/TrigBunchCrossingTool/python/BunchCrossingTool.py index abcf3ceaee0800076c1a4767ea2fc65f3316b57d..f407688fd0f27142b3be7b6c184b8542d145bc72 100644 --- a/Trigger/TrigAnalysis/TrigBunchCrossingTool/python/BunchCrossingTool.py +++ b/Trigger/TrigAnalysis/TrigBunchCrossingTool/python/BunchCrossingTool.py @@ -120,7 +120,7 @@ def TrigConfBunchCrossingTool(): __tool = Trig__TrigConfBunchCrossingTool( __defaultToolName ) # Create a default configuration for it: - __tool.MaxBunchSpacing = 150 + __tool.MaxBunchSpacing = 75 __tool.FrontLength = 300 __tool.TailLength = 300 # __tool.FilledBunchNames = [ "Paired", "Filled" ] @@ -187,7 +187,7 @@ def MCBunchCrossingTool(): __tool = Trig__MCBunchCrossingTool( __defaultToolName ) # Create a default configuration for it: - __tool.MaxBunchSpacing = 150 + __tool.MaxBunchSpacing = 75 __tool.FrontLength = 300 __tool.TailLength = 300 __tool.MinBunchIntensity = 0.1 @@ -252,7 +252,7 @@ def LHCBunchCrossingTool(): __tool = Trig__LHCBunchCrossingTool( __defaultToolName ) # Create a default configuration for it: - __tool.MaxBunchSpacing = 150 + __tool.MaxBunchSpacing = 75 __tool.FrontLength = 300 __tool.TailLength = 300 __tool.IntensityChannel = 1 @@ -309,7 +309,7 @@ def WebBunchCrossingTool(): __tool = Trig__WebBunchCrossingTool( __defaultToolName ) # Create a default configuration for it: - __tool.MaxBunchSpacing = 150 + __tool.MaxBunchSpacing = 75 __tool.FrontLength = 300 __tool.TailLength = 300 __logger.info( "Set the default values for the WebBunchCrossingTool configuration" ) @@ -350,7 +350,7 @@ def StaticBunchCrossingTool(): __tool = Trig__StaticBunchCrossingTool( __defaultToolName ) # Create a default configuration for it: - __tool.MaxBunchSpacing = 150 + __tool.MaxBunchSpacing = 75 __tool.FrontLength = 300 __tool.TailLength = 300 @@ -388,7 +388,7 @@ def D3PDBunchCrossingTool(): __tool = Trig__D3PDBunchCrossingTool( __defaultToolName ) # Create a default configuration for it: - __tool.MaxBunchSpacing = 150 + __tool.MaxBunchSpacing = 75 __tool.FrontLength = 300 __tool.TailLength = 300 diff --git a/Trigger/TrigAnalysis/TrigBunchCrossingTool/test/ut_static_bunch_tool_test.cxx b/Trigger/TrigAnalysis/TrigBunchCrossingTool/test/ut_static_bunch_tool_test.cxx index 0e96031f8ce4373a1a0c3a3baff75d103d903223..97ca65670599f20400372ac5be4eb20f4beb6116 100644 --- a/Trigger/TrigAnalysis/TrigBunchCrossingTool/test/ut_static_bunch_tool_test.cxx +++ b/Trigger/TrigAnalysis/TrigBunchCrossingTool/test/ut_static_bunch_tool_test.cxx @@ -35,6 +35,7 @@ int main() { // Create the tool to be tested: Trig::StaticBunchCrossingTool tool; SIMPLE_CHECK( tool.setProperty( "OutputLevel", MSG::DEBUG ) ); + SIMPLE_CHECK( tool.setProperty( "MaxBunchSpacing", 150 ) ); // Try to load some configurations: SIMPLE_CHECK( tool.loadConfig( 1 ) ); diff --git a/Trigger/TrigAnalysis/TrigBunchCrossingTool/test/ut_web_bunch_tool_test.cxx b/Trigger/TrigAnalysis/TrigBunchCrossingTool/test/ut_web_bunch_tool_test.cxx index b7b85b93c2259eeaab89470ecaa9d6cb8460309d..d4ec6c001c6411e209cde3e9aa562793c1b00cf9 100644 --- a/Trigger/TrigAnalysis/TrigBunchCrossingTool/test/ut_web_bunch_tool_test.cxx +++ b/Trigger/TrigAnalysis/TrigBunchCrossingTool/test/ut_web_bunch_tool_test.cxx @@ -43,6 +43,7 @@ int main() { SIMPLE_CHECK( tool.setProperty( "OutputLevel", MSG::DEBUG ) ); SIMPLE_CHECK( tool.setProperty( "ServerAddress", "atlas-trigconf.cern.ch" ) ); + SIMPLE_CHECK( tool.setProperty( "MaxBunchSpacing", 150 ) ); // Try to load some configurations by key: SIMPLE_CHECK( tool.loadConfig( 104 ) );