Skip to content
Snippets Groups Projects
Commit a0dd3d64 authored by Daniel Louis Noel's avatar Daniel Louis Noel
Browse files

Edited G4AtlasFieldServices so it passes the simulation unit test

parent 880b2468
9 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!45405updated ART test cron job,!42417Draft: DIRE and VINCIA Base Fragments for Pythia 8.3,!28528Revert 63f845ae,!27054Atr20369 210,!26342Monopole: Handle fractionally charged particles,!24014Updated the DetGeoSvc to the new style
......@@ -4,7 +4,10 @@ from G4AtlasServices.G4AtlasServicesConf import StandardFieldSvc
from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg
from ForwardRegionMgField.ForwardRegionMgFieldConfigNew import Q1FieldSvcCfg, Q2FieldSvcCfg, Q3FieldSvcCfg, D1FieldSvcCfg, D2FieldSvcCfg, Q4FieldSvcCfg, Q5FieldSvcCfg, Q6FieldSvcCfg, Q7FieldSvcCfg, Q1hkickFieldSvcCfg, Q1vkickFieldSvcCfg, Q2hkickFieldSvcCfg, Q2vkickFieldSvcCfg, Q3hkickFieldSvcCfg, Q3vkickFieldSvcCfg, Q4vkickAFieldSvcCfg, Q4hkickFieldSvcCfg, Q4vkickBFieldSvcCfg, Q5hkickFieldSvcCfg, Q6vkickFieldSvcCfg
import os
#to prevent unit tests failing when just running over simulation
if not "AthSimulation_DIR" in os.environ:
from ForwardRegionMgField.ForwardRegionMgFieldConfigNew import Q1FieldSvcCfg, Q2FieldSvcCfg, Q3FieldSvcCfg, D1FieldSvcCfg, D2FieldSvcCfg, Q4FieldSvcCfg, Q5FieldSvcCfg, Q6FieldSvcCfg, Q7FieldSvcCfg, Q1hkickFieldSvcCfg, Q1vkickFieldSvcCfg, Q2hkickFieldSvcCfg, Q2vkickFieldSvcCfg, Q3hkickFieldSvcCfg, Q3vkickFieldSvcCfg, Q4vkickAFieldSvcCfg, Q4hkickFieldSvcCfg, Q4vkickBFieldSvcCfg, Q5hkickFieldSvcCfg, Q6vkickFieldSvcCfg
def StandardFieldSvcCfg(ConfigFlags,name="StandardField", **kwargs):
result = ComponentAccumulator()
......
......@@ -36,7 +36,11 @@ if __name__ == '__main__':
#add the algorithm
acc1 = StandardFieldSvcCfg(ConfigFlags)
acc2 = ForwardFieldSvcCfg(ConfigFlags)
acc3 = Q1FwdG4FieldSvcCfg(ConfigFlags)
#don't run for simulation only tests (todo - make new general test)
import os
if not "AthSimulation_DIR" in os.environ:
acc3 = Q1FwdG4FieldSvcCfg(ConfigFlags)
cfg.merge(acc1)
cfg.merge(acc2)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment