Merge branch 'master' into dtCalibUpdates2019

Alignment/CocoaDaq/src/CocoaDaqRootEvent.cc

@@ -12,13 +12,13 @@
 #include <iostream>
 #include "Alignment/CocoaDaq/interface/CocoaDaqRootEvent.h"
 
-ClassImp(AliDaqEventHeader)
-ClassImp(AliDaqPosition2D)
-ClassImp(AliDaqPositionCOPS)
-ClassImp(AliDaqTilt)
-ClassImp(AliDaqDistance)
-ClassImp(AliDaqTemperature)
-ClassImp(CocoaDaqRootEvent)
+ClassImp(AliDaqEventHeader);
+ClassImp(AliDaqPosition2D);
+ClassImp(AliDaqPositionCOPS);
+ClassImp(AliDaqTilt);
+ClassImp(AliDaqDistance);
+ClassImp(AliDaqTemperature);
+ClassImp(CocoaDaqRootEvent);
 
 //-----------------------------------------------------------------------------
 CocoaDaqRootEvent::CocoaDaqRootEvent()

Alignment/CocoaFit/src/NtupleObjects.cc

@@ -6,13 +6,13 @@
 //   Luca Scodellaro
 #include "Alignment/CocoaFit/interface/NtupleObjects.h"
 
-ClassImp(FitParam)
-ClassImp(OptObject)
-ClassImp(Sensor2DMeas)
-ClassImp(DistancemeterMeas) 
-ClassImp(Distancemeter1DimMeas)
-ClassImp(TiltmeterMeas)
-ClassImp(CopsMeas)  
+ClassImp(FitParam);
+ClassImp(OptObject);
+ClassImp(Sensor2DMeas);
+ClassImp(DistancemeterMeas); 
+ClassImp(Distancemeter1DimMeas);
+ClassImp(TiltmeterMeas);
+ClassImp(CopsMeas);  
 
 FitParam::FitParam() {
   Name = "Null";

Alignment/CommonAlignment/python/tools/dataset.py

@@ -1,4 +1,5 @@
 from __future__ import print_function
+from __future__ import absolute_import
 
 import abc
 import csv
@@ -7,7 +8,7 @@
 
 import Utilities.General.cmssw_das_client as das_client
 
-from utilities import cache
+from .utilities import cache
 
 class DatasetError(Exception): pass
 

Alignment/MillePedeAlignmentAlgorithm/macros/GFUtils/GFHistArray.C

@@ -11,7 +11,7 @@
 
 #include "GFHistArray.h"
 
-ClassImp(GFHistArray)
+ClassImp(GFHistArray);
 
 GFHistArray::GFHistArray(Int_t initCapacity, Int_t lowerBound) 
   : TObjArray(initCapacity, lowerBound)

Alignment/MillePedeAlignmentAlgorithm/macros/GFUtils/GFHistManager.C

@@ -31,7 +31,7 @@
 #include "GFHistManager.h"
 #include "GFUtils/GFHistArray.h"
 
-ClassImp(GFHistManager)
+ClassImp(GFHistManager);
 
 const Int_t GFHistManager::kDefaultPadsPerCanX = 1;
 const Int_t GFHistManager::kDefaultPadsPerCanY = 1;

Alignment/MillePedeAlignmentAlgorithm/python/alignmentsetup/MilleSetup.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import FWCore.ParameterSet.Config as cms
 
 
@@ -50,7 +51,7 @@ def setup(process, input_files, collection,
                       "ALCARECOTkAlCosmicsInCollisions"):
         process.load("Alignment.CommonAlignment.apvModeFilter_cfi")
         process.apvModeFilter.apvMode = "deco" if cosmics_deco_mode else "peak"
-        import helper
+        from . import helper
         helper.add_filter(process, process.apvModeFilter)
 
 

Alignment/MillePedeAlignmentAlgorithm/templates/universalConfigTemplate.py

@@ -267,6 +267,10 @@
 # # a list of possible options is documented here:
 # # http://www.desy.de/~kleinwrt/MP2/doc/html/option_page.html#sec-cmd
 # #
+# # if you need to request a larger stack size for individual threads when
+# # running pede, you can do this with this setting: 
+# # process.AlignmentProducer.algoConfig.pedeSteerer.pedeCommand = "export OMP_STACKSIZE=20M; pede"
+# #
 # # you can change or drop pede options as follows:
 #
 # import Alignment.MillePedeAlignmentAlgorithm.alignmentsetup.helper as helper

Alignment/MuonAlignment/python/geometryDiffVisualization.py

@@ -1,7 +1,8 @@
+from __future__ import absolute_import
 import re
 from math import *
-from svgfig import rgb, SVG, pathtoPath, load as load_svg
-from geometryXMLparser import *
+from .svgfig import rgb, SVG, pathtoPath, load as load_svg
+from .geometryXMLparser import *
 from signConventions import *
 
 def dt_colors(wheel, station, sector):

Alignment/OfflineValidation/python/TkAlAllInOneTool/alignment.py

@@ -1,10 +1,11 @@
+from __future__ import absolute_import
 import collections
 import os
 import re
 
-import configTemplates
-from helperFunctions import conddb, parsecolor, parsestyle, replaceByMap, clean_name
-from TkAlExceptions import AllInOneError
+from . import configTemplates
+from .helperFunctions import conddb, parsecolor, parsestyle, replaceByMap, clean_name
+from .TkAlExceptions import AllInOneError
 import six
 
 class Alignment(object):

Alignment/OfflineValidation/python/TkAlAllInOneTool/betterConfigParser.py

@@ -1,10 +1,11 @@
 from __future__ import print_function
+from __future__ import absolute_import
 import ConfigParser
 import os
 import re
 import copy
 import collections
-from TkAlExceptions import AllInOneError
+from .TkAlExceptions import AllInOneError
 
 
 class AdaptedDict(collections.OrderedDict):
@@ -158,7 +159,7 @@ def getGeneral( self ):
             "datadir":os.getcwd(),
             "logdir":os.getcwd(),
             }
