AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/AthenaPoolMultiTestEventSplit.ref

@@ -41,7 +41,7 @@ DecisionSvc          INFO Inserting stream: Bad with no Algs
 Bad.BadTool          INFO Initializing Bad.BadTool - package version AthenaServices-00-00-00
 Bad.Bad_MakeEve...   INFO Initializing Bad.Bad_MakeEventStreamInfo - package version OutputStreamAthenaPool-00-00-00
 Bad                  INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/Bad_MakeEventStreamInfo','xAODMaker::EventFormatStreamHelperTool/Bad_MakeEventFormat','xAODMaker::FileMetaDataCreatorTool/FileMetaDataCreatorTool','Athena::ThinningCacheTool/ThinningCacheTool_Bad'])
-Bad                  INFO Data output: AthenaPoolMultiTest_Missed.root
+Bad                  INFO Data output: AthenaPoolMultiTest_Bad.root
 Bad                  INFO I/O reinitialization...
 Stream2.FileMet...   INFO Invalid "/TagInfo" handle
 Stream1.FileMet...   INFO Invalid "/TagInfo" handle
@@ -297,18 +297,9 @@ Stream2              INFO Metadata records written: 8
 Stream1              INFO Metadata records written: 8
 Stream3              INFO Metadata records written: 6
 Others               INFO Metadata records written: 2
+Domain[ROOT_All]     INFO                           AthenaPoolMultiTest_Bad.root
+RootDatabase.open    INFO AthenaPoolMultiTest_Bad.root File version:62200
 Bad                  INFO Metadata records written: 1
