Merge branch 'ExternalsUpdate-21.0-20171205' into '21.0'

Externals Update, 21.0 branch (2017.12.05.)

See merge request atlas/athena!7091


Former-commit-id: d99b89f4eda48a52dbeab2dcc5b28b970fed2b6c

PhysicsAnalysis/D3PDMaker/ForwardDetectorsD3PDMaker/python/ForwardDetectorsD3PD.py

@@ -14,7 +14,7 @@ print 'globalflags'
 print globalflags
 
 def ForwardDetectorsD3PD( alg = None,
-                          file = "ForwardDetectordD3PD.root"
+                          file = "ForwardDetectordD3PD.root",
                           tuplename = 'ForwardDetectorsD3PD',
                           **kw ):
 

PhysicsAnalysis/D3PDMaker/JetD3PDMaker/python/JetTileD3PDObject.py

@@ -231,7 +231,7 @@ def getJetTileD3PDObject(objectname='JetTileD3PDObject', prefix='jet_', btagleve
                            prefix = 'flavor_assoctrk_',
                            level = _jetAssocLevel,
                            blockname = 'AssocTrackCont')
-<
+
 
     object.defineBlock(10, 'JetRoIword',
                               JetD3PDMaker.JetROIWordFillerTool

Projects/AthDerivation/externals.txt

@@ -5,5 +5,5 @@
 # an "origin/" prefix before it. For tags however this is explicitly
 # forbidden.
 
-AthDerivationExternalsVersion = 1.0.17
-GaudiVersion = v27r1.014
+AthDerivationExternalsVersion = 1.0.27
+GaudiVersion = v27r1.015

Projects/AthSimulation/externals.txt

@@ -5,5 +5,5 @@
 # an "origin/" prefix before it. For tags however this is explicitly
 # forbidden.
 
-AthSimulationExternalsVersion = 1.0.17
-GaudiVersion = v27r1.014
+AthSimulationExternalsVersion = 1.0.27
+GaudiVersion = v27r1.015

Projects/Athena/externals.txt

@@ -5,5 +5,5 @@
 # an "origin/" prefix before it. For tags however this is explicitly
 # forbidden.
 
-AthenaExternalsVersion = 1.0.17
+AthenaExternalsVersion = 1.0.27
 GaudiVersion = v27r1.015

Projects/AthenaP1/externals.txt

@@ -5,5 +5,5 @@
 # an "origin/" prefix before it. For tags however this is explicitly
 # forbidden.
 
-AthenaExternalsVersion = 1.0.22
-GaudiVersion = v27r1.013
+AthenaExternalsVersion = 1.0.27
+GaudiVersion = v27r1.015

Reconstruction/Jet/JetMomentTools/python/SetupJetMomentTools.py

@@ -81,7 +81,7 @@ def getJetTracksMomentTool(**options):
         )
     return trkTool
 
-def getJetClusterMomentTool(toolName="JetClusterMoments")
+def getJetClusterMomentTool(toolName="JetClusterMoments"):
     from JetMomentTools.JetMomentToolsConf import JetClusterMomentsTool
     return JetClusterMomentsTool(toolName)
 

Tools/FullChainTests/python/TrfBuilder.py

@@ -51,9 +51,8 @@ class TrfBuilder:
                 if section == sectionName:  # take only our section for sectionName into account
                     sectionCounter = sectionCounter + 1
                     for option in self.DigiRecoConfig.options(section):  # loop over all settings in specified our section
-                        #pfx += option + '=' \
-                        #pfx += ' --' + option + '=' \
-                        pfx += ' --' + option + ' ' \ # to support multiple values --preExec "AAA:aaa" "BBB:bbb"
+                        # to support multiple values --preExec "AAA:aaa" "BBB:bbb"
+                        pfx += ' --' + option + ' ' \
                             + self.DigiRecoConfig.get(section, option) \
                             + ' '
             if sectionCounter == 0:

Trigger/TrigT1/TrigT1Muctpi/python/TrigT1MuctpiAlgorithmConfig.py

@@ -32,7 +32,7 @@ if not hasattr( topSequence, "CBNT_AthenaAware" ):
   from CBNT_Athena.CBNT_AthenaConf import *
   from CBNT_Utils.CBNT_UtilsConf import *
   CBNT_AthenaAware = CBNT_AthenaAware()
-@  CBNT_AthenaAware.OutputLevel = 2
+#  CBNT_AthenaAware.OutputLevel = 2
   topSequence += CBNT_AthenaAware
 
 if not "CBNTAA_EventInfo" in topSequence.CBNT_AthenaAware.Members :