Merge branch 'cms-sw:master' into topDQMReco

Alignment/APEEstimation/test/SkimProducer/skimProducer_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import os
 import FWCore.ParameterSet.Config as cms
 

Alignment/APEEstimation/test/SkimProducer/startSkim.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import sys
 sys.path.append("../SkimProducer")
 # for switching to CAF queue (condor submit)

Alignment/APEEstimation/test/autoSubmitter/autoSubmitter.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import configparser as ConfigParser
 import argparse
 import shelve

Alignment/APEEstimation/test/autoSubmitter/helpers.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import re
 import os
 import subprocess

Alignment/APEEstimation/test/cfgTemplate/apeEstimatorSummary_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import os
 
 import FWCore.ParameterSet.Config as cms

Alignment/APEEstimation/test/cfgTemplate/apeEstimator_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import os
 
 import FWCore.ParameterSet.Config as cms

Alignment/APEEstimation/test/cfgTemplate/apeLocalSetting_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import os
 
 import FWCore.ParameterSet.Config as cms

Alignment/APEEstimation/test/createTrackerAlignmentErrorExtendedRcd_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 ########################################################################################
 ###
 ###  Read and write APEs to and from database and ASCII files

Alignment/APEEstimation/test/plottingTools/trendPlotter.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import ROOT
 ROOT.gROOT.SetBatch(True)
 from setTDRStyle import setTDRStyle

Alignment/APEEstimation/test/trackerTreeGenerator_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 
 import os

Alignment/CommonAlignment/python/tools/dataset.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-from __future__ import absolute_import
 
 import abc
 import csv

Alignment/CommonAlignment/python/tools/trackselectionRefitting.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import sys
 import FWCore.ParameterSet.Config as cms
 

Alignment/CommonAlignment/python/tools/utilities.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 
 def cache(function):
     cache = {}

Alignment/CommonAlignment/scripts/magneticFieldFilterJSON.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-from __future__ import print_function
 import os
 import sys
 

Alignment/CommonAlignment/scripts/tkal_create_file_lists.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-from __future__ import print_function
 
 from builtins import range
 import os

Alignment/CommonAlignmentProducer/scripts/AlCaHLTBitMon_ParallelJobs.py

@@ -7,7 +7,6 @@
 # by:              $Author: mussgill $
 #-----------------------------------------------------
 
-from __future__ import print_function
 import re
 import json
 import os 

Alignment/CommonAlignmentProducer/scripts/AlCaHLTBitMon_QueryRunRegistry.py

@@ -7,7 +7,6 @@
 # by:              $Author: taroni $
 #-----------------------------------------------------
 
-from __future__ import print_function
 from xml.dom import minidom
 import re
 import json

Alignment/HIPAlignmentAlgorithm/python/OptionParser/HipPyOptionParser.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 from array import array
 from copy import copy
 from copy import deepcopy

Alignment/HIPAlignmentAlgorithm/scripts/batchHippy.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-from __future__ import print_function
 import sys
 import imp
 import copy

Alignment/HIPAlignmentAlgorithm/scripts/hippyaddtobaddatafiles.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-from __future__ import print_function
 
 import argparse, contextlib, os, re, shutil, subprocess, tempfile, time
 

Alignment/HIPAlignmentAlgorithm/test/runTwoBodyDecayTest.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 
 process = cms.Process("TBDtest")

Alignment/MillePedeAlignmentAlgorithm/python/alignmentsetup/GeneralSetup.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import re
 
 def setup(process, global_tag, zero_tesla=False, geometry=""):

Alignment/MillePedeAlignmentAlgorithm/python/alignmentsetup/MilleSetup.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 import FWCore.ParameterSet.Config as cms
 
 

Alignment/MillePedeAlignmentAlgorithm/python/mpslib/Mpslibclass.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 # This Jobdatabas-Class interacts with the mps.db file.
 # It's member-variables are often called in the mps_... scripts.
 #

Alignment/MillePedeAlignmentAlgorithm/python/mpslib/tools.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 from builtins import range
 import os
 import re

Alignment/MillePedeAlignmentAlgorithm/python/mpsvalidate/classes.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 ##########################################################################
 # Classes which are needed by the mps_validate.py file.
 ##

Alignment/MillePedeAlignmentAlgorithm/scripts/mps_alisetup.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-from __future__ import print_function
 import os
 import re
 import sys