-MetaData(EventS...  ERROR Every branch must have the same number of entries.
-MetaData(EventS...  ERROR Every branch must have the same number of entries.
-MetaData(xAOD::...  ERROR Every branch must have the same number of entries.
-MetaData(xAOD::...  ERROR Every branch must have the same number of entries.
-PersistencySvc::GlobalTransaction Error Could not commit the transaction for the database with
-PersistencySvc::GlobalTransaction Error FID = C7FBD6B6-27C3-D444-9C05-9696E650C80A
-PersistencySvc::GlobalTransaction Error PFN = AthenaPoolMultiTest_Missed.root
-PoolSvc             ERROR POOL commit failed 0x1c95f8d0
-PoolSvc             ERROR disconnect failed to commit 0x1c95f8d0
-PoolSvc             FATAL Cannot disconnect Stream: 4
-ServiceManager      ERROR Unable to stop Service: PoolSvc
 Splitter1            INFO in finalize()
 Splitter2            INFO in finalize()
 Splitter3            INFO in finalize()

AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/EventSplit_jo.py

@@ -106,7 +106,7 @@ Stream3.CheckNumberOfWrites = False
 Others  = AthenaPoolOutputStream( "Others", "AthenaPoolMultiTest_Missed.root", False, noTag=False )
 Others.CheckNumberOfWrites = False
 # Events that failed at least one filter
-Bad     = AthenaPoolOutputStream( "Bad", "AthenaPoolMultiTest_Missed.root", False, noTag=False )
+Bad     = AthenaPoolOutputStream( "Bad", "AthenaPoolMultiTest_Bad.root", False, noTag=False )
 Bad.CheckNumberOfWrites = False
 
 # Configure them using filter methods and itemlist

AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/post_check_es.sh

@@ -38,7 +38,8 @@ else
              grep -v 'PoolXMLFileCatalog' |\
              grep -v 'AthenaSealSvc' |\
              grep -v 'EventBookkeeper' |\
-             grep -v 'EventTagWriter' > ${joblog}.small
+             grep -v 'EventTagWriter' |\
+             grep -v 'Py:ConfigurableDb' > ${joblog}.small
 	joblog=${joblog}.small
 	if [ -r $reflog ]
 	    then

AtlasTest/DatabaseTest/AthenaPoolMultiTest/test/post_check_p.sh

@@ -40,7 +40,8 @@ else
              grep -v 'PoolXMLFileCatalog' |\
              grep -v 'AthenaSealSvc' |\
              grep -v 'EventBookkeeper' |\
-             grep -v 'EventTagWriter' > ${joblog}.small
+             grep -v 'EventTagWriter' |\
+             grep -v 'Py:ConfigurableDb' > ${joblog}.small
 	joblog=${joblog}.small
 	if [ -r $reflog ]
 	    then

Calorimeter/CaloExample/CaloTests/src/MyAnalysis.cxx

@@ -612,12 +612,10 @@ namespace MyAnalysis {
          McEventCollection::const_iterator itr;
          for (itr = mcCollptr->begin(); itr!=mcCollptr->end(); ++itr) 
          {
-          HepMC::GenEvent::particle_const_iterator itrPart;
-          for (itrPart = (*itr)->particles_begin(); itrPart!=(*itr)->particles_end(); ++itrPart )
+          for (auto part: *(*itr))
           {
-          HepMC::GenParticle *part=*itrPart;
-           if(  (abs(part->pdg_id())==11 || part->pdg_id()==22 || part->pdg_id()==13
-                || (abs(part->pdg_id())==211) )
+           if(  (std::abs(part->pdg_id())==11 || part->pdg_id()==22 || part->pdg_id()==13
+                || (std::abs(part->pdg_id())==211) )
                 && part->momentum().e()> 5000.)
            {
              nn++;
@@ -627,7 +625,7 @@ namespace MyAnalysis {
                phi_true = part->momentum().phi();
                ATH_MSG_INFO( " true particle found " << part->pdg_id() << " " <<
                              e_true << " " << eta_true << " " << phi_true  );
-               HepMC::GenVertex* vertex = part->end_vertex();
+               auto vertex = part->end_vertex();
                if (vertex) {
                   m_xconv = vertex->position().x();
                   m_yconv = vertex->position().y();

Control/AthenaConfiguration/python/AllConfigFlags.py

@@ -53,6 +53,7 @@ def _createCfgFlags():
     acf.addFlag('Scheduler.ShowDataDeps', True)
     acf.addFlag('Scheduler.ShowDataFlow', True)
     acf.addFlag('Scheduler.ShowControlFlow', True)
+    acf.addFlag('Scheduler.EnableVerboseViews', True)
 
     acf.addFlag('Common.isOnline', False ) #  Job runs in an online environment (access only to resources available at P1) # former global.isOnline
     acf.addFlag('Common.useOnlineLumi', lambda prevFlags : prevFlags.Common.isOnline ) #  Use online version of luminosity. ??? Should just use isOnline?

Control/AthenaConfiguration/python/MainServicesConfig.py

@@ -116,6 +116,7 @@ def MainServicesCfg(cfgFlags, LoopMgr='AthenaEventLoopMgr'):
         scheduler.ShowDataDependencies = cfgFlags.Scheduler.ShowDataDeps
         scheduler.ShowDataFlow         = cfgFlags.Scheduler.ShowDataFlow
         scheduler.ShowControlFlow      = cfgFlags.Scheduler.ShowControlFlow
+        scheduler.VerboseSubSlots      = cfgFlags.Scheduler.EnableVerboseViews
         scheduler.ThreadPoolSize       = cfgFlags.Concurrency.NumThreads
         cfg.addService(scheduler)
 

Control/RootUtils/CMakeLists.txt

@@ -10,6 +10,7 @@ find_package( ROOT COMPONENTS RIO Hist Tree Core MathCore ROOTTPython
    cppyy${Python_VERSION_MAJOR}_${Python_VERSION_MINOR} )
 
 set( ROOT_LIBRARIES_PYROOT ${ROOT_LIBRARIES} )
+unset( ROOT_FOUND )
 find_package( ROOT COMPONENTS RIO Hist Tree Core MathCore )
 
 # Component(s) in the package:

DataQuality/DataQualityConfigurations/CMakeLists.txt

@@ -4,7 +4,7 @@
 atlas_subdir( DataQualityConfigurations )
 
 # Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
 atlas_install_scripts( scripts/MergeConfigs.py scripts/UploadDQAMITag.py
    scripts/merge_all_han_configs.sh scripts/merge_some_han_configs.sh
    scripts/han-config-indent.sh scripts/han-config-check.sh

DataQuality/DataQualityConfigurations/python/DQCDispatch.py

-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # This holds the method that returns an appropriate DataQualityConfiguration
 # module for the specified input string
@@ -53,11 +53,11 @@ def getmodule(modname):
 
     import re
     # Does it look like datann_hip?
-    m = re.match('data\d{2}_hip', modname)
+    m = re.match(r'data\d{2}_hip', modname)
     if m:
         from . import base_data_hi; return base_data_hi
     # Does it look like datann?
-    m = re.match('data\d{2}$', modname)
+    m = re.match(r'data\d{2}$', modname)
     if m:
         from . import base_data; return base_data
 

DataQuality/DataQualityConfigurations/python/__init__.py

-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Hook for the DataQualityConfigurations package
-__all__ = ['data09', 'data09_1beam','data09_calocomm', 'data09_calophys',
-           'data09_cos', 'data09_idcomm', 'data09_larcomm', 'data09_muoncomm',
-           'data09_tilecomm', 'data08', 'data08_1beam', 'data08_1beammag',
-           'data08_cos', 'data08_cosmag', 'data08_idcomm', 'TestDisplay']
-from .DQCDispatch import getmodule
+__all__ = ['TestDisplay']
+from .DQCDispatch import getmodule  # noqa: F401

DataQuality/DataQualityConfigurations/python/_resolve_data_path.py

+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 import os
 import logging
 logging.basicConfig()

DataQuality/DataQualityConfigurations/python/data08.py

-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-
-from DataQualityUtils.DQWebDisplayConfig import DQWebDisplayConfig
-
-dqconfig = DQWebDisplayConfig()
-dqconfig.config         = "data08"
-dqconfig.hcfg           = "/afs/cern.ch/user/a/atlasdqm/dqmdisk/tier0/han_config/Collisions/collisions_run.1.63.hcfg"
-dqconfig.hcfg_min10     = "/afs/cern.ch/user/a/atlasdqm/dqmdisk/tier0/han_config/Collisions/collisions_minutes10.1.18.hcfg"
-dqconfig.hcfg_min30     = "/afs/cern.ch/user/a/atlasdqm/dqmdisk/tier0/han_config/Collisions/collisions_minutes30.1.6.hcfg"
-dqconfig.server         = "voatlas12.cern.ch"
-dqconfig.histogramCache = "/afs/cern.ch/user/a/atlasdqm/w1/histogram_web_display_cache"
-dqconfig.hanResultsDir  = "/dqmdisk0/han_results/tier0/all"
-dqconfig.htmlDir        = "/dqmdisk0/www/tier0/data08"
-dqconfig.htmlWeb        = "http://atlasdqm.cern.ch/tier0/data08"
-dqconfig.runlist        = "runlist_data08.xml"
-dqconfig.indexFile      = "results_data08.html"
-dqconfig.lockFile       = "DQWebDisplay_data08.lock"
-#dqconfig.dbConnection       = "oracle://ATLAS_COOLWRITE;schema=ATLAS_COOLOFL_GLOBAL;dbname=COMP200;"
-#dqconfig.dqmfOfl            = "/GLOBAL/DETSTATUS/DQMFOFL"
-#dqconfig.dbConnectionHisto  = "oracle://ATLAS_COOLWRITE;schema=ATLAS_COOLOFL_GLOBAL;dbname=COMP200;"
-#dqconfig.dqmfOflHisto       = "/GLOBAL/DETSTATUS/DQMFOFLH"
-#dqconfig.dbTagName          = "HEAD"
-
-#authentication file at Tier0 (uncomment this option at Tier0 only)
-#dqconfig.auth       = "/afs/cern.ch/atlas/project/tzero/var"

DataQuality/DataQualityConfigurations/python/data08_1beam.py

-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data09_cos import *

DataQuality/DataQualityConfigurations/python/data08_1beammag.py

-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data09_cos import *

DataQuality/DataQualityConfigurations/python/data08_coll900.py

-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-
-from DataQualityUtils.DQWebDisplayConfig import DQWebDisplayConfig
-
-dqconfig = DQWebDisplayConfig()
-dqconfig.config         = "data08_coll900"
-dqconfig.hcfg           = "/afs/cern.ch/user/a/atlasdqm/dqmdisk/tier0/han_config/Collisions/collisions_run.1.36.hcfg"
-dqconfig.hcfg_min10     = "/afs/cern.ch/user/a/atlasdqm/dqmdisk/tier0/han_config/Collisions/collisions_minutes10.1.9.hcfg"
-dqconfig.hcfg_min30     = "/afs/cern.ch/user/a/atlasdqm/dqmdisk/tier0/han_config/Collisions/collisions_minutes30.1.5.hcfg"
-dqconfig.server         = "voatlas12.cern.ch"
-dqconfig.histogramCache = "/afs/cern.ch/user/a/atlasdqm/w1/histogram_web_display_cache"
-dqconfig.hanResultsDir  = "/dqmdisk0/han_results/tier0/NotUsed"
-dqconfig.htmlDir        = "/dqmdisk0/www/tier0/data08_coll900"
-dqconfig.htmlWeb        = "http://atlasdqm.cern.ch/tier0/data08_coll900"
-dqconfig.runlist        = "runlist_data08_coll900.xml"
-dqconfig.indexFile      = "results_data08_coll900.html"
-dqconfig.lockFile       = "DQWebDisplay_data08_coll900.lock"
-#dqconfig.dbConnection       = "oracle://ATLAS_COOLWRITE;schema=ATLAS_COOLOFL_GLOBAL;dbname=COMP200;"
-#dqconfig.dqmfOfl            = "/GLOBAL/DETSTATUS/DQMFOFL"
-#dqconfig.dbConnectionHisto  = "oracle://ATLAS_COOLWRITE;schema=ATLAS_COOLOFL_GLOBAL;dbname=COMP200;"
-#dqconfig.dqmfOflHisto       = "/GLOBAL/DETSTATUS/DQMFOFLH"
-#dqconfig.dbTagName          = "HEAD"
-
-#authentication file at Tier0 (uncomment this option at Tier0 only)
-#dqconfig.auth       = "/afs/cern.ch/atlas/project/tzero/var"

DataQuality/DataQualityConfigurations/python/data08_cos.py

-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data09_cos import *

DataQuality/DataQualityConfigurations/python/data08_cosmag.py

-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data09_cos import *

DataQuality/DataQualityConfigurations/python/data08_idcomm.py

-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from data09_cos import *

DataQuality/DataQualityConfigurations/python/data09.py

-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# -*- coding: utf-8 -*-
-from base_data import *