switch ROOT to batch mode in athena-scripts

Control/AthenaCommon/share/athena.py

@@ -165,6 +165,7 @@ else:
    # Otherwise, ROOT can get shut down before Gaudi, leading to crashes
    # when Athena components dereference ROOT objects that have been deleted.
    import ROOT
+   ROOT.gROOT.SetBatch(True)
 
  # readline support
    import rlcompleter, readline

Control/AthenaCommon/share/athena3.py

@@ -156,6 +156,7 @@ else:
    # Otherwise, ROOT can get shut down before Gaudi, leading to crashes
    # when Athena components dereference ROOT objects that have been deleted.
    import ROOT
+   ROOT.gROOT.SetBatch(True)
 
  # readline support
    import rlcompleter, readline

Control/AthenaConfiguration/python/ComponentAccumulator.py

@@ -608,6 +608,7 @@ class ComponentAccumulator(object):
         # Without this here, pyroot can sometimes get confused
         # and report spurious type mismatch errors about this object.
         import ROOT
+        ROOT.gROOT.SetBatch(True)
         ROOT.Gaudi
 
         appPropsToSet, mspPropsToSet, bshPropsToSet = self.gatherProps(OutputLevel)

Control/AthenaPython/python/Bindings.py

@@ -25,15 +25,8 @@ def _load_dict(lib):
 
 @memoize
 def _import_ROOT():
-    # FIXME: work-around ROOT's silly behaviour wrt graphics libraries
-    # see: https://savannah.cern.ch/bugs/?35461
-    import os
-    orig_display=os.environ.get('DISPLAY',None)
     import ROOT
-    if orig_display:
-        os.environ['DISPLAY'] = orig_display
-    del orig_display
-
+    ROOT.gROOT.SetBatch(True)
     return ROOT
     
 ### data ----------------------------------------------------------------------

Control/AthenaPython/python/FilePeekerLib.py

@@ -20,10 +20,8 @@ import six
 
 ### helper functions ----------------------------------------------------------
 def _import_ROOT():
-    import sys
-    sys.argv.insert(1, '-b')
     import ROOT
-    del sys.argv[1]
+    ROOT.gROOT.SetBatch(True)
     return ROOT
 
 ### ---

Control/DataModelTest/DataModelRunTests/share/loadReadDicts.py

@@ -18,6 +18,7 @@ from AthenaPython.PyAthenaComps import Alg, StatusCode
 class LoadReadDicts (Alg):
     def initialize (self):
         import ROOT
+        ROOT.gROOT.SetBatch(True)
         import cppyy
         cppyy.load_library("libDataModelTestDataCommonDict")
         cppyy.load_library("libDataModelTestDataReadDict")

Control/DataModelTest/DataModelRunTests/share/loadWriteDicts.py

@@ -18,6 +18,7 @@ from AthenaPython.PyAthenaComps import Alg, StatusCode
 class LoadWriteDicts (Alg):
     def initialize (self):
         import ROOT
+        ROOT.gROOT.SetBatch(True)
         import cppyy
         cppyy.load_library("libDataModelTestDataCommonDict")
         cppyy.load_library("libDataModelTestDataWriteDict")