Alignment/MillePedeAlignmentAlgorithm/scripts/mps_check.py

@@ -11,7 +11,6 @@
 #
 #  It also retirieves number of events from alignment.log and cputime from STDOUT
 
-from __future__ import print_function
 from builtins import range
 import Alignment.MillePedeAlignmentAlgorithm.mpslib.Mpslibclass as mpslib
 import subprocess

Alignment/MillePedeAlignmentAlgorithm/scripts/mps_fire.py

@@ -12,7 +12,6 @@
 #  mps_fire.py [-a] [-m [-f]] [maxjobs]
 #  mps_fire.py -h
 
-from __future__ import print_function
 from builtins import range
 import Alignment.MillePedeAlignmentAlgorithm.mpslib.Mpslibclass as mpslib
 import Alignment.MillePedeAlignmentAlgorithm.mpslib.tools as mps_tools

Alignment/MillePedeAlignmentAlgorithm/scripts/mps_list_evts.py

@@ -14,7 +14,6 @@
 
 M. Schroeder, DESY Hamburg      26-May-2014
 """
-from __future__ import print_function
 
 import sys
 

Alignment/MillePedeAlignmentAlgorithm/scripts/mps_merge.py

@@ -6,7 +6,6 @@
 #
 #  mps_merge.pl [-c] inCfg mergeCfg mergeDir njobs
 
-from __future__ import print_function
 from builtins import range
 import Alignment.MillePedeAlignmentAlgorithm.mpslib.Mpslibclass as mpslib
 import re

Alignment/MillePedeAlignmentAlgorithm/scripts/mps_monitormerge.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-from __future__ import print_function
 from builtins import range
 import os
 import subprocess

Alignment/MillePedeAlignmentAlgorithm/scripts/mps_parse_pedechi2hist.py

@@ -15,7 +15,6 @@
 #
 # Use createChi2ndfplot.C to plot the output of this script.
 
-from __future__ import print_function
 import os
 import sys
 import re

Alignment/MillePedeAlignmentAlgorithm/scripts/mps_setup.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-from __future__ import print_function
 from builtins import range
 import os
 import re

Alignment/MillePedeAlignmentAlgorithm/scripts/mps_setup_new_align.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-from __future__ import print_function
 import os
 import sys
 import re

Alignment/MillePedeAlignmentAlgorithm/scripts/mps_splice.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-from __future__ import print_function
 from builtins import range
 import re
 import argparse

Alignment/MillePedeAlignmentAlgorithm/scripts/mps_update.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-from __future__ import print_function
 from builtins import range
 import os
 import re

Alignment/MillePedeAlignmentAlgorithm/test/trackerTree_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 ##########################################################################
 # Creates the TrackerTree.root file.
 # Configuration file from TrackerAlignment/test/trackerTreeGenerator_cfg.py

Alignment/MuonAlignment/python/geometryCSVtoXML.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 
 # External libraries (standard in Python >= 2.4, at least)
-from __future__ import print_function
 from sys import stdin
 from re import split, sub
 

Alignment/MuonAlignment/python/geometryDiff.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 
-from __future__ import print_function
 from builtins import range
 from Alignment.MuonAlignment.geometryXMLparser import MuonGeometry, dtorder, cscorder
 import sys, getopt

Alignment/MuonAlignment/python/geometryDiffVisualization.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 import re
 from math import *
 from .svgfig import rgb, SVG, pathtoPath, load as load_svg

Alignment/MuonAlignment/python/geometryXMLtoCSV.py

@@ -24,7 +24,6 @@
 # }
 
 # External libraries (standard in Python >= 2.4, at least)
-from __future__ import print_function
 from xml.sax import handler, make_parser
 from sys import stdin
 

Alignment/MuonAlignment/python/makeMuonMisalignmentScenario.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 from builtins import range
 from optparse import OptionParser
 from random import gauss

Alignment/MuonAlignment/test/muonGeometryDBConverter_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 import FWCore.ParameterSet.VarParsing as VarParsing
 

Alignment/MuonAlignmentAlgorithms/python/gather_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import os
 import FWCore.ParameterSet.Config as cms
 

Alignment/MuonAlignmentAlgorithms/scripts/alignCSCRings.py

@@ -1,6 +1,5 @@
 #! /usr/bin/env python3
 
-from __future__ import print_function
 import re,os,sys,shutil
 import optparse
 

Alignment/MuonAlignmentAlgorithms/scripts/alignmentValidation.py

@@ -1,6 +1,5 @@
 #! /usr/bin/env python3
 
-from __future__ import print_function
 from builtins import range
 import re,os,sys,shutil
 import optparse

Alignment/MuonAlignmentAlgorithms/scripts/applyRadialCorrections.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 from builtins import range
 mep11angle = 0.002  # guess
 mep12angle = 0.002  # guess

Alignment/MuonAlignmentAlgorithms/scripts/convertSQLiteXML.py

@@ -1,6 +1,5 @@
 #! /usr/bin/env python3
 
-from __future__ import print_function
 import os, sys, optparse, math
 
 prog = sys.argv[0]

Alignment/MuonAlignmentAlgorithms/scripts/corrVsCorr.py

@@ -1,6 +1,5 @@
 #! /usr/bin/env python3
 
-from __future__ import print_function
 from builtins import range
 import sys, optparse
 

Alignment/MuonAlignmentAlgorithms/scripts/createBeamHaloJobs.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-from __future__ import print_function
 from builtins import range
 import os, sys, re, optparse, math
 

Alignment/MuonAlignmentAlgorithms/scripts/createCSCRingsJobs.py

@@ -1,6 +1,5 @@
 #! /usr/bin/env python3
 
-from __future__ import print_function
 from builtins import range
 import os, sys, optparse, math
 

Alignment/MuonAlignmentAlgorithms/scripts/createJobs.py

@@ -1,6 +1,5 @@
 #! /usr/bin/env python3
 
-from __future__ import print_function
 from builtins import range
 import os, sys, optparse, math
 

Alignment/MuonAlignmentAlgorithms/scripts/createTree.py

@@ -1,6 +1,5 @@
 #! /usr/bin/env python3
 
-from __future__ import print_function
 from builtins import range
 import re,os,sys
 import optparse

Alignment/MuonAlignmentAlgorithms/scripts/diffTwoXMLs.py

@@ -1,6 +1,5 @@
 #! /usr/bin/env python3
 
-from __future__ import print_function
 import sys, ROOT
 ROOT.gROOT.SetBatch(1)
 

Alignment/MuonAlignmentAlgorithms/scripts/findQualityFiles.py

@@ -6,7 +6,6 @@
 ### also run it with -h option
 ######################################################
 
-from __future__ import print_function
 from builtins import range
 import os,sys, DLFCN
 import optparse

Alignment/MuonAlignmentAlgorithms/scripts/geometryDiffVisualizer.py

@@ -1,6 +1,5 @@
 #! /usr/bin/env python3
 
-from __future__ import print_function
 import sys, ROOT
 
 from geometryDiffVisualization import *

Alignment/MuonAlignmentAlgorithms/scripts/groupFilesInBlocks.py

@@ -1,6 +1,5 @@
 #! /usr/bin/env python3
 
-from __future__ import print_function
 from builtins import range
 import re,os,sys,shutil,math
 import optparse

Alignment/MuonAlignmentAlgorithms/scripts/motionPolicyChamber.py

@@ -1,6 +1,5 @@
 #! /usr/bin/env python3
 
-from __future__ import print_function
 from builtins import range
 import os, sys, optparse, math, copy
 from Alignment.MuonAlignment.geometryXMLparser import MuonGeometry, dtorder, cscorder

Alignment/MuonAlignmentAlgorithms/scripts/plotscripts.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 from builtins import range
 import ROOT, array, os, re, random
 from math import *

Alignment/MuonAlignmentAlgorithms/scripts/relativeConstraints.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-from __future__ import print_function
 import sys, optparse, re, math
 from Alignment.MuonAlignment.geometryXMLparser import MuonGeometry
 

Alignment/MuonAlignmentAlgorithms/scripts/reportVsReport.py

@@ -1,6 +1,5 @@
 #! /usr/bin/env python3
 
-from __future__ import print_function
 from builtins import range
 import sys, optparse
 

Alignment/OfflineValidation/python/TkAlAllInOneTool/DiMuonV_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 from fnmatch import fnmatch
 import FWCore.ParameterSet.Config as cms
 import FWCore.PythonUtilities.LumiList as LumiList

Alignment/OfflineValidation/python/TkAlAllInOneTool/betterConfigParser.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-from __future__ import absolute_import
 
 import configparser as ConfigParser
 import os