-	mandatories = [
+        mandatories = [
             "eosdir",
         ]
         self.checkInput("general", knownSimpleOptions = defaults.keys() + mandatories)

Alignment/OfflineValidation/python/TkAlAllInOneTool/configTemplates.py

@@ -1,11 +1,12 @@
-from alternateValidationTemplates import *
-from offlineValidationTemplates import *
-from primaryVertexValidationTemplates import *
-from geometryComparisonTemplates import *
-from monteCarloValidationTemplates import *
-from trackSplittingValidationTemplates import *
-from zMuMuValidationTemplates import *
-from TkAlExceptions import AllInOneError
+from __future__ import absolute_import
+from .alternateValidationTemplates import *
+from .offlineValidationTemplates import *
+from .primaryVertexValidationTemplates import *
+from .geometryComparisonTemplates import *
+from .monteCarloValidationTemplates import *
+from .trackSplittingValidationTemplates import *
+from .zMuMuValidationTemplates import *
+from .TkAlExceptions import AllInOneError
 
 ######################################################################
 ######################################################################

Alignment/OfflineValidation/python/TkAlAllInOneTool/crabWrapper.py

@@ -1,8 +1,9 @@
 from __future__ import print_function
+from __future__ import absolute_import
 import sys
 import os
 import subprocess
-from TkAlExceptions import AllInOneError
+from .TkAlExceptions import AllInOneError
 
 # script which needs to be sourced for use of crab
 crabSourceScript = '/afs/cern.ch/cms/ccs/wm/scripts/Crab/crab.sh'

Alignment/OfflineValidation/python/TkAlAllInOneTool/dataset.py

@@ -1,4 +1,5 @@
 from __future__ import print_function
+from __future__ import absolute_import
 # idea stolen from:
 # http://cmssw.cvs.cern.ch/cgi-bin/cmssw.cgi/CMSSW/
 #        PhysicsTools/PatAlgos/python/tools/cmsswVersionTools.py
@@ -12,8 +13,8 @@
 import Utilities.General.cmssw_das_client as das_client
 from FWCore.PythonUtilities.LumiList import LumiList
 
-from helperFunctions import cache
-from TkAlExceptions import AllInOneError
+from .helperFunctions import cache
+from .TkAlExceptions import AllInOneError
 
 class Dataset(object):
     def __init__( self, datasetName, dasLimit = 0, tryPredefinedFirst = True,

Alignment/OfflineValidation/python/TkAlAllInOneTool/genericValidation.py

@@ -1,13 +1,14 @@
 from __future__ import print_function
+from __future__ import absolute_import
 from abc import ABCMeta, abstractmethod, abstractproperty
 import os
 import re
 import json
-import globalDictionaries
-import configTemplates
-from dataset import Dataset
-from helperFunctions import replaceByMap, addIndex, getCommandOutput2, boolfromstring, pythonboolstring
-from TkAlExceptions import AllInOneError
+from . import globalDictionaries
+from . import configTemplates
+from .dataset import Dataset
+from .helperFunctions import replaceByMap, addIndex, getCommandOutput2, boolfromstring, pythonboolstring
+from .TkAlExceptions import AllInOneError
 
 class ValidationMetaClass(ABCMeta):
     sets = ["mandatories", "optionals", "needpackages"]
@@ -133,7 +134,7 @@ def __init__(self, valName, alignment, config):
                           ignoreOptions = ignoreOpts)
 
     def getRepMap(self, alignment = None):
-        from plottingOptions import PlottingOptions
+        from .plottingOptions import PlottingOptions
         if alignment == None:
             alignment = self.alignmentToValidate
         try:
@@ -517,7 +518,7 @@ class GenericValidationData_CTSR(GenericValidationData):
     def getRepMap(self, alignment=None):
         result = super(GenericValidationData_CTSR, self).getRepMap(alignment)
 
-        from trackSplittingValidation import TrackSplittingValidation
+        from .trackSplittingValidation import TrackSplittingValidation
         result.update({
             "ValidationSequence": self.ValidationSequence,
             "istracksplitting": str(isinstance(self, TrackSplittingValidation)),
@@ -577,7 +578,7 @@ def appendToMerge(self):
 
     @classmethod
     def doInitMerge(cls):
-        from plottingOptions import PlottingOptions
+        from .plottingOptions import PlottingOptions
         result = cls.initMerge()
         result = replaceByMap(result, PlottingOptions(None, cls))
         if result and result[-1] != "\n": result += "\n"
@@ -614,15 +615,15 @@ def plotsdirname(cls):
 
     @classmethod
     def doRunPlots(cls, validations):
-        from plottingOptions import PlottingOptions
+        from .plottingOptions import PlottingOptions
         cls.createPlottingScript(validations)
         result = cls.runPlots(validations)
         result = replaceByMap(result, PlottingOptions(None, cls))
         if result and result[-1] != "\n": result += "\n"
         return result
     @classmethod
     def createPlottingScript(cls, validations):
-        from plottingOptions import PlottingOptions
+        from .plottingOptions import PlottingOptions
         repmap = PlottingOptions(None, cls).copy()
         filename = replaceByMap(".oO[plottingscriptpath]Oo.", repmap)
         repmap["PlottingInstantiation"] = "\n".join(
@@ -770,7 +771,7 @@ def getsummaryitems(cls, folder):
 class ValidationWithComparison(GenericValidation):
     @classmethod
     def doComparison(cls, validations):
-        from plottingOptions import PlottingOptions
+        from .plottingOptions import PlottingOptions
         repmap = PlottingOptions(None, cls).copy()
         repmap["compareStrings"] = " , ".join(v.getCompareStrings("OfflineValidation") for v in validations)
         repmap["compareStringsPlain"] = " , ".join(v.getCompareStrings("OfflineValidation", True) for v in validations)

Alignment/OfflineValidation/python/TkAlAllInOneTool/geometryComparison.py

@@ -1,9 +1,10 @@
+from __future__ import absolute_import
 import os
 import ConfigParser # needed for exceptions in this module
-import configTemplates
-from genericValidation import GenericValidation
-from helperFunctions import replaceByMap, getCommandOutput2, cppboolstring, pythonboolstring, clean_name
-from TkAlExceptions import AllInOneError
+from . import configTemplates
+from .genericValidation import GenericValidation
+from .helperFunctions import replaceByMap, getCommandOutput2, cppboolstring, pythonboolstring, clean_name
+from .TkAlExceptions import AllInOneError
 
 
 class GeometryComparison(GenericValidation):

Alignment/OfflineValidation/python/TkAlAllInOneTool/helperFunctions.py

@@ -1,9 +1,10 @@
 from __future__ import print_function
+from __future__ import absolute_import
 import os
 import re
 import ROOT
 import sys
-from TkAlExceptions import AllInOneError
+from .TkAlExceptions import AllInOneError
 import six
 
 ####################--- Helpers ---############################

Alignment/OfflineValidation/python/TkAlAllInOneTool/monteCarloValidation.py

@@ -1,10 +1,11 @@
+from __future__ import absolute_import
 import os
-import configTemplates
-import globalDictionaries
-from dataset import Dataset
-from genericValidation import GenericValidationData
-from helperFunctions import replaceByMap
-from TkAlExceptions import AllInOneError
+from . import configTemplates
+from . import globalDictionaries
+from .dataset import Dataset
+from .genericValidation import GenericValidationData
+from .helperFunctions import replaceByMap
+from .TkAlExceptions import AllInOneError
 
 
 class MonteCarloValidation(GenericValidationData):

Alignment/OfflineValidation/python/TkAlAllInOneTool/offlineValidation.py

@@ -1,10 +1,11 @@
+from __future__ import absolute_import
 import os
-import configTemplates
-import globalDictionaries
-from genericValidation import GenericValidationData_CTSR, ParallelValidation, ValidationWithComparison, ValidationForPresentation, ValidationWithPlots, ValidationWithPlotsSummary
-from helperFunctions import replaceByMap, addIndex, pythonboolstring
-from presentation import SubsectionFromList, SubsectionOnePage
-from TkAlExceptions import AllInOneError
+from . import configTemplates
+from . import globalDictionaries
+from .genericValidation import GenericValidationData_CTSR, ParallelValidation, ValidationWithComparison, ValidationForPresentation, ValidationWithPlots, ValidationWithPlotsSummary
+from .helperFunctions import replaceByMap, addIndex, pythonboolstring
+from .presentation import SubsectionFromList, SubsectionOnePage
+from .TkAlExceptions import AllInOneError
 
 class OfflineValidation(GenericValidationData_CTSR, ParallelValidation, ValidationWithComparison, ValidationWithPlotsSummary, ValidationForPresentation):
     configBaseName = "TkAlOfflineValidation"
@@ -92,7 +93,7 @@ def appendToPlots(self):
 
     @classmethod
     def initMerge(cls):
-        from plottingOptions import PlottingOptions
+        from .plottingOptions import PlottingOptions
         outFilePath = replaceByMap(".oO[scriptsdir]Oo./TkAlOfflineJobsMerge.C", PlottingOptions(None, cls.valType))
         with open(outFilePath, "w") as theFile:
             theFile.write(replaceByMap(configTemplates.mergeOfflineParJobsTemplate, {}))

Alignment/OfflineValidation/python/TkAlAllInOneTool/plottingOptions.py

@@ -1,16 +1,17 @@
+from __future__ import absolute_import
 import os
 import random
 
-import globalDictionaries
-import configTemplates
+from . import globalDictionaries
+from . import configTemplates
 
-from genericValidation import ValidationMetaClass, ValidationWithComparison, ValidationWithPlots
-from helperFunctions import getCommandOutput2, replaceByMap, cppboolstring
-from offlineValidation import OfflineValidation
-from primaryVertexValidation import PrimaryVertexValidation
-from TkAlExceptions import AllInOneError
-from trackSplittingValidation import TrackSplittingValidation
-from zMuMuValidation import ZMuMuValidation
+from .genericValidation import ValidationMetaClass, ValidationWithComparison, ValidationWithPlots
+from .helperFunctions import getCommandOutput2, replaceByMap, cppboolstring
+from .offlineValidation import OfflineValidation
+from .primaryVertexValidation import PrimaryVertexValidation
+from .TkAlExceptions import AllInOneError
+from .trackSplittingValidation import TrackSplittingValidation
+from .zMuMuValidation import ZMuMuValidation
 
 class BasePlottingOptions(object):
     __metaclass__ = ValidationMetaClass

Alignment/OfflineValidation/python/TkAlAllInOneTool/preexistingValidation.py

@@ -1,14 +1,15 @@
+from __future__ import absolute_import
 import os
-from genericValidation import GenericValidation, GenericValidationData
-from geometryComparison import GeometryComparison
-from helperFunctions import boolfromstring, getCommandOutput2, parsecolor, parsestyle
-from monteCarloValidation import MonteCarloValidation
-from offlineValidation import OfflineValidation
-from primaryVertexValidation import PrimaryVertexValidation
-from plottingOptions import PlottingOptions
-from TkAlExceptions import AllInOneError
-from trackSplittingValidation import TrackSplittingValidation
-from zMuMuValidation import ZMuMuValidation
+from .genericValidation import GenericValidation, GenericValidationData
+from .geometryComparison import GeometryComparison
+from .helperFunctions import boolfromstring, getCommandOutput2, parsecolor, parsestyle
+from .monteCarloValidation import MonteCarloValidation
+from .offlineValidation import OfflineValidation
+from .primaryVertexValidation import PrimaryVertexValidation
+from .plottingOptions import PlottingOptions
+from .TkAlExceptions import AllInOneError
+from .trackSplittingValidation import TrackSplittingValidation
+from .zMuMuValidation import ZMuMuValidation
 
 class PreexistingValidation(GenericValidation):
     """