From 895aae8951a24d5ae14a5c588c186caa7ee14dcc Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Fri, 1 May 2020 08:47:26 +0200
Subject: [PATCH] Fix mixed tabs/spaces in python files
---
.../python/RpcMonitorAlgorithm.py | 12 ++++++------
...rovedJetFitterInitializationHelperConfig.py | 5 ++---
.../python/JetCalibToolsConfig.py | 18 +++++++++---------
.../python/TrigJetMonitorAlgorithm.py | 8 ++++----
4 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/python/RpcMonitorAlgorithm.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/python/RpcMonitorAlgorithm.py
index 4fe7d1f1df8..bb84ded649a 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/JetTagging/JetTagAlgs/BTagging/python/ImprovedJetFitterInitializationHelperConfig.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/ImprovedJetFitterInitializationHelperConfig.py
index e1ee51a4c1c..d2096f34169 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/Reconstruction/Jet/JetCalibTools/python/JetCalibToolsConfig.py b/Reconstruction/Jet/JetCalibTools/python/JetCalibToolsConfig.py
index 32d84e71ddc..6c1bed68c0e 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/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitorAlgorithm.py b/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitorAlgorithm.py
index 452d3ae677f..3ac1e0b4cf9 100644
--- a/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitorAlgorithm.py
+++ b/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitorAlgorithm.py
@@ -194,7 +194,7 @@ def jetChainMonitoringConfig(inputFlags,jetcoll,chain):
"pt",
"m",
"eta",
- "et",
+ "et",
# we pass directly the ToolSpec
ToolSpec('JetHistoTriggEfficiency', chain,
# below we pass the Properties of this JetHistoTriggEfficiency tool :
@@ -207,14 +207,14 @@ def jetChainMonitoringConfig(inputFlags,jetcoll,chain):
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
--
GitLab