diff --git a/DataQuality/DataQualityConfigurations/CMakeLists.txt b/DataQuality/DataQualityConfigurations/CMakeLists.txt
index 2a673e40cd41459f98139f3b90708c5bcc07318d..ae0c85f1cc740f3d41f8e3e917b4f87a0a911bd6 100644
--- a/DataQuality/DataQualityConfigurations/CMakeLists.txt
+++ b/DataQuality/DataQualityConfigurations/CMakeLists.txt
@@ -4,7 +4,7 @@
 atlas_subdir( DataQualityConfigurations )
 
 # Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
 atlas_install_scripts( scripts/MergeConfigs.py scripts/UploadDQAMITag.py
    scripts/merge_all_han_configs.sh scripts/merge_some_han_configs.sh
    scripts/han-config-indent.sh scripts/han-config-check.sh
diff --git a/DataQuality/DataQualityConfigurations/python/DQCDispatch.py b/DataQuality/DataQualityConfigurations/python/DQCDispatch.py
index 026ecec90fc58e5873ded071aca7cb854acaa103..59c9d53b087e0dc166e6507eb3454b90b59d6ab4 100644
--- a/DataQuality/DataQualityConfigurations/python/DQCDispatch.py
+++ b/DataQuality/DataQualityConfigurations/python/DQCDispatch.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # This holds the method that returns an appropriate DataQualityConfiguration
 # module for the specified input string
@@ -53,11 +53,11 @@ def getmodule(modname):
 
     import re
     # Does it look like datann_hip?
-    m = re.match('data\d{2}_hip', modname)
+    m = re.match(r'data\d{2}_hip', modname)
     if m:
         from . import base_data_hi; return base_data_hi
     # Does it look like datann?
-    m = re.match('data\d{2}$', modname)
+    m = re.match(r'data\d{2}$', modname)
     if m:
         from . import base_data; return base_data
 
diff --git a/DataQuality/DataQualityConfigurations/python/__init__.py b/DataQuality/DataQualityConfigurations/python/__init__.py
index 75416ffbf4c28a040489339291d160e30fbf1de7..5ff522e53eaa849163b63d0f9c89889089664f62 100644
--- a/DataQuality/DataQualityConfigurations/python/__init__.py
+++ b/DataQuality/DataQualityConfigurations/python/__init__.py
@@ -1,8 +1,5 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Hook for the DataQualityConfigurations package
-__all__ = ['data09', 'data09_1beam','data09_calocomm', 'data09_calophys',
-           'data09_cos', 'data09_idcomm', 'data09_larcomm', 'data09_muoncomm',
-           'data09_tilecomm', 'data08', 'data08_1beam', 'data08_1beammag',
-           'data08_cos', 'data08_cosmag', 'data08_idcomm', 'TestDisplay']
-from .DQCDispatch import getmodule
+__all__ = ['TestDisplay']
+from .DQCDispatch import getmodule  # noqa: F401
diff --git a/DataQuality/DataQualityConfigurations/python/_resolve_data_path.py b/DataQuality/DataQualityConfigurations/python/_resolve_data_path.py
index 0366d000d292be5b07d00fe9a3ae6f8530fe7241..4bbe6fe97f86a89e712a3b76f2633f113d682383 100644
--- a/DataQuality/DataQualityConfigurations/python/_resolve_data_path.py
+++ b/DataQuality/DataQualityConfigurations/python/_resolve_data_path.py
@@ -1,3 +1,4 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 import os
 import logging
 logging.basicConfig()
diff --git a/DataQuality/DataQualityConfigurations/python/data08.py b/DataQuality/DataQualityConfigurations/python/data08.py
deleted file mode 100644
index c4ec0c6fafeb41570dfda47ab60ed1a39d143659..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data08.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-
-from DataQualityUtils.DQWebDisplayConfig import DQWebDisplayConfig
-
-dqconfig = DQWebDisplayConfig()
-dqconfig.config         = "data08"
-dqconfig.hcfg           = "/afs/cern.ch/user/a/atlasdqm/dqmdisk/tier0/han_config/Collisions/collisions_run.1.63.hcfg"
-dqconfig.hcfg_min10     = "/afs/cern.ch/user/a/atlasdqm/dqmdisk/tier0/han_config/Collisions/collisions_minutes10.1.18.hcfg"
-dqconfig.hcfg_min30     = "/afs/cern.ch/user/a/atlasdqm/dqmdisk/tier0/han_config/Collisions/collisions_minutes30.1.6.hcfg"
-dqconfig.server         = "voatlas12.cern.ch"
-dqconfig.histogramCache = "/afs/cern.ch/user/a/atlasdqm/w1/histogram_web_display_cache"
-dqconfig.hanResultsDir  = "/dqmdisk0/han_results/tier0/all"
-dqconfig.htmlDir        = "/dqmdisk0/www/tier0/data08"
-dqconfig.htmlWeb        = "http://atlasdqm.cern.ch/tier0/data08"
-dqconfig.runlist        = "runlist_data08.xml"
-dqconfig.indexFile      = "results_data08.html"
-dqconfig.lockFile       = "DQWebDisplay_data08.lock"
-#dqconfig.dbConnection       = "oracle://ATLAS_COOLWRITE;schema=ATLAS_COOLOFL_GLOBAL;dbname=COMP200;"
-#dqconfig.dqmfOfl            = "/GLOBAL/DETSTATUS/DQMFOFL"
-#dqconfig.dbConnectionHisto  = "oracle://ATLAS_COOLWRITE;schema=ATLAS_COOLOFL_GLOBAL;dbname=COMP200;"
-#dqconfig.dqmfOflHisto       = "/GLOBAL/DETSTATUS/DQMFOFLH"
-#dqconfig.dbTagName          = "HEAD"
-
-#authentication file at Tier0 (uncomment this option at Tier0 only)
-#dqconfig.auth       = "/afs/cern.ch/atlas/project/tzero/var"
diff --git a/DataQuality/DataQualityConfigurations/python/data08_1beam.py b/DataQuality/DataQualityConfigurations/python/data08_1beam.py
deleted file mode 100644
index 0fc683042d2598a4467df2c00ec27e134e3fa858..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data08_1beam.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data09_cos import *
diff --git a/DataQuality/DataQualityConfigurations/python/data08_1beammag.py b/DataQuality/DataQualityConfigurations/python/data08_1beammag.py
deleted file mode 100644
index 0fc683042d2598a4467df2c00ec27e134e3fa858..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data08_1beammag.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data09_cos import *
diff --git a/DataQuality/DataQualityConfigurations/python/data08_coll900.py b/DataQuality/DataQualityConfigurations/python/data08_coll900.py
deleted file mode 100644
index 639112681909becce6b4b99168fe6d8884702ed8..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data08_coll900.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-
-from DataQualityUtils.DQWebDisplayConfig import DQWebDisplayConfig
-
-dqconfig = DQWebDisplayConfig()
-dqconfig.config         = "data08_coll900"
-dqconfig.hcfg           = "/afs/cern.ch/user/a/atlasdqm/dqmdisk/tier0/han_config/Collisions/collisions_run.1.36.hcfg"
-dqconfig.hcfg_min10     = "/afs/cern.ch/user/a/atlasdqm/dqmdisk/tier0/han_config/Collisions/collisions_minutes10.1.9.hcfg"
-dqconfig.hcfg_min30     = "/afs/cern.ch/user/a/atlasdqm/dqmdisk/tier0/han_config/Collisions/collisions_minutes30.1.5.hcfg"
-dqconfig.server         = "voatlas12.cern.ch"
-dqconfig.histogramCache = "/afs/cern.ch/user/a/atlasdqm/w1/histogram_web_display_cache"
-dqconfig.hanResultsDir  = "/dqmdisk0/han_results/tier0/NotUsed"
-dqconfig.htmlDir        = "/dqmdisk0/www/tier0/data08_coll900"
-dqconfig.htmlWeb        = "http://atlasdqm.cern.ch/tier0/data08_coll900"
-dqconfig.runlist        = "runlist_data08_coll900.xml"
-dqconfig.indexFile      = "results_data08_coll900.html"
-dqconfig.lockFile       = "DQWebDisplay_data08_coll900.lock"
-#dqconfig.dbConnection       = "oracle://ATLAS_COOLWRITE;schema=ATLAS_COOLOFL_GLOBAL;dbname=COMP200;"
-#dqconfig.dqmfOfl            = "/GLOBAL/DETSTATUS/DQMFOFL"
-#dqconfig.dbConnectionHisto  = "oracle://ATLAS_COOLWRITE;schema=ATLAS_COOLOFL_GLOBAL;dbname=COMP200;"
-#dqconfig.dqmfOflHisto       = "/GLOBAL/DETSTATUS/DQMFOFLH"
-#dqconfig.dbTagName          = "HEAD"
-
-#authentication file at Tier0 (uncomment this option at Tier0 only)
-#dqconfig.auth       = "/afs/cern.ch/atlas/project/tzero/var"
diff --git a/DataQuality/DataQualityConfigurations/python/data08_cos.py b/DataQuality/DataQualityConfigurations/python/data08_cos.py
deleted file mode 100644
index 0fc683042d2598a4467df2c00ec27e134e3fa858..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data08_cos.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data09_cos import *
diff --git a/DataQuality/DataQualityConfigurations/python/data08_cosmag.py b/DataQuality/DataQualityConfigurations/python/data08_cosmag.py
deleted file mode 100644
index 0fc683042d2598a4467df2c00ec27e134e3fa858..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data08_cosmag.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data09_cos import *
diff --git a/DataQuality/DataQualityConfigurations/python/data08_idcomm.py b/DataQuality/DataQualityConfigurations/python/data08_idcomm.py
deleted file mode 100644
index 0fc683042d2598a4467df2c00ec27e134e3fa858..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data08_idcomm.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data09_cos import *
diff --git a/DataQuality/DataQualityConfigurations/python/data09.py b/DataQuality/DataQualityConfigurations/python/data09.py
deleted file mode 100644
index 20c43c63c877bdf3a9a91d7e6e5c94eb5ff7e1d3..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data09.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# -*- coding: utf-8 -*-
-from base_data import *
diff --git a/DataQuality/DataQualityConfigurations/python/data09_1beam.py b/DataQuality/DataQualityConfigurations/python/data09_1beam.py
deleted file mode 100644
index 3b261a0b9f34956d1a3b4aa6ba9f6d85e43c1809..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data09_1beam.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# -*- coding: utf-8 -*-
-from base_data_1beam import *
diff --git a/DataQuality/DataQualityConfigurations/python/data09_2TeV.py b/DataQuality/DataQualityConfigurations/python/data09_2TeV.py
index 1a86084fd40a65715d7157b63341452e1936f177..bae1a7a3b516e7e6c9baf62797ed494e0052e7ee 100644
--- a/DataQuality/DataQualityConfigurations/python/data09_2TeV.py
+++ b/DataQuality/DataQualityConfigurations/python/data09_2TeV.py
@@ -1,3 +1,3 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
-from data09 import *
+from base_data import *  # noqa: F401 F403
diff --git a/DataQuality/DataQualityConfigurations/python/data09_900GeV.py b/DataQuality/DataQualityConfigurations/python/data09_900GeV.py
deleted file mode 100644
index 1a86084fd40a65715d7157b63341452e1936f177..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data09_900GeV.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data09 import *
diff --git a/DataQuality/DataQualityConfigurations/python/data09_calocomm.py b/DataQuality/DataQualityConfigurations/python/data09_calocomm.py
deleted file mode 100644
index 0fc683042d2598a4467df2c00ec27e134e3fa858..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data09_calocomm.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data09_cos import *
diff --git a/DataQuality/DataQualityConfigurations/python/data09_calophys.py b/DataQuality/DataQualityConfigurations/python/data09_calophys.py
index 0fc683042d2598a4467df2c00ec27e134e3fa858..c892f2a397532d0e29bb778266495e387b54ca8d 100644
--- a/DataQuality/DataQualityConfigurations/python/data09_calophys.py
+++ b/DataQuality/DataQualityConfigurations/python/data09_calophys.py
@@ -1,3 +1,3 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
-from data09_cos import *
+from base_data_cos import *  # noqa: F401 F403
diff --git a/DataQuality/DataQualityConfigurations/python/data09_cos.py b/DataQuality/DataQualityConfigurations/python/data09_cos.py
deleted file mode 100644
index cd491ff01826dc92bb6bb6365baff02471a4c25b..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data09_cos.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# -*- coding: utf-8 -*-
-from base_data_cos import *
diff --git a/DataQuality/DataQualityConfigurations/python/data09_idcomm.py b/DataQuality/DataQualityConfigurations/python/data09_idcomm.py
deleted file mode 100644
index 0fc683042d2598a4467df2c00ec27e134e3fa858..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data09_idcomm.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data09_cos import *
diff --git a/DataQuality/DataQualityConfigurations/python/data09_larcomm.py b/DataQuality/DataQualityConfigurations/python/data09_larcomm.py
deleted file mode 100644
index 0fc683042d2598a4467df2c00ec27e134e3fa858..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data09_larcomm.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data09_cos import *
diff --git a/DataQuality/DataQualityConfigurations/python/data09_muoncomm.py b/DataQuality/DataQualityConfigurations/python/data09_muoncomm.py
deleted file mode 100644
index 0fc683042d2598a4467df2c00ec27e134e3fa858..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data09_muoncomm.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data09_cos import *
diff --git a/DataQuality/DataQualityConfigurations/python/data09_tilecomm.py b/DataQuality/DataQualityConfigurations/python/data09_tilecomm.py
deleted file mode 100644
index 0fc683042d2598a4467df2c00ec27e134e3fa858..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data09_tilecomm.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data09_cos import *
diff --git a/DataQuality/DataQualityConfigurations/python/data10.py b/DataQuality/DataQualityConfigurations/python/data10.py
deleted file mode 100644
index 356567aecb2d3749c85c6453874ae4d72beedf88..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data10.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from base_data import *
diff --git a/DataQuality/DataQualityConfigurations/python/data10_10TeV.py b/DataQuality/DataQualityConfigurations/python/data10_10TeV.py
deleted file mode 100644
index 75f4ab196ff44aa7031f9c8beafa944add1e9486..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data10_10TeV.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data10 import *
diff --git a/DataQuality/DataQualityConfigurations/python/data10_1beam.py b/DataQuality/DataQualityConfigurations/python/data10_1beam.py
deleted file mode 100644
index 3b261a0b9f34956d1a3b4aa6ba9f6d85e43c1809..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data10_1beam.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# -*- coding: utf-8 -*-
-from base_data_1beam import *
diff --git a/DataQuality/DataQualityConfigurations/python/data10_2TeV.py b/DataQuality/DataQualityConfigurations/python/data10_2TeV.py
deleted file mode 100644
index 75f4ab196ff44aa7031f9c8beafa944add1e9486..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data10_2TeV.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data10 import *
diff --git a/DataQuality/DataQualityConfigurations/python/data10_7TeV.py b/DataQuality/DataQualityConfigurations/python/data10_7TeV.py
deleted file mode 100644
index 75f4ab196ff44aa7031f9c8beafa944add1e9486..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data10_7TeV.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data10 import *
diff --git a/DataQuality/DataQualityConfigurations/python/data10_900GeV.py b/DataQuality/DataQualityConfigurations/python/data10_900GeV.py
deleted file mode 100644
index 75f4ab196ff44aa7031f9c8beafa944add1e9486..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data10_900GeV.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data10 import *
diff --git a/DataQuality/DataQualityConfigurations/python/data10_calocomm.py b/DataQuality/DataQualityConfigurations/python/data10_calocomm.py
deleted file mode 100644
index 4f706cab764a5e1d1c1a240c182e3c42c9ef37ee..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data10_calocomm.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data10_cos import *
diff --git a/DataQuality/DataQualityConfigurations/python/data10_comm.py b/DataQuality/DataQualityConfigurations/python/data10_comm.py
deleted file mode 100644
index 75f4ab196ff44aa7031f9c8beafa944add1e9486..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data10_comm.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data10 import *
diff --git a/DataQuality/DataQualityConfigurations/python/data10_cos.py b/DataQuality/DataQualityConfigurations/python/data10_cos.py
deleted file mode 100644
index 46db26b2c0e9fb1bcced3972fd55ee825873d9c8..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data10_cos.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from base_data_cos import *
diff --git a/DataQuality/DataQualityConfigurations/python/data10_hi.py b/DataQuality/DataQualityConfigurations/python/data10_hi.py
deleted file mode 100644
index bf30d7abe058228901ae83e5f597429594c4aaf5..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data10_hi.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from base_data_hi import *
diff --git a/DataQuality/DataQualityConfigurations/python/data10_idcomm.py b/DataQuality/DataQualityConfigurations/python/data10_idcomm.py
deleted file mode 100644
index 4f706cab764a5e1d1c1a240c182e3c42c9ef37ee..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data10_idcomm.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data10_cos import *
diff --git a/DataQuality/DataQualityConfigurations/python/data10_larcomm.py b/DataQuality/DataQualityConfigurations/python/data10_larcomm.py
deleted file mode 100644
index 4f706cab764a5e1d1c1a240c182e3c42c9ef37ee..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data10_larcomm.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data10_cos import *
diff --git a/DataQuality/DataQualityConfigurations/python/data10_muoncomm.py b/DataQuality/DataQualityConfigurations/python/data10_muoncomm.py
deleted file mode 100644
index 4f706cab764a5e1d1c1a240c182e3c42c9ef37ee..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data10_muoncomm.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data10_cos import *
diff --git a/DataQuality/DataQualityConfigurations/python/data10_tilecomm.py b/DataQuality/DataQualityConfigurations/python/data10_tilecomm.py
deleted file mode 100644
index 4f706cab764a5e1d1c1a240c182e3c42c9ef37ee..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data10_tilecomm.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data10_cos import *
diff --git a/DataQuality/DataQualityConfigurations/python/data11.py b/DataQuality/DataQualityConfigurations/python/data11.py
deleted file mode 100644
index 356567aecb2d3749c85c6453874ae4d72beedf88..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data11.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from base_data import *
diff --git a/DataQuality/DataQualityConfigurations/python/data11_1beam.py b/DataQuality/DataQualityConfigurations/python/data11_1beam.py
deleted file mode 100644
index 3b261a0b9f34956d1a3b4aa6ba9f6d85e43c1809..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data11_1beam.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# -*- coding: utf-8 -*-
-from base_data_1beam import *
diff --git a/DataQuality/DataQualityConfigurations/python/data11_2p76TeV.py b/DataQuality/DataQualityConfigurations/python/data11_2p76TeV.py
deleted file mode 100644
index e9136bd0947092f5869d9edb06332430d71f4159..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data11_2p76TeV.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data11 import *
diff --git a/DataQuality/DataQualityConfigurations/python/data11_7TeV.py b/DataQuality/DataQualityConfigurations/python/data11_7TeV.py
deleted file mode 100644
index e9136bd0947092f5869d9edb06332430d71f4159..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data11_7TeV.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data11 import *
diff --git a/DataQuality/DataQualityConfigurations/python/data11_900GeV.py b/DataQuality/DataQualityConfigurations/python/data11_900GeV.py
deleted file mode 100644
index e9136bd0947092f5869d9edb06332430d71f4159..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data11_900GeV.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data11 import *
diff --git a/DataQuality/DataQualityConfigurations/python/data11_calib.py b/DataQuality/DataQualityConfigurations/python/data11_calib.py
deleted file mode 100644
index e9136bd0947092f5869d9edb06332430d71f4159..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data11_calib.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data11 import *
diff --git a/DataQuality/DataQualityConfigurations/python/data11_calocomm.py b/DataQuality/DataQualityConfigurations/python/data11_calocomm.py
deleted file mode 100644
index 0326946874391d91d4098055a668592305b4c167..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data11_calocomm.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data11_cos import *
diff --git a/DataQuality/DataQualityConfigurations/python/data11_comm.py b/DataQuality/DataQualityConfigurations/python/data11_comm.py
deleted file mode 100644
index e9136bd0947092f5869d9edb06332430d71f4159..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data11_comm.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data11 import *
diff --git a/DataQuality/DataQualityConfigurations/python/data11_cos.py b/DataQuality/DataQualityConfigurations/python/data11_cos.py
deleted file mode 100644
index 46db26b2c0e9fb1bcced3972fd55ee825873d9c8..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data11_cos.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from base_data_cos import *
diff --git a/DataQuality/DataQualityConfigurations/python/data11_hi.py b/DataQuality/DataQualityConfigurations/python/data11_hi.py
deleted file mode 100644
index bf30d7abe058228901ae83e5f597429594c4aaf5..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data11_hi.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from base_data_hi import *
diff --git a/DataQuality/DataQualityConfigurations/python/data11_hip.py b/DataQuality/DataQualityConfigurations/python/data11_hip.py
deleted file mode 100644
index bf30d7abe058228901ae83e5f597429594c4aaf5..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data11_hip.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from base_data_hi import *
diff --git a/DataQuality/DataQualityConfigurations/python/data11_idcomm.py b/DataQuality/DataQualityConfigurations/python/data11_idcomm.py
deleted file mode 100644
index 0326946874391d91d4098055a668592305b4c167..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data11_idcomm.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data11_cos import *
diff --git a/DataQuality/DataQualityConfigurations/python/data11_larcomm.py b/DataQuality/DataQualityConfigurations/python/data11_larcomm.py
deleted file mode 100644
index 0326946874391d91d4098055a668592305b4c167..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data11_larcomm.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data11_cos import *
diff --git a/DataQuality/DataQualityConfigurations/python/data11_muoncomm.py b/DataQuality/DataQualityConfigurations/python/data11_muoncomm.py
deleted file mode 100644
index 0326946874391d91d4098055a668592305b4c167..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data11_muoncomm.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data11_cos import *
diff --git a/DataQuality/DataQualityConfigurations/python/data11_tilecomm.py b/DataQuality/DataQualityConfigurations/python/data11_tilecomm.py
deleted file mode 100644
index 0326946874391d91d4098055a668592305b4c167..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data11_tilecomm.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data11_cos import *
diff --git a/DataQuality/DataQualityConfigurations/python/data12.py b/DataQuality/DataQualityConfigurations/python/data12.py
deleted file mode 100644
index 356567aecb2d3749c85c6453874ae4d72beedf88..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data12.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from base_data import *
diff --git a/DataQuality/DataQualityConfigurations/python/data12_1beam.py b/DataQuality/DataQualityConfigurations/python/data12_1beam.py
deleted file mode 100644
index d05935a89afb4fb215efe76e414ceca914b27e27..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data12_1beam.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from base_data_1beam import *
diff --git a/DataQuality/DataQualityConfigurations/python/data12_2p76TeV.py b/DataQuality/DataQualityConfigurations/python/data12_2p76TeV.py
deleted file mode 100644
index fdb594b2bafca0a477a8b0af79d4b7ac14d63fef..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data12_2p76TeV.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data12 import *
diff --git a/DataQuality/DataQualityConfigurations/python/data12_7TeV.py b/DataQuality/DataQualityConfigurations/python/data12_7TeV.py
deleted file mode 100644
index fdb594b2bafca0a477a8b0af79d4b7ac14d63fef..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data12_7TeV.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data12 import *
diff --git a/DataQuality/DataQualityConfigurations/python/data12_8TeV.py b/DataQuality/DataQualityConfigurations/python/data12_8TeV.py
deleted file mode 100644
index fdb594b2bafca0a477a8b0af79d4b7ac14d63fef..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data12_8TeV.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data12 import *
diff --git a/DataQuality/DataQualityConfigurations/python/data12_900GeV.py b/DataQuality/DataQualityConfigurations/python/data12_900GeV.py
deleted file mode 100644
index fdb594b2bafca0a477a8b0af79d4b7ac14d63fef..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data12_900GeV.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data12 import *
diff --git a/DataQuality/DataQualityConfigurations/python/data12_calib.py b/DataQuality/DataQualityConfigurations/python/data12_calib.py
deleted file mode 100644
index fdb594b2bafca0a477a8b0af79d4b7ac14d63fef..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data12_calib.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data12 import *
diff --git a/DataQuality/DataQualityConfigurations/python/data12_calocomm.py b/DataQuality/DataQualityConfigurations/python/data12_calocomm.py
deleted file mode 100644
index 90c6ed2e3db6c99f8cc453ba9395e6916a7e5a4a..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data12_calocomm.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data12_cos import *
diff --git a/DataQuality/DataQualityConfigurations/python/data12_comm.py b/DataQuality/DataQualityConfigurations/python/data12_comm.py
deleted file mode 100644
index fdb594b2bafca0a477a8b0af79d4b7ac14d63fef..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data12_comm.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data12 import *
diff --git a/DataQuality/DataQualityConfigurations/python/data12_cos.py b/DataQuality/DataQualityConfigurations/python/data12_cos.py
deleted file mode 100644
index 46db26b2c0e9fb1bcced3972fd55ee825873d9c8..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data12_cos.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from base_data_cos import *
diff --git a/DataQuality/DataQualityConfigurations/python/data12_hi.py b/DataQuality/DataQualityConfigurations/python/data12_hi.py
deleted file mode 100644
index bf30d7abe058228901ae83e5f597429594c4aaf5..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data12_hi.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from base_data_hi import *
diff --git a/DataQuality/DataQualityConfigurations/python/data12_hip.py b/DataQuality/DataQualityConfigurations/python/data12_hip.py
deleted file mode 100644
index bf30d7abe058228901ae83e5f597429594c4aaf5..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data12_hip.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from base_data_hi import *
diff --git a/DataQuality/DataQualityConfigurations/python/data12_idcomm.py b/DataQuality/DataQualityConfigurations/python/data12_idcomm.py
deleted file mode 100644
index 90c6ed2e3db6c99f8cc453ba9395e6916a7e5a4a..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data12_idcomm.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data12_cos import *
diff --git a/DataQuality/DataQualityConfigurations/python/data12_larcomm.py b/DataQuality/DataQualityConfigurations/python/data12_larcomm.py
deleted file mode 100644
index 90c6ed2e3db6c99f8cc453ba9395e6916a7e5a4a..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data12_larcomm.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data12_cos import *
diff --git a/DataQuality/DataQualityConfigurations/python/data12_muoncomm.py b/DataQuality/DataQualityConfigurations/python/data12_muoncomm.py
deleted file mode 100644
index 90c6ed2e3db6c99f8cc453ba9395e6916a7e5a4a..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data12_muoncomm.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data12_cos import *
diff --git a/DataQuality/DataQualityConfigurations/python/data12_tilecomm.py b/DataQuality/DataQualityConfigurations/python/data12_tilecomm.py
deleted file mode 100644
index 90c6ed2e3db6c99f8cc453ba9395e6916a7e5a4a..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data12_tilecomm.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data12_cos import *
diff --git a/DataQuality/DataQualityConfigurations/python/data13_hip.py b/DataQuality/DataQualityConfigurations/python/data13_hip.py
deleted file mode 100644
index bf30d7abe058228901ae83e5f597429594c4aaf5..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/python/data13_hip.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from base_data_hi import *