diff --git a/Control/AthenaConfiguration/python/ComponentAccumulatorTest.py b/Control/AthenaConfiguration/python/ComponentAccumulatorTest.py
index b5afb081253ac56e48c437370baa986f8c1d8094..830ba6e9fe0fca4238a653e3e0e34ceb40a2c2ef 100644
--- a/Control/AthenaConfiguration/python/ComponentAccumulatorTest.py
+++ b/Control/AthenaConfiguration/python/ComponentAccumulatorTest.py
@@ -484,7 +484,7 @@ class TestSequencesMerging( unittest.TestCase ):
ca2 = OutputStreamCfg(ConfigFlags, "RDO", ItemList = [
"SCT_RDO_Container#SCT_RDOs",
"InDetSimDataCollection#SCT_SDO_Map"
- ])
+ ])
ca2.printConfig()
print("after merge")
diff --git a/DataQuality/GoodRunsLists/python/OfficialGRLs.py b/DataQuality/GoodRunsLists/python/OfficialGRLs.py
index 6278b1acc576a7a6ffd5e70dec6354a1e0b6b16c..ac55a4c9ee3f9123f69e2070bc239377ea6ac162 100644
--- a/DataQuality/GoodRunsLists/python/OfficialGRLs.py
+++ b/DataQuality/GoodRunsLists/python/OfficialGRLs.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
## Official collection of GRL maintained and produced by DQ group.
## Last update: 2009-10-21, by Max Baak
@@ -8,19 +8,18 @@
class OfficialGRLs:
def __init__(self):
- self.collection = [
- 'GoodRunsLists.jetetmiss_windet_900GeV',
- 'GoodRunsLists.jetetmiss_woindet_900GeV',
- 'GoodRunsLists.jetetmiss_woindet_2TeV',
- 'GoodRunsLists.jetetmiss_jetmetok_woindet_2TeV',
- 'GoodRunsLists.jetetmiss_jetmetok_woindet_900GeV',
- 'GoodRunsLists.jetetmiss_jetmetok_windet_900GeV',
- 'GoodRunsLists.minbias_2TeV',
- 'GoodRunsLists.minbias_900GeV',
- 'GoodRunsLists.minbias_solon_900GeV',
- 'GoodRunsLists.minbias_solon_windet_900GeV',
- 'GoodRunsLists.minbias_solon_2TeV',
- 'GoodRunsLists.minbias_stable_900GeV',
- 'GoodRunsLists.minbias_windet_900GeV',
- ]
-
+ self.collection = [
+ 'GoodRunsLists.jetetmiss_windet_900GeV',
+ 'GoodRunsLists.jetetmiss_woindet_900GeV',
+ 'GoodRunsLists.jetetmiss_woindet_2TeV',
+ 'GoodRunsLists.jetetmiss_jetmetok_woindet_2TeV',
+ 'GoodRunsLists.jetetmiss_jetmetok_woindet_900GeV',
+ 'GoodRunsLists.jetetmiss_jetmetok_windet_900GeV',
+ 'GoodRunsLists.minbias_2TeV',
+ 'GoodRunsLists.minbias_900GeV',
+ 'GoodRunsLists.minbias_solon_900GeV',
+ 'GoodRunsLists.minbias_solon_windet_900GeV',
+ 'GoodRunsLists.minbias_solon_2TeV',
+ 'GoodRunsLists.minbias_stable_900GeV',
+ 'GoodRunsLists.minbias_windet_900GeV',
+ ]
diff --git a/DataQuality/GoodRunsLists/python/WZcommon.py b/DataQuality/GoodRunsLists/python/WZcommon.py
index afca1c56444f8108b9db0abfe124ebd1e9e93930..73df674a2769be17cbdc368b5713d68efb7f009a 100644
--- a/DataQuality/GoodRunsLists/python/WZcommon.py
+++ b/DataQuality/GoodRunsLists/python/WZcommon.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
from GoodRunsLists.GoodRunsListConfig import GoodRunsListConfig
@@ -23,19 +23,19 @@ class WZcommon(GoodRunsListConfig):
self.querydict['ptag'] = ["data10_7TeV"]
## See http://atlas-runquery.cern.ch for more user examples.
- dqflagsquery = [ 'ATLGL LBSUMM#DetStatus-v03-repro04-01 g',
- 'L1CTP LBSUMM#DetStatus-v03-repro04-01 g',
- 'ATLSOL LBSUMM#DetStatus-v03-repro04-01 g',
- 'ATLTOR LBSUMM#DetStatus-v03-repro04-01 g',
- 'L1CAL LBSUMM#DetStatus-v03-repro04-01 g',
- 'L1MUE LBSUMM#DetStatus-v03-repro04-01 g',
- 'L1MUB LBSUMM#DetStatus-v03-repro04-01 g',
- 'cp_eg_electron_endcap LBSUMM#DetStatus-v03-repro04-01 g',
- 'cp_eg_electron_barrel LBSUMM#DetStatus-v03-repro04-01 g',
- 'cp_mu_mmuidcb LBSUMM#DetStatus-v03-repro04-01 g',
- 'cp_mu_mstaco LBSUMM#DetStatus-v03-repro04-01 g',
- 'cp_met LBSUMM#DetStatus-v03-repro04-01 g',
- ]
+ dqflagsquery = [ 'ATLGL LBSUMM#DetStatus-v03-repro04-01 g',
+ 'L1CTP LBSUMM#DetStatus-v03-repro04-01 g',
+ 'ATLSOL LBSUMM#DetStatus-v03-repro04-01 g',
+ 'ATLTOR LBSUMM#DetStatus-v03-repro04-01 g',
+ 'L1CAL LBSUMM#DetStatus-v03-repro04-01 g',
+ 'L1MUE LBSUMM#DetStatus-v03-repro04-01 g',
+ 'L1MUB LBSUMM#DetStatus-v03-repro04-01 g',
+ 'cp_eg_electron_endcap LBSUMM#DetStatus-v03-repro04-01 g',
+ 'cp_eg_electron_barrel LBSUMM#DetStatus-v03-repro04-01 g',
+ 'cp_mu_mmuidcb LBSUMM#DetStatus-v03-repro04-01 g',
+ 'cp_mu_mstaco LBSUMM#DetStatus-v03-repro04-01 g',
+ 'cp_met LBSUMM#DetStatus-v03-repro04-01 g',
+ ]
## Set the dqflags query
self.querydict['dq'] = dqflagsquery
diff --git a/DataQuality/GoodRunsLists/python/Zeechannel_fwd.py b/DataQuality/GoodRunsLists/python/Zeechannel_fwd.py
index 2244feb7e743c9457c28418bb557390ca227bb5d..cd854e4ff35dbd3b8bbce533ad3bba8f5336845e 100644
--- a/DataQuality/GoodRunsLists/python/Zeechannel_fwd.py
+++ b/DataQuality/GoodRunsLists/python/Zeechannel_fwd.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
from GoodRunsLists.GoodRunsListConfig import GoodRunsListConfig
@@ -29,7 +29,7 @@ class Zeechannel_fwd(GoodRunsListConfig):
'L1CAL LBSUMM#DetStatus-v03-repro04-01 g',
'cp_eg_electron_endcap LBSUMM#DetStatus-v03-repro04-01 g',
'cp_eg_electron_barrel LBSUMM#DetStatus-v03-repro04-01 g',
- 'cp_eg_electron_forward LBSUMM#DetStatus-v03-repro04-01 g',
+ 'cp_eg_electron_forward LBSUMM#DetStatus-v03-repro04-01 g',
]
## Set the dqflags query
diff --git a/DataQuality/GoodRunsLists/python/jetetmiss_jetmetok_windet_900GeV.py b/DataQuality/GoodRunsLists/python/jetetmiss_jetmetok_windet_900GeV.py
index 15f2157b4f0fa1e3bf0e3b586bcc33e1283c74d2..8a2bbd80a4f545c5298a7ebc2834d94b5fd59362 100644
--- a/DataQuality/GoodRunsLists/python/jetetmiss_jetmetok_windet_900GeV.py
+++ b/DataQuality/GoodRunsLists/python/jetetmiss_jetmetok_windet_900GeV.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
from GoodRunsLists.GoodRunsListConfig import GoodRunsListConfig
@@ -25,10 +25,10 @@ class jetetmiss_jetmetok_windet_900GeV(GoodRunsListConfig):
self.querydict['st'] = ["physics_MinBias"]
dqflagsquery = [ 'ATLGL LBSUMM#DetStatusLBSUMM-December09-01 g',
- 'L1CTP LBSUMM#DetStatusLBSUMM-December09-01 g',
- 'atlsol LBSUMM#DetStatusLBSUMM-December09-01 g',
- 'lar LBSUMM#DetStatusLBSUMM-December09-01 g',
- 'tile LBSUMM#DetStatusLBSUMM-December09-01 g',
+ 'L1CTP LBSUMM#DetStatusLBSUMM-December09-01 g',
+ 'atlsol LBSUMM#DetStatusLBSUMM-December09-01 g',
+ 'lar LBSUMM#DetStatusLBSUMM-December09-01 g',
+ 'tile LBSUMM#DetStatusLBSUMM-December09-01 g',
'pix LBSUMM#DetStatusLBSUMM-December09-01 g',
'sct LBSUMM#DetStatusLBSUMM-December09-01 g',
'trtb,trte LBSUMM#DetStatusLBSUMM-December09-01 g',
diff --git a/DataQuality/GoodRunsLists/python/jetetmiss_jetmetok_woindet_2TeV.py b/DataQuality/GoodRunsLists/python/jetetmiss_jetmetok_woindet_2TeV.py
index 10f78672ac07771aea631eadbd7231fcbd9f3ff0..cc3c353f1eaa031d2047f377013fb5155cc7b38f 100644
--- a/DataQuality/GoodRunsLists/python/jetetmiss_jetmetok_woindet_2TeV.py
+++ b/DataQuality/GoodRunsLists/python/jetetmiss_jetmetok_woindet_2TeV.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
from GoodRunsLists.GoodRunsListConfig import GoodRunsListConfig
@@ -25,10 +25,10 @@ class jetetmiss_jetmetok_woindet_2TeV(GoodRunsListConfig):
self.querydict['st'] = ["physics_MinBias"]
dqflagsquery = [ 'ATLGL LBSUMM#DetStatusLBSUMM-December09-01 g',
- 'L1CTP LBSUMM#DetStatusLBSUMM-December09-01 g',
- 'atlsol LBSUMM#DetStatusLBSUMM-December09-01 g',
- 'lar LBSUMM#DetStatusLBSUMM-December09-01 g',
- 'tile LBSUMM#DetStatusLBSUMM-December09-01 g',
+ 'L1CTP LBSUMM#DetStatusLBSUMM-December09-01 g',
+ 'atlsol LBSUMM#DetStatusLBSUMM-December09-01 g',
+ 'lar LBSUMM#DetStatusLBSUMM-December09-01 g',
+ 'tile LBSUMM#DetStatusLBSUMM-December09-01 g',
'jetb LBSUMM#DetStatusLBSUMM-December09-01 g',
'jetea LBSUMM#DetStatusLBSUMM-December09-01 g',
'jetec LBSUMM#DetStatusLBSUMM-December09-01 g',
diff --git a/DataQuality/GoodRunsLists/python/jetetmiss_jetmetok_woindet_900GeV.py b/DataQuality/GoodRunsLists/python/jetetmiss_jetmetok_woindet_900GeV.py
index ffd15a92932b00f1ac5c4ddff2f43ee35f66dd82..877483642af2e93ebe8799e08b6362f2ecf63ebc 100644
--- a/DataQuality/GoodRunsLists/python/jetetmiss_jetmetok_woindet_900GeV.py
+++ b/DataQuality/GoodRunsLists/python/jetetmiss_jetmetok_woindet_900GeV.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
from GoodRunsLists.GoodRunsListConfig import GoodRunsListConfig
@@ -25,10 +25,10 @@ class jetetmiss_jetmetok_woindet_900GeV(GoodRunsListConfig):
self.querydict['st'] = ["physics_MinBias"]
dqflagsquery = [ 'ATLGL LBSUMM#DetStatusLBSUMM-December09-01 g',
- 'L1CTP LBSUMM#DetStatusLBSUMM-December09-01 g',
- 'atlsol LBSUMM#DetStatusLBSUMM-December09-01 g',
- 'lar LBSUMM#DetStatusLBSUMM-December09-01 g',
- 'tile LBSUMM#DetStatusLBSUMM-December09-01 g',
+ 'L1CTP LBSUMM#DetStatusLBSUMM-December09-01 g',
+ 'atlsol LBSUMM#DetStatusLBSUMM-December09-01 g',
+ 'lar LBSUMM#DetStatusLBSUMM-December09-01 g',
+ 'tile LBSUMM#DetStatusLBSUMM-December09-01 g',
'jetb LBSUMM#DetStatusLBSUMM-December09-01 g',
'jetea LBSUMM#DetStatusLBSUMM-December09-01 g',
'jetec LBSUMM#DetStatusLBSUMM-December09-01 g',
diff --git a/DataQuality/GoodRunsLists/python/jetetmiss_windet_900GeV.py b/DataQuality/GoodRunsLists/python/jetetmiss_windet_900GeV.py
index 3e8e666bf5e4454da4d6d881de0756e671a07635..aac2af112087403c11d8c491dbbca6310a09e039 100644
--- a/DataQuality/GoodRunsLists/python/jetetmiss_windet_900GeV.py
+++ b/DataQuality/GoodRunsLists/python/jetetmiss_windet_900GeV.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
from GoodRunsLists.GoodRunsListConfig import GoodRunsListConfig
@@ -25,10 +25,10 @@ class jetetmiss_windet_900GeV(GoodRunsListConfig):
self.querydict['st'] = ["physics_MinBias"]
dqflagsquery = [ 'ATLGL LBSUMM#DetStatusLBSUMM-December09-01 g',
- 'L1CTP LBSUMM#DetStatusLBSUMM-December09-01 g',
- 'atlsol LBSUMM#DetStatusLBSUMM-December09-01 g',
- 'lar LBSUMM#DetStatusLBSUMM-December09-01 g',
- 'tile LBSUMM#DetStatusLBSUMM-December09-01 g',
+ 'L1CTP LBSUMM#DetStatusLBSUMM-December09-01 g',
+ 'atlsol LBSUMM#DetStatusLBSUMM-December09-01 g',
+ 'lar LBSUMM#DetStatusLBSUMM-December09-01 g',
+ 'tile LBSUMM#DetStatusLBSUMM-December09-01 g',
'pix LBSUMM#DetStatusLBSUMM-December09-01 g',
'sct LBSUMM#DetStatusLBSUMM-December09-01 g',
'trtb,trte LBSUMM#DetStatusLBSUMM-December09-01 g',
diff --git a/DataQuality/GoodRunsLists/python/jetetmiss_woindet_2TeV.py b/DataQuality/GoodRunsLists/python/jetetmiss_woindet_2TeV.py
index 8f4792e7f24a44f00042dba05d0c0a15040e3fe3..d5dbd30fff0d15b36bad5ad509b1b14a8f41bd03 100644
--- a/DataQuality/GoodRunsLists/python/jetetmiss_woindet_2TeV.py
+++ b/DataQuality/GoodRunsLists/python/jetetmiss_woindet_2TeV.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
from GoodRunsLists.GoodRunsListConfig import GoodRunsListConfig
@@ -25,10 +25,10 @@ class jetetmiss_woindet_2TeV(GoodRunsListConfig):
self.querydict['st'] = ["physics_MinBias"]
dqflagsquery = [ 'ATLGL LBSUMM#DetStatusLBSUMM-December09-01 g',
- 'L1CTP LBSUMM#DetStatusLBSUMM-December09-01 g',
- 'atlsol LBSUMM#DetStatusLBSUMM-December09-01 g',
- 'lar LBSUMM#DetStatusLBSUMM-December09-01 g',
- 'tile LBSUMM#DetStatusLBSUMM-December09-01 g',
+ 'L1CTP LBSUMM#DetStatusLBSUMM-December09-01 g',
+ 'atlsol LBSUMM#DetStatusLBSUMM-December09-01 g',
+ 'lar LBSUMM#DetStatusLBSUMM-December09-01 g',
+ 'tile LBSUMM#DetStatusLBSUMM-December09-01 g',
##'jetb yellow+ ',
##'jetea yellow+ ',
##'jetec yellow+ ',
diff --git a/DataQuality/GoodRunsLists/python/jetetmiss_woindet_900GeV.py b/DataQuality/GoodRunsLists/python/jetetmiss_woindet_900GeV.py
index b589cef33b0f57856a3f482807b63baab65b2d08..5d0b6ffc7f882570086b5172980aafcb8c5261d1 100644
--- a/DataQuality/GoodRunsLists/python/jetetmiss_woindet_900GeV.py
+++ b/DataQuality/GoodRunsLists/python/jetetmiss_woindet_900GeV.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
from GoodRunsLists.GoodRunsListConfig import GoodRunsListConfig
@@ -25,10 +25,10 @@ class jetetmiss_woindet_900GeV(GoodRunsListConfig):
self.querydict['st'] = ["physics_MinBias"]
dqflagsquery = [ 'ATLGL LBSUMM#DetStatusLBSUMM-December09-01 g',
- 'L1CTP LBSUMM#DetStatusLBSUMM-December09-01 g',
- 'atlsol LBSUMM#DetStatusLBSUMM-December09-01 g',
- 'lar LBSUMM#DetStatusLBSUMM-December09-01 g',
- 'tile LBSUMM#DetStatusLBSUMM-December09-01 g',
+ 'L1CTP LBSUMM#DetStatusLBSUMM-December09-01 g',
+ 'atlsol LBSUMM#DetStatusLBSUMM-December09-01 g',
+ 'lar LBSUMM#DetStatusLBSUMM-December09-01 g',
+ 'tile LBSUMM#DetStatusLBSUMM-December09-01 g',
##'jetb yellow+ ',
##'jetea yellow+ ',
##'jetec yellow+ ',
diff --git a/DataQuality/GoodRunsLists/python/minbias_2TeV.py b/DataQuality/GoodRunsLists/python/minbias_2TeV.py
index b289e5c06ecf0aee25682c807cb0accae7c4ade4..25981c3bc98fa5fe5c68d716bb8301a9a5f71ba7 100644
--- a/DataQuality/GoodRunsLists/python/minbias_2TeV.py
+++ b/DataQuality/GoodRunsLists/python/minbias_2TeV.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
from GoodRunsLists.GoodRunsListConfig import GoodRunsListConfig
@@ -25,7 +25,7 @@ class minbias_2TeV(GoodRunsListConfig):
self.querydict['st'] = ["physics_MinBias"]
dqflagsquery = [ 'ATLGL LBSUMM#DetStatusLBSUMM-December09-01 g',
- 'L1CTP LBSUMM#DetStatusLBSUMM-December09-01 g',
+ 'L1CTP LBSUMM#DetStatusLBSUMM-December09-01 g',
]
## Set the dqflags query
diff --git a/DataQuality/GoodRunsLists/python/minbias_900GeV.py b/DataQuality/GoodRunsLists/python/minbias_900GeV.py
index 6703961cd41b3549a39d924470209cb27cc1182a..f856b180745fb760e7f268fbb07a710dde11e99e 100644
--- a/DataQuality/GoodRunsLists/python/minbias_900GeV.py
+++ b/DataQuality/GoodRunsLists/python/minbias_900GeV.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
from GoodRunsLists.GoodRunsListConfig import GoodRunsListConfig
@@ -25,7 +25,7 @@ class minbias_900GeV(GoodRunsListConfig):
self.querydict['st'] = ["physics_MinBias"]
dqflagsquery = [ 'ATLGL LBSUMM#DetStatusLBSUMM-December09-01 g',
- 'L1CTP LBSUMM#DetStatusLBSUMM-December09-01 g',
+ 'L1CTP LBSUMM#DetStatusLBSUMM-December09-01 g',
]
## Set the dqflags query
diff --git a/DataQuality/GoodRunsLists/python/minbias_solon_2TeV.py b/DataQuality/GoodRunsLists/python/minbias_solon_2TeV.py
index fe81cf16d3c346f116138653a1b07d090c6ab3b4..6eb78f4f2408f78ef192888e591d3ea9558b96c3 100644
--- a/DataQuality/GoodRunsLists/python/minbias_solon_2TeV.py
+++ b/DataQuality/GoodRunsLists/python/minbias_solon_2TeV.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
from GoodRunsLists.GoodRunsListConfig import GoodRunsListConfig
@@ -25,8 +25,8 @@ class minbias_solon_2TeV(GoodRunsListConfig):
self.querydict['st'] = ["physics_MinBias"]
dqflagsquery = [ 'ATLGL LBSUMM#DetStatusLBSUMM-December09-01 g',
- 'L1CTP LBSUMM#DetStatusLBSUMM-December09-01 g',
- 'atlsol LBSUMM#DetStatusLBSUMM-December09-01 g',
+ 'L1CTP LBSUMM#DetStatusLBSUMM-December09-01 g',
+ 'atlsol LBSUMM#DetStatusLBSUMM-December09-01 g',
]
## Set the dqflags query
diff --git a/DataQuality/GoodRunsLists/python/minbias_solon_900GeV.py b/DataQuality/GoodRunsLists/python/minbias_solon_900GeV.py
index 5617306d2d99910f2c7d4fbf5ff2b5343e0b2805..69c116c50b7dc57dc9324b06c0257f8b4afa5de8 100644
--- a/DataQuality/GoodRunsLists/python/minbias_solon_900GeV.py
+++ b/DataQuality/GoodRunsLists/python/minbias_solon_900GeV.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
from GoodRunsLists.GoodRunsListConfig import GoodRunsListConfig
@@ -25,8 +25,8 @@ class minbias_solon_900GeV(GoodRunsListConfig):
self.querydict['st'] = ["physics_MinBias"]
dqflagsquery = [ 'ATLGL LBSUMM#DetStatusLBSUMM-December09-01 g',
- 'L1CTP LBSUMM#DetStatusLBSUMM-December09-01 g',
- 'atlsol LBSUMM#DetStatusLBSUMM-December09-01 g',
+ 'L1CTP LBSUMM#DetStatusLBSUMM-December09-01 g',
+ 'atlsol LBSUMM#DetStatusLBSUMM-December09-01 g',
]
## Set the dqflags query
diff --git a/DataQuality/GoodRunsLists/python/minbias_solon_windet_900GeV.py b/DataQuality/GoodRunsLists/python/minbias_solon_windet_900GeV.py
index 465432e55ac971886dbed6c7e8b1e4d33bb6acf3..f69f99669e622eadabc35f6e3642ad49f1a6978b 100644
--- a/DataQuality/GoodRunsLists/python/minbias_solon_windet_900GeV.py
+++ b/DataQuality/GoodRunsLists/python/minbias_solon_windet_900GeV.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
from GoodRunsLists.GoodRunsListConfig import GoodRunsListConfig
@@ -25,8 +25,8 @@ class minbias_solon_windet_900GeV(GoodRunsListConfig):
self.querydict['st'] = ["physics_MinBias"]
dqflagsquery = [ 'ATLGL LBSUMM#DetStatusLBSUMM-December09-01 g',
- 'L1CTP LBSUMM#DetStatusLBSUMM-December09-01 g',
- 'atlsol LBSUMM#DetStatusLBSUMM-December09-01 g',
+ 'L1CTP LBSUMM#DetStatusLBSUMM-December09-01 g',
+ 'atlsol LBSUMM#DetStatusLBSUMM-December09-01 g',
'pix LBSUMM#DetStatusLBSUMM-December09-01 g',
'sct LBSUMM#DetStatusLBSUMM-December09-01 g',
'trtb,trte LBSUMM#DetStatusLBSUMM-December09-01 g',
diff --git a/DataQuality/GoodRunsLists/python/minbias_stable_900GeV.py b/DataQuality/GoodRunsLists/python/minbias_stable_900GeV.py
index dd62a26b78554ec61ef36c495eb96df7e1e14443..c4da3c6c50f5922878724986a682b6b745d5f3e0 100644
--- a/DataQuality/GoodRunsLists/python/minbias_stable_900GeV.py
+++ b/DataQuality/GoodRunsLists/python/minbias_stable_900GeV.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
from GoodRunsLists.GoodRunsListConfig import GoodRunsListConfig
@@ -25,7 +25,7 @@ class minbias_stable_900GeV(GoodRunsListConfig):
self.querydict['st'] = ["physics_MinBias"]
dqflagsquery = [ 'ATLGL LBSUMM#DetStatusLBSUMM-December09-01 g',
- 'L1CTP LBSUMM#DetStatusLBSUMM-December09-01 g',
+ 'L1CTP LBSUMM#DetStatusLBSUMM-December09-01 g',
]
## Set the dqflags query
diff --git a/DataQuality/GoodRunsLists/python/minbias_windet_900GeV.py b/DataQuality/GoodRunsLists/python/minbias_windet_900GeV.py
index a0b771fecaeec7c1a10e303de9374ab0ec4f8e17..fdaa270e874b3a6fa769fb3cc07bcef4393fc203 100644
--- a/DataQuality/GoodRunsLists/python/minbias_windet_900GeV.py
+++ b/DataQuality/GoodRunsLists/python/minbias_windet_900GeV.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
from GoodRunsLists.GoodRunsListConfig import GoodRunsListConfig
@@ -25,7 +25,7 @@ class minbias_windet_900GeV(GoodRunsListConfig):
self.querydict['st'] = ["physics_MinBias"]
dqflagsquery = [ 'ATLGL LBSUMM#DetStatusLBSUMM-December09-01 g',
- 'L1CTP LBSUMM#DetStatusLBSUMM-December09-01 g',
+ 'L1CTP LBSUMM#DetStatusLBSUMM-December09-01 g',
'pix LBSUMM#DetStatusLBSUMM-December09-01 g',
'sct LBSUMM#DetStatusLBSUMM-December09-01 g',
'trtb,trte LBSUMM#DetStatusLBSUMM-December09-01 g',
diff --git a/DataQuality/GoodRunsLists/python/muon_7TeV.py b/DataQuality/GoodRunsLists/python/muon_7TeV.py
index ac665bacb1d24a344fa70d6ce0667b73c0142650..a34cc0f26f1f98b835639f0d6a728d0a705acebd 100644
--- a/DataQuality/GoodRunsLists/python/muon_7TeV.py
+++ b/DataQuality/GoodRunsLists/python/muon_7TeV.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
from GoodRunsLists.GoodRunsListConfig import GoodRunsListConfig
@@ -30,10 +30,10 @@ class muon_7TeV(GoodRunsListConfig):
'pix SHIFTOFL#HEAD g',
'sct SHIFTOFL#HEAD g',
'trtb,trte SHIFTOFL#HEAD y+',
- 'mdt SHIFTOFL#HEAD g',
- 'rpc SHIFTOFL#HEAD g',
- 'tgc SHIFTOFL#HEAD g',
- 'csc SHIFTOFL#HEAD g',
+ 'mdt SHIFTOFL#HEAD g',
+ 'rpc SHIFTOFL#HEAD g',
+ 'tgc SHIFTOFL#HEAD g',
+ 'csc SHIFTOFL#HEAD g',
]
## Set the dqflags query
diff --git a/DataQuality/GoodRunsLists/python/susy_7TeV.py b/DataQuality/GoodRunsLists/python/susy_7TeV.py
index 3f85eb99ccd7fed767d7c09d512741503c282909..9a727c5123c7657ad0caef787f30f6f4c8fb6aed 100644
--- a/DataQuality/GoodRunsLists/python/susy_7TeV.py
+++ b/DataQuality/GoodRunsLists/python/susy_7TeV.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
from GoodRunsLists.GoodRunsListConfig import GoodRunsListConfig
@@ -19,21 +19,21 @@ class susy_7TeV(GoodRunsListConfig):
self.querydict['ptag'] = ["data10_7TeV"]
dqflagsquery = [ 'ATLGL LBSUMM#DetStatus-v03-repro04-01 g',
- 'L1CTP LBSUMM#DetStatus-v03-repro04-01 g',
- 'CP_MU_MMUIDCB LBSUMM#DetStatus-v03-repro04-01 g',
- 'cp_eg_electron_barrel LBSUMM#DetStatus-v03-repro04-01 g',
- 'cp_eg_electron_endcap LBSUMM#DetStatus-v03-repro04-01 g',
- #'cp_jet_jetb g',
- #'cp_jet_jetea g',
- #'cp_jet_jetec g',
- #'cp_met_metcalo g',
- #'cp_met_metmuon g',
- #'trmet g',
- #'trjet g',
- #'trmuo g',
- #'trele g',
- 'bs LBSUMM#DetStatus-v03-repro04-01 g',
- 'lumi LBSUMM#DetStatus-v03-repro04-01 g',
+ 'L1CTP LBSUMM#DetStatus-v03-repro04-01 g',
+ 'CP_MU_MMUIDCB LBSUMM#DetStatus-v03-repro04-01 g',
+ 'cp_eg_electron_barrel LBSUMM#DetStatus-v03-repro04-01 g',
+ 'cp_eg_electron_endcap LBSUMM#DetStatus-v03-repro04-01 g',
+ #'cp_jet_jetb g',
+ #'cp_jet_jetea g',
+ #'cp_jet_jetec g',
+ #'cp_met_metcalo g',
+ #'cp_met_metmuon g',
+ #'trmet g',
+ #'trjet g',
+ #'trmuo g',
+ #'trele g',
+ 'bs LBSUMM#DetStatus-v03-repro04-01 g',
+ 'lumi LBSUMM#DetStatus-v03-repro04-01 g',
]
## Set the dqflags query
diff --git a/MuonSpectrometer/MuonCablings/MuonCablingServers/python/MuonCablingServersConfig.py b/MuonSpectrometer/MuonCablings/MuonCablingServers/python/MuonCablingServersConfig.py
index f6a74aaf6cd2fb188493ea037cdf9b94ee11b100..bf3cb2a5ca55e020e2d8ee53cb2d3ea115bba44b 100755
--- a/MuonSpectrometer/MuonCablings/MuonCablingServers/python/MuonCablingServersConfig.py
+++ b/MuonSpectrometer/MuonCablings/MuonCablingServers/python/MuonCablingServersConfig.py
@@ -39,13 +39,13 @@ class TgcCablingServerConfig (TGCcablingServerSvc):
# make default Atlas
# *TODO* How do we handle the case of old CSC data? Is new DetDescrVersion CSC too? EJWM
self.Atlas = True
- if ( globalflags.DetDescrVersion().startswith('DC1') or \
- globalflags.DetDescrVersion().startswith('DC2') or \
+ if ( globalflags.DetDescrVersion().startswith('DC1') or
+ globalflags.DetDescrVersion().startswith('DC2') or
globalflags.DetDescrVersion().startswith('DC3')) :
self.Atlas = False
print ("DC")
- if (muonByteStreamFlags.TgcDataType()=='m3' or \
+ if (muonByteStreamFlags.TgcDataType()=='m3' or
muonByteStreamFlags.TgcDataType()=='oldSimulation') :
self.Atlas = False
if (muonByteStreamFlags.TgcDataType()=='m3'):
@@ -65,14 +65,14 @@ class TgcCablingServerConfig (TGCcablingServerSvc):
self.forcedUse = True
# if we run from RDO (overlay or other jobs) we must use the call-back,
- # even if we have hits to digitize
+ # even if we have hits to digitize
if DetFlags.haveRDO.TGC_on() and not DetFlags.digitize.TGC_on():
self.forcedUse = False
-
+
#use the call-back in the overlay job that has no bytestream data as input
if globalflags.isOverlay():
self.forcedUse = False
-
+
# superseed the previos configuration if we run from Atlas data
if globalflags.DataSource.is_data():
self.forcedUse = True
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/python/RpcMonitorAlgorithm.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/python/RpcMonitorAlgorithm.py
index 4fe7d1f1df8721d99b149b645aa08d875df9ba33..bb84ded649a341438729dcf01046646af3ee0b54 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/python/RpcMonitorAlgorithm.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/python/RpcMonitorAlgorithm.py
@@ -25,12 +25,12 @@ def RpcMonitoringConfig(inputFlags):
myGroup.defineHistogram('run;Run',
title='Run Number;run;Events',
type='TH1I',
- path='PlotCand',
+ path='PlotCand',
xbins=1000000,xmin=-0.5,xmax=999999.5)
myGroup.defineHistogram('nMu;NMuon',
title='Number of Muons;nMuons;Events',
type='TH1I',
- path='PlotCand',
+ path='PlotCand',
xbins=10,xmin=-0.5,xmax=9.5)
myGroup.defineHistogram('nMuBarrel;NMuonBarrel',
title='Number of Barrel Muons;nMuons;Events',
@@ -41,22 +41,22 @@ def RpcMonitoringConfig(inputFlags):
myGroup.defineHistogram('muPtCollection;MuonPt',
title='muon Pt;Pt[MeV];Muons',
type='TH1D',
- path='PlotCand',
+ path='PlotCand',
xbins=200,xmin=0,xmax=1000e3)
myGroup.defineHistogram('roiEtaCollection;roiEta',
title='roi eta;roi #eta;rois',
type='TH1D',
- path='PlotCand',
+ path='PlotCand',
xbins=50,xmin=-2.5,xmax=2.5)
myGroup.defineHistogram('roiBarrelEtaCollection;roiBarrelEta',
title='Barrel roi eta;roi #eta;rois',
type='TH1D',
- path='PlotCand',
+ path='PlotCand',
xbins=50,xmin=-2.5,xmax=2.5)
myGroup.defineHistogram('roiBarrelThrCollection;roiBarrelThrs',
title='Barrel roi threshold;roi threshold;rois',
type='TH1I',
- path='PlotCand',
+ path='PlotCand',
xbins=6,xmin=0.5,xmax=6.5)
myGroup.defineHistogram('ptDen;Pt', title='muon Pt;Pt[MeV];Muons', type='TH1D', path='TriggerEff/Denominator',
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/python/EXOT10ContentList.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/python/EXOT10ContentList.py
index 21e0296e5f541a7f426ed0ff9ff9a9a1f29b6ceb..b9deeb21c702fad62ade097d278fbf1504bd7857 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/python/EXOT10ContentList.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/python/EXOT10ContentList.py
@@ -1,51 +1,51 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-EXOT10SmartContent = [
- "Photons",
- "Muons",
- "Electrons",
- "PrimaryVertices",
- "InDetTrackParticles",
- "BTagging_AntiKt4EMTopo",
- "TauJets",
- "AntiKt4EMTopoJets",
- "AntiKt4LCTopoJets"
-]
-
-EXOT10AllVariablesContent = [
- "egammaClusters",
- "GSFConversionVertices",
- "TruthParticles",
- "egammaTruthParticles",
- "MET_Truth",
- "egammaTopoSeededClusters",
- "CaloCalTopoClusters",
- "TruthEvents",
- "TruthVertices",
- "AntiKt4TruthJets",
- "MET_LocHadTopo",
- "METAssoc_AntiKt4EMTopo",
- "MET_Core_AntiKt4EMTopo",
- "MET_Reference_AntiKt4EMTopo",
- "METAssoc_AntiKt4LCTopo",
- "MET_Core_AntiKt4LCTopo",
- "MET_Reference_AntiKt4LCTopo",
- "AntiKt4PV0TrackJets",
- "BTagging_AntiKt4Track"
-]
-
-EXOT10Content = [
-]
-
-EXOT10ExtraVariables = [
- "Electrons.author.Medium.Tight.Loose.charge",
- "BTagging_AntiKt4EMTopo.MV1_discriminant.MV1c_discriminant",
- "Muons.ptcone30.ptcone20.charge.quality.InnerDetectorPt.MuonSpectrometerPt.CaloLRLikelihood.CaloMuonIDTag",
- "AntiKt4EMTopoJets.NumTrkPt1000.TrackWidthPt1000.NumTrkPt500",
- "GSFTrackParticles.z0.d0.vz.definingParametersCovMatrix",
- "CombinedMuonTrackParticles.d0.z0.vz.definingParametersCovMatrix.truthOrigin.truthType",
- "ExtrapolatedMuonTrackParticles.d0.z0.vz.definingParametersCovMatrix.truthOrigin.truthType",
- "TauJets.TruthCharge.TruthProng.IsTruthMatched.TruthPtVis.truthOrigin.truthType",
- "MuonTruthParticles.barcode.decayVtxLink.e.m.pdgId.prodVtxLink.px.py.pz.recoMuonLink.status.truthOrigin.truthType",
- # "AntiKt4LCTopoJets.AverageLArQF"
-]
+EXOT10SmartContent = [
+ "Photons",
+ "Muons",
+ "Electrons",
+ "PrimaryVertices",
+ "InDetTrackParticles",
+ "BTagging_AntiKt4EMTopo",
+ "TauJets",
+ "AntiKt4EMTopoJets",
+ "AntiKt4LCTopoJets"
+]
+
+EXOT10AllVariablesContent = [
+ "egammaClusters",
+ "GSFConversionVertices",
+ "TruthParticles",
+ "egammaTruthParticles",
+ "MET_Truth",
+ "egammaTopoSeededClusters",
+ "CaloCalTopoClusters",
+ "TruthEvents",
+ "TruthVertices",
+ "AntiKt4TruthJets",
+ "MET_LocHadTopo",
+ "METAssoc_AntiKt4EMTopo",
+ "MET_Core_AntiKt4EMTopo",
+ "MET_Reference_AntiKt4EMTopo",
+ "METAssoc_AntiKt4LCTopo",
+ "MET_Core_AntiKt4LCTopo",
+ "MET_Reference_AntiKt4LCTopo",
+ "AntiKt4PV0TrackJets",
+ "BTagging_AntiKt4Track"
+]
+
+EXOT10Content = [
+]
+
+EXOT10ExtraVariables = [
+ "Electrons.author.Medium.Tight.Loose.charge",
+ "BTagging_AntiKt4EMTopo.MV1_discriminant.MV1c_discriminant",
+ "Muons.ptcone30.ptcone20.charge.quality.InnerDetectorPt.MuonSpectrometerPt.CaloLRLikelihood.CaloMuonIDTag",
+ "AntiKt4EMTopoJets.NumTrkPt1000.TrackWidthPt1000.NumTrkPt500",
+ "GSFTrackParticles.z0.d0.vz.definingParametersCovMatrix",
+ "CombinedMuonTrackParticles.d0.z0.vz.definingParametersCovMatrix.truthOrigin.truthType",
+ "ExtrapolatedMuonTrackParticles.d0.z0.vz.definingParametersCovMatrix.truthOrigin.truthType",
+ "TauJets.TruthCharge.TruthProng.IsTruthMatched.TruthPtVis.truthOrigin.truthType",
+ "MuonTruthParticles.barcode.decayVtxLink.e.m.pdgId.prodVtxLink.px.py.pz.recoMuonLink.status.truthOrigin.truthType",
+ # "AntiKt4LCTopoJets.AverageLArQF"
+]
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/python/EXOT14ContentList.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/python/EXOT14ContentList.py
index 4c66e7bb1633d03ca73f8d3c54dcdf0ff1ad0528..47fb90aca1d3b6ec44c787022ce640bfc84441c0 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/python/EXOT14ContentList.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/python/EXOT14ContentList.py
@@ -1,52 +1,51 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-EXOT14SmartContent = [
- "TauJets",
- "MET_Reference_AntiKt4LCTopo",
- "MET_Reference_AntiKt4EMTopo",
- "PrimaryVertices",
- "Photons",
- "Electrons",
- "Muons",
- "InDetTrackParticles",
- "AntiKt4EMTopoJets",
- "AntiKt4LCTopoJets",
- "BTagging_AntiKt4LCTopo",
- "BTagging_AntiKt4EMTopo",
-]
-
-EXOT14AllVariablesContent = [
- "GSFTrackParticles",
- "egammaClusters",
- "CaloCalTopoClusters",
- "GSFConversionVertices",
- "METAssoc_AntiKt4LCTopo",
- "MET_Core_AntiKt4LCTopo",
- "METAssoc_AntiKt4EMTopo",
- "MET_Core_AntiKt4EMTopo",
- "AntiKt4TruthJets",
- "LVL1JetRoIs",
- "LVL1MuonRoIs",
- "LVL1EmTauRoIs",
- 'MET_Truth',
- 'TruthEvents',
- #'TruthVertex', # MenuTruthThinning does not keep vertices
- 'TruthParticles',
- "HLT_xAOD__JetContainer_a4tcemsubjesFS",
- "HLT_xAOD__TrigMissingETContainer_TrigEFMissingET",
- "HLT_xAOD__TrigMissingETContainer_TrigEFMissingET_mht",
- "HLT_xAOD__TrigMissingETContainer_TrigEFMissingET_topocl",
- "HLT_xAOD__TrigMissingETContainer_TrigEFMissingET_topocl_PS",
- "HLT_xAOD__TrigMissingETContainer_TrigEFMissingET_topocl_PUC"
-]
-
-EXOT14ExtraVariablesContent = [
- 'Electrons.author.pt.Medium.Tight.Loose.charge',
- 'Muons.ptcone20.ptcone30.ptcone40.etcone20.etcone30.etcone40',
- 'CombinedMuonTrackParticles.d0.z0.phi.theta.charge.chiSquared.numberDoF.qOverP.vz.definingParametersCovMatrix', # SUSYTools
- 'ExtrapolatedMuonTrackParticles.d0.z0.phi.theta.charge.chiSquared.numberDoF.qOverP.vz.definingParametersCovMatrix', # SUSYTools
-]
-
-EXOT14Content = [
-]
-
+EXOT14SmartContent = [
+ "TauJets",
+ "MET_Reference_AntiKt4LCTopo",
+ "MET_Reference_AntiKt4EMTopo",
+ "PrimaryVertices",
+ "Photons",
+ "Electrons",
+ "Muons",
+ "InDetTrackParticles",
+ "AntiKt4EMTopoJets",
+ "AntiKt4LCTopoJets",
+ "BTagging_AntiKt4LCTopo",
+ "BTagging_AntiKt4EMTopo",
+]
+
+EXOT14AllVariablesContent = [
+ "GSFTrackParticles",
+ "egammaClusters",
+ "CaloCalTopoClusters",
+ "GSFConversionVertices",
+ "METAssoc_AntiKt4LCTopo",
+ "MET_Core_AntiKt4LCTopo",
+ "METAssoc_AntiKt4EMTopo",
+ "MET_Core_AntiKt4EMTopo",
+ "AntiKt4TruthJets",
+ "LVL1JetRoIs",
+ "LVL1MuonRoIs",
+ "LVL1EmTauRoIs",
+ 'MET_Truth',
+ 'TruthEvents',
+ #'TruthVertex', # MenuTruthThinning does not keep vertices
+ 'TruthParticles',
+ "HLT_xAOD__JetContainer_a4tcemsubjesFS",
+ "HLT_xAOD__TrigMissingETContainer_TrigEFMissingET",
+ "HLT_xAOD__TrigMissingETContainer_TrigEFMissingET_mht",
+ "HLT_xAOD__TrigMissingETContainer_TrigEFMissingET_topocl",
+ "HLT_xAOD__TrigMissingETContainer_TrigEFMissingET_topocl_PS",
+ "HLT_xAOD__TrigMissingETContainer_TrigEFMissingET_topocl_PUC"
+]
+
+EXOT14ExtraVariablesContent = [
+ 'Electrons.author.pt.Medium.Tight.Loose.charge',
+ 'Muons.ptcone20.ptcone30.ptcone40.etcone20.etcone30.etcone40',
+ 'CombinedMuonTrackParticles.d0.z0.phi.theta.charge.chiSquared.numberDoF.qOverP.vz.definingParametersCovMatrix', # SUSYTools
+ 'ExtrapolatedMuonTrackParticles.d0.z0.phi.theta.charge.chiSquared.numberDoF.qOverP.vz.definingParametersCovMatrix', # SUSYTools
+]
+
+EXOT14Content = [
+]
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/python/SUSY8ContentList.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/python/SUSY8ContentList.py
index c9e5a30ffc25a88919b30302716e23a75cd60a7e..79fc1d730ef0d4c1657710a0c2135d05fa365277 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/python/SUSY8ContentList.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/python/SUSY8ContentList.py
@@ -1,29 +1,29 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
SUSY8SmartContent = [
- "AntiKt4EMTopoJets",
- "Muons",
- "Photons",
- "MET_Reference_AntiKt4EMTopo",
- "PrimaryVertices"
- ]
-
+ "AntiKt4EMTopoJets",
+ "Muons",
+ "Photons",
+ "MET_Reference_AntiKt4EMTopo",
+ "PrimaryVertices"
+ ]
+
SUSY8ExtraVariables = [
- # jets
- #"AntiKt4EMTopoJets.pt",
- #"AntiKt4EMTopoJets.eta",
- #"AntiKt4EMTopoJets.phi",
- #"AntiKt4EMTopoJets.m",
- #"AntiKt4EMTopoJets.constituentLinks",
- # taus
- "TauJets.pt",
- "TauJets.eta",
- "TauJets.phi",
- "TauJets.m"
- ]
-
+ # jets
+ #"AntiKt4EMTopoJets.pt",
+ #"AntiKt4EMTopoJets.eta",
+ #"AntiKt4EMTopoJets.phi",
+ #"AntiKt4EMTopoJets.m",
+ #"AntiKt4EMTopoJets.constituentLinks",
+ # taus
+ "TauJets.pt",
+ "TauJets.eta",
+ "TauJets.phi",
+ "TauJets.m"
+ ]
+
SUSY8AllVariablesContent = [
- #"CaloCalTopoClusters",
+ #"CaloCalTopoClusters",
"CombinedMuonTrackParticles",
"CombinedStauTrackParticles",
#"ExtrapolatedMuonTrackParticles",
@@ -50,4 +50,4 @@ SUSY8AllVariablesContent = [
"TruthEvents",
"TruthParticles",
"TruthVertices"
- ]
+ ]
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/python/SUSY8TriggerList.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/python/SUSY8TriggerList.py
index 7743bead836607877a6be78ddb02f719e3c1c141..ef9ca66c556cb5387269b7c177b2ab7993f94c5e 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/python/SUSY8TriggerList.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/python/SUSY8TriggerList.py
@@ -1,21 +1,21 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
SUSY8JetMETTriggers = [
- 'HLT_j100_xe80',
+ 'HLT_j100_xe80',
'HLT_j80_xe80'
-# 'HLT_j80_xe80_dphi1_L1J40_DPHI-CJ20XE50',
-# 'HLT_j80_xe80_dphi1_L1J40_DPHI-J20XE50',
-# 'HLT_j80_xe80_dphi1_L1J40_DPHI-J20s2XE50',
-# 'HLT_j80_xe80_dphi1_L1J40_DPHI-Js2XE50',
-# 'HLT_j100_xe80_L1J40_DPHI-CJ20XE50',
-# 'HLT_j100_xe80_L1J40_DPHI-J20XE50',
-# 'HLT_j100_xe80_L1J40_DPHI-J20s2XE50',
-# 'HLT_j100_xe80_L1J40_DPHI-Js2XE50'
+# 'HLT_j80_xe80_dphi1_L1J40_DPHI-CJ20XE50',
+# 'HLT_j80_xe80_dphi1_L1J40_DPHI-J20XE50',
+# 'HLT_j80_xe80_dphi1_L1J40_DPHI-J20s2XE50',
+# 'HLT_j80_xe80_dphi1_L1J40_DPHI-Js2XE50',
+# 'HLT_j100_xe80_L1J40_DPHI-CJ20XE50',
+# 'HLT_j100_xe80_L1J40_DPHI-J20XE50',
+# 'HLT_j100_xe80_L1J40_DPHI-J20s2XE50',
+# 'HLT_j100_xe80_L1J40_DPHI-Js2XE50'
]
SUSY8MuonTriggers = [
- 'HLT_mu20_iloose_L1MU15',
- 'HLT_mu24',
+ 'HLT_mu20_iloose_L1MU15',
+ 'HLT_mu24',
'HLT_mu24_imedium',
'HLT_mu24_iloose_L1MU15',
'HLT_mu24_L1MU15',
@@ -29,24 +29,24 @@ SUSY8MuonTriggers = [
]
SUSY8DimuonTriggers = [
- 'HLT_2mu10',
+ 'HLT_2mu10',
'HLT_2mu14'
]
SUSY8METTriggers = [
- 'HLT_xe120',
- 'HLT_xe120_mht',
- 'HLT_xe120_pueta',
- 'HLT_xe120_pufit',
- 'HLT_xe120_tc_em',
- 'HLT_xe120_tc_lcw',
- 'HLT_xe120_wEFMu',
- 'HLT_xe120_mht_wEFMu',
- 'HLT_xe120_pueta_wEFMu',
- 'HLT_xe120_pufit_wEFMu',
- 'HLT_xe120_tc_em_wEFMu',
- 'HLT_xe120_tc_lcw_wEFMu',
- 'HLT_xe120_L1XE80_BGRP7',
+ 'HLT_xe120',
+ 'HLT_xe120_mht',
+ 'HLT_xe120_pueta',
+ 'HLT_xe120_pufit',
+ 'HLT_xe120_tc_em',
+ 'HLT_xe120_tc_lcw',
+ 'HLT_xe120_wEFMu',
+ 'HLT_xe120_mht_wEFMu',
+ 'HLT_xe120_pueta_wEFMu',
+ 'HLT_xe120_pufit_wEFMu',
+ 'HLT_xe120_tc_em_wEFMu',
+ 'HLT_xe120_tc_lcw_wEFMu',
+ 'HLT_xe120_L1XE80_BGRP7',
'HLT_xe120_mht_L1XE80_BGRP7',
'HLT_xe120_pueta_L1XE80_BGRP7',
'HLT_xe120_pufit_L1XE80_BGRP7',
@@ -58,91 +58,91 @@ SUSY8METTriggers = [
'HLT_xe120_pufit_wEFMu_L1XE80_BGRP7',
'HLT_xe120_tc_em_wEFMu_L1XE80_BGRP7',
'HLT_xe120_tc_lcw_wEFMu_L1XE80_BGRP7',
- 'HLT_xe100',
- 'HLT_xe100_wEFMu',
- 'HLT_xe100_mht',
- 'HLT_xe100_mht_wEFMu',
- 'HLT_xe100_pueta',
- 'HLT_xe100_pueta_wEFMu',
- 'HLT_xe100_pufit',
- 'HLT_xe100_pufit_wEFMu',
- 'HLT_xe100_tc_em',
- 'HLT_xe100_tc_em_wEFMu',
- 'HLT_xe100_tc_lcw',
- 'HLT_xe100_tc_lcw_wEFMu',
- 'HLT_xe100_L1XE80',
- 'HLT_xe100_mht_L1XE80',
- 'HLT_xe100_pueta_L1XE80',
- 'HLT_xe100_pufit_L1XE80',
- 'HLT_xe100_tc_em_L1XE80',
- 'HLT_xe100_tc_lcw_L1XE80',
- 'HLT_xe100_wEFMu_L1XE80',
- 'HLT_xe100_mht_wEFMu_L1XE80',
- 'HLT_xe100_pueta_wEFMu_L1XE80',
- 'HLT_xe100_pufit_wEFMu_L1XE80',
- 'HLT_xe100_tc_em_wEFMu_L1XE80',
- 'HLT_xe100_tc_lcw_wEFMu_L1XE80',
- 'HLT_xe100_L1XE70_BGRP7',
- 'HLT_xe100_mht_L1XE70_BGRP7',
- 'HLT_xe100_pueta_L1XE70_BGRP7',
- 'HLT_xe100_pufit_L1XE70_BGRP7',
- 'HLT_xe100_tc_em_L1XE70_BGRP7',
- 'HLT_xe100_tc_lcw_L1XE70_BGRP7',
- 'HLT_xe100_wEFMu_L1XE70_BGRP7',
- 'HLT_xe100_mht_wEFMu_L1XE70_BGRP7',
- 'HLT_xe100_pueta_wEFMu_L1XE70_BGRP7',
- 'HLT_xe100_pufit_wEFMu_L1XE70_BGRP7',
- 'HLT_xe100_tc_em_wEFMu_L1XE70_BGRP7',
- 'HLT_xe100_tc_lcw_wEFMu_L1XE70_BGRP7',
- 'HLT_xe100_L1XE80_BGRP7',
- 'HLT_xe100_mht_L1XE80_BGRP7',
- 'HLT_xe100_pueta_L1XE80_BGRP7',
- 'HLT_xe100_pufit_L1XE80_BGRP7',
- 'HLT_xe100_tc_em_L1XE80_BGRP7',
- 'HLT_xe100_tc_lcw_L1XE80_BGRP7',
- 'HLT_xe100_wEFMu_L1XE80_BGRP7',
- 'HLT_xe100_mht_wEFMu_L1XE80_BGRP7',
- 'HLT_xe100_pueta_wEFMu_L1XE80_BGRP7',
- 'HLT_xe100_pufit_wEFMu_L1XE80_BGRP7',
- 'HLT_xe100_tc_em_wEFMu_L1XE80_BGRP7',
- 'HLT_xe100_tc_lcw_wEFMu_L1XE80_BGRP7',
- 'HLT_xe80_L1XE70',
- 'HLT_xe80_wEFMu_L1XE70',
- 'HLT_xe80_mht_L1XE70',
- 'HLT_xe80_mht_wEFMu_L1XE70',
- 'HLT_xe80_pueta_L1XE70',
- 'HLT_xe80_pueta_wEFMu_L1XE70',
- 'HLT_xe80_pufit_L1XE70',
- 'HLT_xe80_pufit_wEFMu_L1XE70',
- 'HLT_xe80_tc_em_L1XE70',
- 'HLT_xe80_tc_em_wEFMu_L1XE70',
- 'HLT_xe80_tc_lcw_L1XE70',
- 'HLT_xe80_tc_lcw_wEFMu_L1XE70',
- 'HLT_xe80_L1XE70_BGRP7',
- 'HLT_xe80_mht_L1XE70_BGRP7',
- 'HLT_xe80_pueta_L1XE70_BGRP7',
- 'HLT_xe80_pufit_L1XE70_BGRP7',
- 'HLT_xe80_tc_em_L1XE70_BGRP7',
- 'HLT_xe80_tc_lcw_L1XE70_BGRP7',
- 'HLT_xe80_wEFMu_L1XE70_BGRP7',
- 'HLT_xe80_mht_wEFMu_L1XE70_BGRP7',
- 'HLT_xe80_tc_lcw_wEFMu_L1XE70_BGRP7',
- 'HLT_xe80_pueta_wEFMu_L1XE70_BGRP7',
- 'HLT_xe80_pufit_wEFMu_L1XE70_BGRP7',
- 'HLT_xe80_tc_em_wEFMu_L1XE70_BGRP7',
- 'HLT_xe80',
- 'HLT_xe80_wEFMu',
- 'HLT_xe80_mht',
- 'HLT_xe80_mht_wEFMu',
- 'HLT_xe80_pueta',
- 'HLT_xe80_pueta_wEFMu',
- 'HLT_xe80_pufit',
- 'HLT_xe80_pufit_wEFMu',
- 'HLT_xe80_tc_em',
- 'HLT_xe80_tc_em_wEFMu',
- 'HLT_xe80_tc_lcw',
- 'HLT_xe80_tc_lcw_wEFMu',
- 'HLT_xe80_L1XE50',
+ 'HLT_xe100',
+ 'HLT_xe100_wEFMu',
+ 'HLT_xe100_mht',
+ 'HLT_xe100_mht_wEFMu',
+ 'HLT_xe100_pueta',
+ 'HLT_xe100_pueta_wEFMu',
+ 'HLT_xe100_pufit',
+ 'HLT_xe100_pufit_wEFMu',
+ 'HLT_xe100_tc_em',
+ 'HLT_xe100_tc_em_wEFMu',
+ 'HLT_xe100_tc_lcw',
+ 'HLT_xe100_tc_lcw_wEFMu',
+ 'HLT_xe100_L1XE80',
+ 'HLT_xe100_mht_L1XE80',
+ 'HLT_xe100_pueta_L1XE80',
+ 'HLT_xe100_pufit_L1XE80',
+ 'HLT_xe100_tc_em_L1XE80',
+ 'HLT_xe100_tc_lcw_L1XE80',
+ 'HLT_xe100_wEFMu_L1XE80',
+ 'HLT_xe100_mht_wEFMu_L1XE80',
+ 'HLT_xe100_pueta_wEFMu_L1XE80',
+ 'HLT_xe100_pufit_wEFMu_L1XE80',
+ 'HLT_xe100_tc_em_wEFMu_L1XE80',
+ 'HLT_xe100_tc_lcw_wEFMu_L1XE80',
+ 'HLT_xe100_L1XE70_BGRP7',
+ 'HLT_xe100_mht_L1XE70_BGRP7',
+ 'HLT_xe100_pueta_L1XE70_BGRP7',
+ 'HLT_xe100_pufit_L1XE70_BGRP7',
+ 'HLT_xe100_tc_em_L1XE70_BGRP7',
+ 'HLT_xe100_tc_lcw_L1XE70_BGRP7',
+ 'HLT_xe100_wEFMu_L1XE70_BGRP7',
+ 'HLT_xe100_mht_wEFMu_L1XE70_BGRP7',
+ 'HLT_xe100_pueta_wEFMu_L1XE70_BGRP7',
+ 'HLT_xe100_pufit_wEFMu_L1XE70_BGRP7',
+ 'HLT_xe100_tc_em_wEFMu_L1XE70_BGRP7',
+ 'HLT_xe100_tc_lcw_wEFMu_L1XE70_BGRP7',
+ 'HLT_xe100_L1XE80_BGRP7',
+ 'HLT_xe100_mht_L1XE80_BGRP7',
+ 'HLT_xe100_pueta_L1XE80_BGRP7',
+ 'HLT_xe100_pufit_L1XE80_BGRP7',
+ 'HLT_xe100_tc_em_L1XE80_BGRP7',
+ 'HLT_xe100_tc_lcw_L1XE80_BGRP7',
+ 'HLT_xe100_wEFMu_L1XE80_BGRP7',
+ 'HLT_xe100_mht_wEFMu_L1XE80_BGRP7',
+ 'HLT_xe100_pueta_wEFMu_L1XE80_BGRP7',
+ 'HLT_xe100_pufit_wEFMu_L1XE80_BGRP7',
+ 'HLT_xe100_tc_em_wEFMu_L1XE80_BGRP7',
+ 'HLT_xe100_tc_lcw_wEFMu_L1XE80_BGRP7',
+ 'HLT_xe80_L1XE70',
+ 'HLT_xe80_wEFMu_L1XE70',
+ 'HLT_xe80_mht_L1XE70',
+ 'HLT_xe80_mht_wEFMu_L1XE70',
+ 'HLT_xe80_pueta_L1XE70',
+ 'HLT_xe80_pueta_wEFMu_L1XE70',
+ 'HLT_xe80_pufit_L1XE70',
+ 'HLT_xe80_pufit_wEFMu_L1XE70',
+ 'HLT_xe80_tc_em_L1XE70',
+ 'HLT_xe80_tc_em_wEFMu_L1XE70',
+ 'HLT_xe80_tc_lcw_L1XE70',
+ 'HLT_xe80_tc_lcw_wEFMu_L1XE70',
+ 'HLT_xe80_L1XE70_BGRP7',
+ 'HLT_xe80_mht_L1XE70_BGRP7',
+ 'HLT_xe80_pueta_L1XE70_BGRP7',
+ 'HLT_xe80_pufit_L1XE70_BGRP7',
+ 'HLT_xe80_tc_em_L1XE70_BGRP7',
+ 'HLT_xe80_tc_lcw_L1XE70_BGRP7',
+ 'HLT_xe80_wEFMu_L1XE70_BGRP7',
+ 'HLT_xe80_mht_wEFMu_L1XE70_BGRP7',
+ 'HLT_xe80_tc_lcw_wEFMu_L1XE70_BGRP7',
+ 'HLT_xe80_pueta_wEFMu_L1XE70_BGRP7',
+ 'HLT_xe80_pufit_wEFMu_L1XE70_BGRP7',
+ 'HLT_xe80_tc_em_wEFMu_L1XE70_BGRP7',
+ 'HLT_xe80',
+ 'HLT_xe80_wEFMu',
+ 'HLT_xe80_mht',
+ 'HLT_xe80_mht_wEFMu',
+ 'HLT_xe80_pueta',
+ 'HLT_xe80_pueta_wEFMu',
+ 'HLT_xe80_pufit',
+ 'HLT_xe80_pufit_wEFMu',
+ 'HLT_xe80_tc_em',
+ 'HLT_xe80_tc_em_wEFMu',
+ 'HLT_xe80_tc_lcw',
+ 'HLT_xe80_tc_lcw_wEFMu',
+ 'HLT_xe80_L1XE50',
'HLT_xe80_wEFMu_L1XE50',
'HLT_xe80_mht_L1XE50',
'HLT_xe80_mht_wEFMu_L1XE50',
@@ -154,86 +154,86 @@ SUSY8METTriggers = [
'HLT_xe80_tc_em_wEFMu_L1XE50',
'HLT_xe80_tc_lcw_L1XE50',
'HLT_xe80_tc_lcw_wEFMu_L1XE50',
- 'HLT_xe80_L1XE60_BGRP7',
- 'HLT_xe80_mht_L1XE60_BGRP7',
- 'HLT_xe80_pueta_L1XE60_BGRP7',
- 'HLT_xe80_pufit_L1XE60_BGRP7',
- 'HLT_xe80_tc_em_L1XE60_BGRP7',
- 'HLT_xe80_tc_lcw_L1XE60_BGRP7',
- 'HLT_xe80_wEFMu_L1XE60_BGRP7',
- 'HLT_xe80_mht_wEFMu_L1XE60_BGRP7',
- 'HLT_xe80_pueta_wEFMu_L1XE60_BGRP7',
- 'HLT_xe80_pufit_wEFMu_L1XE60_BGRP7',
- 'HLT_xe80_tc_em_wEFMu_L1XE60_BGRP7',
- 'HLT_xe80_tc_lcw_wEFMu_L1XE60_BGRP7',
- 'HLT_xe80_L1XE50_BGRP7',
- 'HLT_xe80_mht_L1XE50_BGRP7',
- 'HLT_xe80_pueta_L1XE50_BGRP7',
- 'HLT_xe80_pufit_L1XE50_BGRP7',
- 'HLT_xe80_tc_em_L1XE50_BGRP7',
- 'HLT_xe80_tc_lcw_L1XE50_BGRP7',
- 'HLT_xe80_wEFMu_L1XE50_BGRP7',
- 'HLT_xe80_mht_wEFMu_L1XE50_BGRP7',
- 'HLT_xe80_pueta_wEFMu_L1XE50_BGRP7',
- 'HLT_xe80_pufit_wEFMu_L1XE50_BGRP7',
- 'HLT_xe80_tc_em_wEFMu_L1XE50_BGRP7',
- 'HLT_xe80_tc_lcw_wEFMu_L1XE50_BGRP7',
- 'HLT_xe70',
- 'HLT_xe70_wEFMu',
- 'HLT_xe70_mht',
- 'HLT_xe70_mht_wEFMu',
- 'HLT_xe70_pueta',
- 'HLT_xe70_pueta_wEFMu',
- 'HLT_xe70_pufit',
- 'HLT_xe70_pufit_wEFMu',
- 'HLT_xe70_tc_em',
- 'HLT_xe70_tc_em_wEFMu',
- 'HLT_xe70_tc_lcw',
- 'HLT_xe70_tc_lcw_wEFMu',
- 'HLT_xe70_L1XE50_BGRP7',
- 'HLT_xe70_mht_L1XE50_BGRP7',
- 'HLT_xe70_pueta_L1XE50_BGRP7',
- 'HLT_xe70_pufit_L1XE50_BGRP7',
- 'HLT_xe70_tc_em_L1XE50_BGRP7',
- 'HLT_xe70_tc_lcw_L1XE50_BGRP7',
- 'HLT_xe70_wEFMu_L1XE50_BGRP7',
- 'HLT_xe70_mht_wEFMu_L1XE50_BGRP7',
- 'HLT_xe70_pueta_wEFMu_L1XE50_BGRP7',
- 'HLT_xe70_pufit_wEFMu_L1XE50_BGRP7',
- 'HLT_xe70_tc_em_wEFMu_L1XE50_BGRP7',
- 'HLT_xe70_tc_lcw_wEFMu_L1XE50_BGRP7',
- 'HLT_xe70_L1XE45',
- 'HLT_xe60',
- 'HLT_xe60_wEFMu',
- 'HLT_xe60_mht',
- 'HLT_xe60_mht_wEFMu',
- 'HLT_xe60_pueta',
- 'HLT_xe60_pueta_wEFMu',
- 'HLT_xe60_pufit',
- 'HLT_xe60_pufit_wEFMu',
- 'HLT_xe60_tc_em',
- 'HLT_xe60_tc_em_wEFMu',
- 'HLT_xe60_tc_lcw',
- 'HLT_xe60_tc_lcw_wEFMu',
- 'HLT_xe50',
- 'HLT_xe50_mht',
- 'HLT_xe50_pueta',
- 'HLT_xe50_pufit',
- 'HLT_xe50_tc_em',
- 'HLT_xe50_tc_lcw',
- 'HLT_xe50_L1XE35_BGRP7',
- 'HLT_xe50_mht_L1XE35_BGRP7',
- 'HLT_xe50_pueta_L1XE35_BGRP7',
- 'HLT_xe50_pufit_L1XE35_BGRP7',
- 'HLT_xe50_tc_em_L1XE35_BGRP7',
- 'HLT_xe50_tc_lcw_L1XE35_BGRP7',
- 'HLT_xe50_L1XE35_BGRP7',
- 'HLT_xe50_mht_L1XE35_BGRP7',
- 'HLT_xe50_pueta_L1XE35_BGRP7',
- 'HLT_xe50_pufit_L1XE35_BGRP7',
- 'HLT_xe50_tc_em_L1XE35_BGRP7',
- 'HLT_xe50_tc_lcw_L1XE35_BGRP7',
- 'HLT_xe35',
+ 'HLT_xe80_L1XE60_BGRP7',
+ 'HLT_xe80_mht_L1XE60_BGRP7',
+ 'HLT_xe80_pueta_L1XE60_BGRP7',
+ 'HLT_xe80_pufit_L1XE60_BGRP7',
+ 'HLT_xe80_tc_em_L1XE60_BGRP7',
+ 'HLT_xe80_tc_lcw_L1XE60_BGRP7',
+ 'HLT_xe80_wEFMu_L1XE60_BGRP7',
+ 'HLT_xe80_mht_wEFMu_L1XE60_BGRP7',
+ 'HLT_xe80_pueta_wEFMu_L1XE60_BGRP7',
+ 'HLT_xe80_pufit_wEFMu_L1XE60_BGRP7',
+ 'HLT_xe80_tc_em_wEFMu_L1XE60_BGRP7',
+ 'HLT_xe80_tc_lcw_wEFMu_L1XE60_BGRP7',
+ 'HLT_xe80_L1XE50_BGRP7',
+ 'HLT_xe80_mht_L1XE50_BGRP7',
+ 'HLT_xe80_pueta_L1XE50_BGRP7',
+ 'HLT_xe80_pufit_L1XE50_BGRP7',
+ 'HLT_xe80_tc_em_L1XE50_BGRP7',
+ 'HLT_xe80_tc_lcw_L1XE50_BGRP7',
+ 'HLT_xe80_wEFMu_L1XE50_BGRP7',
+ 'HLT_xe80_mht_wEFMu_L1XE50_BGRP7',
+ 'HLT_xe80_pueta_wEFMu_L1XE50_BGRP7',
+ 'HLT_xe80_pufit_wEFMu_L1XE50_BGRP7',
+ 'HLT_xe80_tc_em_wEFMu_L1XE50_BGRP7',
+ 'HLT_xe80_tc_lcw_wEFMu_L1XE50_BGRP7',
+ 'HLT_xe70',
+ 'HLT_xe70_wEFMu',
+ 'HLT_xe70_mht',
+ 'HLT_xe70_mht_wEFMu',
+ 'HLT_xe70_pueta',
+ 'HLT_xe70_pueta_wEFMu',
+ 'HLT_xe70_pufit',
+ 'HLT_xe70_pufit_wEFMu',
+ 'HLT_xe70_tc_em',
+ 'HLT_xe70_tc_em_wEFMu',
+ 'HLT_xe70_tc_lcw',
+ 'HLT_xe70_tc_lcw_wEFMu',
+ 'HLT_xe70_L1XE50_BGRP7',
+ 'HLT_xe70_mht_L1XE50_BGRP7',
+ 'HLT_xe70_pueta_L1XE50_BGRP7',
+ 'HLT_xe70_pufit_L1XE50_BGRP7',
+ 'HLT_xe70_tc_em_L1XE50_BGRP7',
+ 'HLT_xe70_tc_lcw_L1XE50_BGRP7',
+ 'HLT_xe70_wEFMu_L1XE50_BGRP7',
+ 'HLT_xe70_mht_wEFMu_L1XE50_BGRP7',
+ 'HLT_xe70_pueta_wEFMu_L1XE50_BGRP7',
+ 'HLT_xe70_pufit_wEFMu_L1XE50_BGRP7',
+ 'HLT_xe70_tc_em_wEFMu_L1XE50_BGRP7',
+ 'HLT_xe70_tc_lcw_wEFMu_L1XE50_BGRP7',
+ 'HLT_xe70_L1XE45',
+ 'HLT_xe60',
+ 'HLT_xe60_wEFMu',
+ 'HLT_xe60_mht',
+ 'HLT_xe60_mht_wEFMu',
+ 'HLT_xe60_pueta',
+ 'HLT_xe60_pueta_wEFMu',
+ 'HLT_xe60_pufit',
+ 'HLT_xe60_pufit_wEFMu',
+ 'HLT_xe60_tc_em',
+ 'HLT_xe60_tc_em_wEFMu',
+ 'HLT_xe60_tc_lcw',
+ 'HLT_xe60_tc_lcw_wEFMu',
+ 'HLT_xe50',
+ 'HLT_xe50_mht',
+ 'HLT_xe50_pueta',
+ 'HLT_xe50_pufit',
+ 'HLT_xe50_tc_em',
+ 'HLT_xe50_tc_lcw',
+ 'HLT_xe50_L1XE35_BGRP7',
+ 'HLT_xe50_mht_L1XE35_BGRP7',
+ 'HLT_xe50_pueta_L1XE35_BGRP7',
+ 'HLT_xe50_pufit_L1XE35_BGRP7',
+ 'HLT_xe50_tc_em_L1XE35_BGRP7',
+ 'HLT_xe50_tc_lcw_L1XE35_BGRP7',
+ 'HLT_xe50_L1XE35_BGRP7',
+ 'HLT_xe50_mht_L1XE35_BGRP7',
+ 'HLT_xe50_pueta_L1XE35_BGRP7',
+ 'HLT_xe50_pufit_L1XE35_BGRP7',
+ 'HLT_xe50_tc_em_L1XE35_BGRP7',
+ 'HLT_xe50_tc_lcw_L1XE35_BGRP7',
+ 'HLT_xe35',
'HLT_xe35_wEFMu',
'HLT_xe35_mht',
'HLT_xe35_mht_wEFMu',
@@ -245,16 +245,16 @@ SUSY8METTriggers = [
'HLT_xe35_tc_em_wEFMu',
'HLT_xe35_tc_lcw',
'HLT_xe35_tc_lcw_wEFMu'
- 'HLT_xe35_L1XE35_BGRP7',
- 'HLT_xe35_mht_L1XE35_BGRP7',
- 'HLT_xe35_pueta_L1XE35_BGRP7',
- 'HLT_xe35_pufit_L1XE35_BGRP7',
- 'HLT_xe35_tc_em_L1XE35_BGRP7',
- 'HLT_xe35_tc_lcw_L1XE35_BGRP7',
- 'HLT_xe35_wEFMu_L1XE35_BGRP7',
- 'HLT_xe35_mht_wEFMu_L1XE35_BGRP7',
- 'HLT_xe35_pueta_wEFMu_L1XE35_BGRP7',
- 'HLT_xe35_pufit_wEFMu_L1XE35_BGRP7',
- 'HLT_xe35_tc_em_wEFMu_L1XE35_BGRP7',
- 'HLT_xe35_tc_lcw_wEFMu_L1XE35_BGRP7'
+ 'HLT_xe35_L1XE35_BGRP7',
+ 'HLT_xe35_mht_L1XE35_BGRP7',
+ 'HLT_xe35_pueta_L1XE35_BGRP7',
+ 'HLT_xe35_pufit_L1XE35_BGRP7',
+ 'HLT_xe35_tc_em_L1XE35_BGRP7',
+ 'HLT_xe35_tc_lcw_L1XE35_BGRP7',
+ 'HLT_xe35_wEFMu_L1XE35_BGRP7',
+ 'HLT_xe35_mht_wEFMu_L1XE35_BGRP7',
+ 'HLT_xe35_pueta_wEFMu_L1XE35_BGRP7',
+ 'HLT_xe35_pufit_wEFMu_L1XE35_BGRP7',
+ 'HLT_xe35_tc_em_wEFMu_L1XE35_BGRP7',
+ 'HLT_xe35_tc_lcw_wEFMu_L1XE35_BGRP7'
]
diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/ImprovedJetFitterInitializationHelperConfig.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/ImprovedJetFitterInitializationHelperConfig.py
index e1ee51a4c1c7b6e9423025c14ba22dcd11c74c6c..d2096f341690e829dea813c50853a1c36ceef4b7 100644
--- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/ImprovedJetFitterInitializationHelperConfig.py
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/ImprovedJetFitterInitializationHelperConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
@@ -18,8 +18,7 @@ def ImprovedJetFitterInitializationHelperCfg(name, useBTagFlagsDefaults = True,
acc = ComponentAccumulator()
if useBTagFlagsDefaults:
jetFitterFullLinearizedTrackFactory = acc.popToolsAndMerge(JetFitterFullLinearizedTrackFactoryCfg('JFFullLinearizedTrackFactory'))
- defaults = {
- 'LinearizedTrackFactory' : jetFitterFullLinearizedTrackFactory}
+ defaults = {'LinearizedTrackFactory' : jetFitterFullLinearizedTrackFactory}
for option in defaults:
options.setdefault(option, defaults[option])
options['name'] = name
diff --git a/PhysicsAnalysis/NTUPtoNTUP/JetN2N/python/JetN2NFlags.py b/PhysicsAnalysis/NTUPtoNTUP/JetN2N/python/JetN2NFlags.py
index ff837c11af65c69063dd7ee1f9f8c878470d304c..eb055b62b68eed76fe528243b5b762b0506a2239 100644
--- a/PhysicsAnalysis/NTUPtoNTUP/JetN2N/python/JetN2NFlags.py
+++ b/PhysicsAnalysis/NTUPtoNTUP/JetN2N/python/JetN2NFlags.py
@@ -1,19 +1,19 @@
-# 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 AthenaCommon.JobProperties import JobProperty, JobPropertyContainer
from AthenaCommon.JobProperties import jobproperties
class JetN2NFlags (JobPropertyContainer):
- """Flags for Jet N2N making.
- """
+ """Flags for Jet N2N making.
+ """
jobproperties.add_Container (JetN2NFlags)
class JetN2NYear (JobProperty):
- """Define which year (2011 or 2012)"""
- statusOn = True
- allowedTypes = ['str']
- StoredValue = '2012'
+ """Define which year (2011 or 2012)"""
+ statusOn = True
+ allowedTypes = ['str']
+ StoredValue = '2012'
jobproperties.JetN2NFlags.add_JobProperty(JetN2NYear)
# shortcut name
diff --git a/PhysicsAnalysis/NTUPtoNTUP/JetN2N/python/SlimSMQCD.py b/PhysicsAnalysis/NTUPtoNTUP/JetN2N/python/SlimSMQCD.py
index 13b979427706d0945deb98a316b60cb9cb2b2b2e..b60945881fbf179553fedbb5c2fb46830fc27656 100644
--- a/PhysicsAnalysis/NTUPtoNTUP/JetN2N/python/SlimSMQCD.py
+++ b/PhysicsAnalysis/NTUPtoNTUP/JetN2N/python/SlimSMQCD.py
@@ -86,7 +86,7 @@ def doSlimSMQCD(treeName,outputFile,inputFiles,year):
# and ch.mcevt_weight[0].size() !=0:
# w=ch.mcevt_weight[0][0]
#else:
- # w=1
+ # w=1
#weight[1]+=w
ch_new.Fill()
diff --git a/Projects/AthGeneration/CMakeLists.txt b/Projects/AthGeneration/CMakeLists.txt
index ac18de096d92b299691ce022c3f800fed908035b..a69f765b983333b9ec1eb444f23b07d923b3b30e 100644
--- a/Projects/AthGeneration/CMakeLists.txt
+++ b/Projects/AthGeneration/CMakeLists.txt
@@ -8,7 +8,7 @@ project( AthGeneration VERSION ${_version} LANGUAGES C CXX Fortran )
unset( _version )
# Configure flake8:
-set( ATLAS_FLAKE8 "flake8_atlas --select ATL,F,E7,E9,W6 --enable-extension ATL902 --extend-ignore E701,E702,E741"
+set( ATLAS_FLAKE8 "flake8_atlas --select ATL,F,E101,E7,E9,W6 --ignore ATL238,ATL9,E701,E702,E704,E741 --enable-extensions ATL902"
CACHE STRING "Default flake8 command" )
set( ATLAS_PYTHON_CHECKER "${ATLAS_FLAKE8} --filterFiles AthenaConfiguration"
diff --git a/Projects/Athena/CMakeLists.txt b/Projects/Athena/CMakeLists.txt
index a21c2cb21344068fb5079c3680b12cc589ab244c..c79c975a593683ddf2fb0c97fc4d0020c86ea8ff 100644
--- a/Projects/Athena/CMakeLists.txt
+++ b/Projects/Athena/CMakeLists.txt
@@ -41,7 +41,7 @@ mark_as_advanced( TDAQ-COMMON_ATROOT TDAQ_PROJECT_NAME
TDAQ_ATROOT )
# Configure flake8:
-set( ATLAS_FLAKE8 "flake8_atlas -j 1 --select ATL,F,E7,E9,W6 --enable-extension ATL902 --extend-ignore E701,E702,E741"
+set( ATLAS_FLAKE8 "flake8_atlas --select ATL,F,E101,E7,E9,W6 --ignore ATL238,ATL9,E701,E702,E704,E741 --enable-extensions ATL902"
CACHE STRING "Default flake8 command" )
set( ATLAS_PYTHON_CHECKER "${ATLAS_FLAKE8} --filterFiles AthenaConfiguration"
diff --git a/Reconstruction/Jet/JetCalibTools/python/JetCalibToolsConfig.py b/Reconstruction/Jet/JetCalibTools/python/JetCalibToolsConfig.py
index 32d84e71ddc14df547b0f1d9c77ea8a04a9906f2..6c1bed68c0e08ee1642a54d942ff47e52f217d13 100644
--- a/Reconstruction/Jet/JetCalibTools/python/JetCalibToolsConfig.py
+++ b/Reconstruction/Jet/JetCalibTools/python/JetCalibToolsConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
########################################################################
# #
@@ -134,14 +134,14 @@ def defineJetCalibTool(jetcollection, configfile, calibarea, calibseq, data_type
#
from AthenaConfiguration.ComponentFactory import CompFactory
jct = CompFactory.JetCalibrationTool(toolname,
- JetCollection = jetcollection,
- ConfigFile = configfile,
- CalibArea = calibarea,
- CalibSequence = calibseq,
- IsData = (data_type == "data"),
- RhoKey = rhoname,
- PrimaryVerticesContainerName = pvname,
- GSCDepth = gscdepth
+ JetCollection = jetcollection,
+ ConfigFile = configfile,
+ CalibArea = calibarea,
+ CalibSequence = calibseq,
+ IsData = (data_type == "data"),
+ RhoKey = rhoname,
+ PrimaryVerticesContainerName = pvname,
+ GSCDepth = gscdepth
)
return jct
diff --git a/Tools/OnlineRecoTests/python/ort_interpretTimestamp.py b/Tools/OnlineRecoTests/python/ort_interpretTimestamp.py
index 8f9224d6080955c02bb6735840cabd4750f1a840..70ff4a5e3d3b6094bc61854f1925dbd3b3606888 100755
--- a/Tools/OnlineRecoTests/python/ort_interpretTimestamp.py
+++ b/Tools/OnlineRecoTests/python/ort_interpretTimestamp.py
@@ -83,8 +83,8 @@ if __name__ == "__main__":
updateTimestamp = int(sys.argv[3])
## interpret timestamp
- doInstall,pacmankey = interpretNewTimestamp(newtimestampfile, \
- prvtimestampfile)
+ doInstall,pacmankey = interpretNewTimestamp(newtimestampfile,
+ prvtimestampfile)
if doInstall:
print("Install new nightly kit ? %s" % str(doInstall))
print(pacmankey)
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/treeVisitors.py b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/treeVisitors.py
index ca63cdd44fd53e9c577ff4c9668ac00cbcf660c8..a368fff65cf1bda61fb856e8242033f0d3509f2f 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/treeVisitors.py
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/treeVisitors.py
@@ -34,8 +34,8 @@ def defaultParameters(parameter, default=''): # default if parameter unknown
'momwidthhi': 'inf',
'smclo': '0',
'smchi': 'inf',
- 'jvtlo': '0',
- 'jvthi': 'inf',
+ 'jvtlo': '0',
+ 'jvthi': 'inf',
}
if parameter not in defaults:
diff --git a/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitorAlgorithm.py b/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitorAlgorithm.py
index d65f8119528e814ddfb3b724ea715833202a170b..4f5484ab31be9ea03d15a1c5af2cfcba4a2ef57e 100644
--- a/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitorAlgorithm.py
+++ b/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitorAlgorithm.py
@@ -223,7 +223,7 @@ def jetChainMonitoringConfig(inputFlags,jetcoll,chain,athenaMT):
"pt",
"m",
"eta",
- "et",
+ "et",
# we pass directly the ToolSpec
ToolSpec('JetHistoTriggEfficiency', chain,
# below we pass the Properties of this JetHistoTriggEfficiency tool :
@@ -236,14 +236,14 @@ def jetChainMonitoringConfig(inputFlags,jetcoll,chain,athenaMT):
if 'smc' in chain:
trigConf.appendHistos(
SelectSpec( 'm50', '50<m', chain, FillerTools = [
- ToolSpec('JetHistoTriggEfficiency', chain,
+ ToolSpec('JetHistoTriggEfficiency', chain,
Group='jetTrigGroup_'+chain+'_m50',
Var=retrieveVarToolConf("pt"), # In this context we can not just pass a str alias to describe a histo variable
ProbeTrigChain=chain,defineHistoFunc=defineHistoForJetTrigg
),
- ] ),
+ ] ),
SelectSpec( 'et500', '500<et', chain, FillerTools = [
- ToolSpec('JetHistoTriggEfficiency', chain,
+ ToolSpec('JetHistoTriggEfficiency', chain,
Group='jetTrigGroup_'+chain+'_et500',
Var=retrieveVarToolConf("m"), # In this context we can not just pass a str alias to describe a histo variable
ProbeTrigChain=chain,defineHistoFunc=defineHistoForJetTrigg