Cleanups and updates TestSCT_CablingCfg

Former-commit-id: af5d8ada

Generators/McEventSelector/CMakeLists.txt

@@ -25,4 +25,4 @@ atlas_add_component( McEventSelector
 
 # Install files from the package:
 atlas_install_headers( McEventSelector )
-
+atlas_install_python_modules( python/*.py )

Generators/McEventSelector/python/McEventSelectorConfig.py

+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+
+# https://twiki.cern.ch/twiki/bin/viewauth/AtlasComputing/AthenaJobConfigRun3
+
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+
+def McEventSelectorCfg(configFlags):
+    cfg=ComponentAccumulator()
+
+    from AthenaCommon import AtlasUnixStandardJob
+
+    from McEventSelector.McEventSelectorConf import McCnvSvc
+    mcCnvSvc = McCnvSvc()
+    cfg.addService(mcCnvSvc)
+    from GaudiSvc.GaudiSvcConf import EvtPersistencySvc
+    cfg.addService(EvtPersistencySvc("EventPersistencySvc",CnvServices=[mcCnvSvc.getFullJobOptName(),]))
+
+    from McEventSelector.McEventSelectorConf import McEventSelector
+    evSel=McEventSelector("EventSelector")
+    evSel.RunNumber = configFlags.Input.RunNumber
+    evSel.InitialTimeStamp = configFlags.Input.InitialTimeStamp
+    cfg.addService(evSel)
+    cfg.setAppProperty("EvtSel",evSel.getFullJobOptName())
+
+    return cfg

InnerDetector/InDetDetDescr/SCT_Cabling/CMakeLists.txt

@@ -36,6 +36,10 @@ atlas_add_component( SCT_Cabling
                      INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
                      LINK_LIBRARIES ${COOL_LIBRARIES} ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} AthenaBaseComps Identifier GaudiKernel StoreGateLib SGtests AthenaPoolUtilities CoraCool EventInfo InDetIdentifier PathResolver SCT_CablingLib )
 
+atlas_add_test( TestSCT_CablingCfg
+                SCRIPT share/TestSCT_CablingCfg.sh
+                ENVIRONMENT THREADS=2 )
+
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
 atlas_install_runtime( share/*.dat )

InnerDetector/InDetDetDescr/SCT_Cabling/python/SCT_CablingConfig.py

@@ -71,3 +71,30 @@ def getSCT_FillCablingFromCoraCool(name="SCT_FillCablingFromCoraCool", **kwargs)
     from SCT_Cabling.SCT_CablingConf import SCT_FillCablingFromCoraCool
     return CfgMgr.SCT_FillCablingFromCoraCool(name, **kwargs)
 
+
+# https://twiki.cern.ch/twiki/bin/viewauth/AtlasComputing/AthenaJobConfigRun3
+
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+
+def SCT_CablingFoldersCfg(configFlags):
+    cfg=ComponentAccumulator()
+    path="/SCT/DAQ/Config/"
+    if configFlags.IOVDb.DatabaseInstance == "COMP200":
+        path="/SCT/DAQ/Configuration/"
+    instance="SCT"
+    if configFlags.Input.isMC:
+        instance="SCT_OFL"
+    from IOVDbSvc.IOVDbSvcConfig import addFolders, IOVDbSvcCfg
+    cfg.merge(addFolders(configFlags, [path+"ROD", path+"RODMUR", path+"MUR", path+"Geog"], instance, className="CondAttrListVec")[0])
+    return cfg, path
+
+def SCT_CablingCondAlgCfg(configFlags):
+    cfg=ComponentAccumulator()
+    foldersCfg,path=SCT_CablingFoldersCfg(configFlags)
+    cfg.merge(foldersCfg)
+    from SCT_Cabling.SCT_CablingConf import SCT_CablingCondAlgFromCoraCool
+    cfg.addCondAlgo(SCT_CablingCondAlgFromCoraCool(ReadKeyRod=path+"ROD",
+                                                   ReadKeyRodMur=path+"RODMUR",
+                                                   ReadKeyMur=path+"MUR",
+                                                   ReadKeyGeo=path+"Geog"))
+    return cfg

InnerDetector/InDetDetDescr/SCT_Cabling/share/TestSCT_CablingCfg.py

 # Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
-from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
-
-
-def McEventSelectorCfg(configFlags):
-    cfg=ComponentAccumulator()
-
-    from AthenaCommon import AtlasUnixStandardJob
-
-    from McEventSelector.McEventSelectorConf import McCnvSvc
-    mcCnvSvc = McCnvSvc()
-    cfg.addService(mcCnvSvc)
-    from GaudiSvc.GaudiSvcConf import EvtPersistencySvc
-    cfg.addService(EvtPersistencySvc("EventPersistencySvc",CnvServices=[mcCnvSvc.getFullJobOptName(),]))
-
-    from McEventSelector.McEventSelectorConf import McEventSelector
-    evSel=McEventSelector("EventSelector")
-    evSel.RunNumber = configFlags.Input.RunNumber
-    evSel.InitialTimeStamp = configFlags.Input.InitialTimeStamp
-    cfg.addService(evSel)
-    cfg.setAppProperty("EvtSel",evSel.getFullJobOptName())
-
-    return cfg
-
-
-def SCT_CablingFoldersCfg(configFlags):
-    cfg=ComponentAccumulator()
-
-    path="/SCT/DAQ/Config/"
-    if configFlags.IOVDb.DatabaseInstance == "COMP200":
-        path="/SCT/DAQ/Configuration/"
+# https://twiki.cern.ch/twiki/bin/viewauth/AtlasComputing/AthenaJobConfigRun3
 
-    instance="SCT"
-    if ConfigFlags.Input.isMC:
-        instance="SCT_OFL"
-
-    from IOVDbSvc.IOVDbSvcConfig import addFolders, IOVDbSvcCfg
-    cfg.merge(addFolders(configFlags, [path+"ROD", path+"RODMUR", path+"MUR", path+"Geog"], instance, className="CondAttrListVec")[0])
-
-    return cfg, path
-
-
-def SCT_CablingCondAlgCfg(configFlags):
-    cfg=ComponentAccumulator()
-
-    foldersCfg,path=SCT_CablingFoldersCfg(configFlags)
-    cfg.merge(foldersCfg)
-
-    from SCT_Cabling.SCT_CablingConf import SCT_CablingCondAlgFromCoraCool
-    cfg.addCondAlgo(SCT_CablingCondAlgFromCoraCool(ReadKeyRod=path+"ROD",
-                                                   ReadKeyRodMur=path+"RODMUR",
-                                                   ReadKeyMur=path+"MUR",
-                                                   ReadKeyGeo=path+"Geog"))
-
-    return cfg
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 
 
 def SCT_TestCablingAlgCfg(configFlags):
     cfg=ComponentAccumulator()
 
+    from SCT_Cabling.SCT_CablingConfig import SCT_CablingCondAlgCfg
     cfg.merge(SCT_CablingCondAlgCfg(configFlags))
 
     from AtlasGeoModel.GeoModelConfig import GeoModelCfg
@@ -97,7 +47,10 @@ if __name__=="__main__":
     ConfigFlags.lock()
 
     cfg=ComponentAccumulator()
+
+    from McEventSelector.McEventSelectorConfig import McEventSelectorCfg
     cfg.merge(McEventSelectorCfg(ConfigFlags))
+
     cfg.merge(SCT_TestCablingAlgCfg(ConfigFlags))
 
     f=open("TestSCT_CablingCfg.pkl","w")

InnerDetector/InDetDetDescr/SCT_Cabling/share/TestSCT_CablingCfg.sh

 #!/bin/sh
 
-rm -rf newJOtest.py bootstrap.pkl bootstrap.py
+rm -rf TestSCT_CablingCfg.py bootstrap.pkl bootstrap.py
 
 # this is a hack to pre-confgure scheduler and other MT services, 
 #will be taken away once NEW system has better means to influence the bootstrap content
@@ -10,7 +10,7 @@ svcMgr.AvalancheSchedulerSvc.ShowControlFlow=True
 svcMgr.AvalancheSchedulerSvc.ShowDataDependencies=True
 EOF
 
-athena --threads=1 --config-only=bootstrap.pkl bootstrap.py
+athena --threads=2 --config-only=bootstrap.pkl bootstrap.py
 
 get_files -jo SCT_Cabling/TestSCT_CablingCfg.py