Externals Update, master branch (2020.03.30.)

Updated all projects to atlasexternals-2.0.61.

Changes wrt. atlasexternals-2.0.60 are (atlasexternals@2.0.60...2.0.61):

• Added new checks and warnings to CheckerGccPlugins (cc. @ssnyder);
• Updated the versions of GeoModelCore, GeoModelIO and GeoModelTools (cc. @rbianchi, @boudreau);
  • Re-enabled the build of GeoModelTools in AthenaExternals at the same time.

The GeoModel updates are meant to fix the issue described in ATLASDD-35 and ATLASSIM-4477. They necessitated some changes in GeoSpecialShapes and VP1Utils, as explained in the discussion of the MR.

added bugfix label

This merge request affects 6 packages:

• Projects/AnalysisBase
• Projects/AthDataQuality
• Projects/AthGeneration
• Projects/AthSimulation
• Projects/Athena
• Projects/VP1Light

Adding @krumnack ,@jchapman ,@vpascuzz ,@rbianchi as watchers

added Build master review-pending-level-1 labels

Should also fix ATLASSIM-4477

changed the description

resolved all threads

CI Result FAILURE (hash e37f01fb)

	Athena	AthSimulation	AnalysisBase
externals
cmake
make
required tests
optional tests

Full details available on this CI monitor view
Athena: number of compilation errors 1, warnings 0
AthSimulation: number of compilation errors 1, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 11646]

Okay, so how do we deal with this?

http://atlas-computing.web.cern.ch/atlas-computing/links/distDirectory/ci/CIWebArea/nicos_web_areaMRCIbuilds64BC7G8AthSimulationOpt/NICOS_Log_MR-31618-2020-03-30-18-24/DetectorDescription_GeoModel_GeoSpecialShapes.html

# CMake ---> /cvmfs/sft.cern.ch/lcg/releases/gcc/8.3.0-cebb0/x86_64-centos7/bin/g++ -DATLAS_GAUDI_V21 -DCLHEP_ABS_DEFINED -DCLHEP_MAX_MIN_DEFINED -DCLHEP_SQR_DEFINED -DGAUDI_V20_COMPAT -DGeoSpecialShapes_EXPORTS -DHAVE_64_BITS -DHAVE_GAUDI_PLUGINSVC -DPACKAGE_VERSION="GeoSpecialShapes-00-00-00" -DPACKAGE_VERSION_UQ=GeoSpecialShapes-00-00-00 -DSIMULATIONBASE -D__IDENTIFIER_64BIT__ -I/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/Control/CxxUtils -I/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/Database/RDBAccessSvc -I/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/DetectorDescription/GeoModel/GeoModelInterfaces -I/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/Control/AthenaKernel -I/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/Control/DataModelRoot -I/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/Control/RootUtils -I/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/DetectorDescription/GeoModel/GeoModelUtilities -I/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/Control/AthenaBaseComps -I/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/Control/StoreGate -I/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/Control/AthAllocators -I/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/Control/AthContainersInterfaces -I/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/Control/AthContainers -I/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/Control/SGTools -I/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/Database/PersistentDataModel -I/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/Event/xAOD/xAODEventInfo -I/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/Control/AthLinks -I/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/Event/xAOD/xAODCore -I/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/AtlasTest/TestTools -I/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/DetectorDescription/GeoModel/GeoSpecialShapes -isystem /build2/ci-builds/master/AthSimulation/install/GAUDI/22.0.12/InstallArea/x86_64-centos7-gcc8-opt/include -isystem /cvmfs/sft.cern.ch/lcg/releases/LCG_96/Boost/1.70.0/x86_64-centos7-gcc8-opt/include -isystem /cvmfs/sft.cern.ch/lcg/releases/LCG_96/CORAL/3_2_1/x86_64-centos7-gcc8-opt/include -isystem /cvmfs/sft.cern.ch/lcg/releases/LCG_96/ROOT/6.18.00/x86_64-centos7-gcc8-opt/include -isystem /build2/ci-builds/master/AthSimulation/install/AthSimulationExternals/22.0.12/InstallArea/x86_64-centos7-gcc8-opt/include -isystem /cvmfs/sft.cern.ch/lcg/releases/LCG_96/Python/2.7.16/x86_64-centos7-gcc8-opt/include/python2.7 -isystem /cvmfs/sft.cern.ch/lcg/releases/LCG_96/tbb/2019_U7/x86_64-centos7-gcc8-opt/include -isystem /cvmfs/sft.cern.ch/lcg/releases/LCG_96/eigen/3.3.7/x86_64-centos7-gcc8-opt/include/eigen3 -DNDEBUG -O2 -Wall -Wno-long-long -Wno-deprecated -Wno-unused-local-typedefs -Wwrite-strings -Wpointer-arith -Woverloaded-virtual -Wextra -Werror=return-type -pedantic -fPIC -pthread -std=c++17 -o CMakeFiles/GeoSpecialShapes.dir/src/LArCustomShape.cxx.o -c /var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/DetectorDescription/GeoModel/GeoSpecialShapes/src/LArCustomShape.cxx
/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/DetectorDescription/GeoModel/GeoSpecialShapes/src/LArCustomShape.cxx: In member function 'virtual void LArCustomShape::exec(GeoShapeAction*) const':
/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/DetectorDescription/GeoModel/GeoSpecialShapes/src/LArCustomShape.cxx:190:11: error: 'class GeoShapeAction' has no member named 'handleLArCustom'; did you mean 'handleTorus'?
   action->handleLArCustom(this);
           ^~~~~~~~~~~~~~~
           handleTorus
error: Failed to execute /cvmfs/sft.cern.ch/lcg/releases/gcc/8.3.0-cebb0/x86_64-centos7/bin/g++ -DATLAS_GAUDI_V21 -DCLHEP_ABS_DEFINED -DCLHEP_MAX_MIN_DEFINED -DCLHEP_SQR_DEFINED -DGAUDI_V20_COMPAT -DGeoSpecialShapes_EXPORTS -DHAVE_64_BITS -DHAVE_GAUDI_PLUGINSVC -DPACKAGE_VERSION="GeoSpecialShapes-00-00-00" -DPACKAGE_VERSION_UQ=GeoSpecialShapes-00-00-00 -DSIMULATIONBASE -D__IDENTIFIER_64BIT__ -I/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/Control/CxxUtils -I/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/Database/RDBAccessSvc -I/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/DetectorDescription/GeoModel/GeoModelInterfaces -I/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/Control/AthenaKernel -I/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/Control/DataModelRoot -I/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/Control/RootUtils -I/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/DetectorDescription/GeoModel/GeoModelUtilities -I/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/Control/AthenaBaseComps -I/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/Control/StoreGate -I/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/Control/AthAllocators -I/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/Control/AthContainersInterfaces -I/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/Control/AthContainers -I/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/Control/SGTools -I/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/Database/PersistentDataModel -I/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/Event/xAOD/xAODEventInfo -I/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/Control/AthLinks -I/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/Event/xAOD/xAODCore -I/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/AtlasTest/TestTools -I/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/DetectorDescription/GeoModel/GeoSpecialShapes -isystem /build2/ci-builds/master/AthSimulation/install/GAUDI/22.0.12/InstallArea/x86_64-centos7-gcc8-opt/include -isystem /cvmfs/sft.cern.ch/lcg/releases/LCG_96/Boost/1.70.0/x86_64-centos7-gcc8-opt/include -isystem /cvmfs/sft.cern.ch/lcg/releases/LCG_96/CORAL/3_2_1/x86_64-centos7-gcc8-opt/include -isystem /cvmfs/sft.cern.ch/lcg/releases/LCG_96/ROOT/6.18.00/x86_64-centos7-gcc8-opt/include -isystem /build2/ci-builds/master/AthSimulation/install/AthSimulationExternals/22.0.12/InstallArea/x86_64-centos7-gcc8-opt/include -isystem /cvmfs/sft.cern.ch/lcg/releases/LCG_96/Python/2.7.16/x86_64-centos7-gcc8-opt/include/python2.7 -isystem /cvmfs/sft.cern.ch/lcg/releases/LCG_96/tbb/2019_U7/x86_64-centos7-gcc8-opt/include -isystem /cvmfs/sft.cern.ch/lcg/releases/LCG_96/eigen/3.3.7/x86_64-centos7-gcc8-opt/include/eigen3 -DNDEBUG -O2 -Wall -Wno-long-long -Wno-deprecated -Wno-unused-local-typedefs -Wwrite-strings -Wpointer-arith -Woverloaded-virtual -Wextra -Werror=return-type -pedantic -fPIC -pthread -std=c++17 -o CMakeFiles/GeoSpecialShapes.dir/src/LArCustomShape.cxx.o -c /var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/DetectorDescription/GeoModel/GeoSpecialShapes/src/LArCustomShape.cxx (return code: 1)

My understanding was that the GeoModel updates didn't necessitate changes in the Athena code. But apparently they do...

Hi @akraszna ,

No, you understood right, the Athena code shouldn’t be updated at this stage; also, the Athena “LArCustomShape” should continue to compile as it always did.

I suspect that, when removing the methods and classes related to the standalone CustomShape to fix ATLASSIM-4477, by mistake we also removed a method used by the Athena LArCustomShape.

I can check that tomorrow.

(But perhaps @boudreau has a quicker answer about that)

Hi, the Athena code should be changed in the following way:

action->handleLArCustom(this);

Should be changed to

action->handleShape(this);

The former method (which previously passed the call through to the latter method) is now depreciated. The kernel knows nothing about custom shapes (anymore).

added 2 commits

• 4d2580a0 - Switched from GeoShapeAction::handleLArCustom to GeoShapeAction::handleShape.
• ec4d24fc - Moved the code from SoVisualizeAction::handleLArCustom to SoVisualizeAction::handleShape.

Compare with previous version

So... The handleLArCustom(...) function was used in 2 places.

• In GeoSpecialShapes I just did what Joe suggested, simply switching the call to GeoShapeAction::handleShape(...);
• In VP1Utils we have a specialisation of GeoShapeAction in SoVisualizeAction, which was implementing the handleLArCustom(...) function in a special way. I moved the code from SoVisualizeAction::handleLArCustom(...) into SoVisualizeAction::handleShape(...). Hopefully in a reasonable way.

@rbianchi and @boudreau should definitely check what I've done.

This merge request affects 8 packages:

• DetectorDescription/GeoModel/GeoSpecialShapes
• Projects/AnalysisBase
• Projects/AthDataQuality
• Projects/AthGeneration
• Projects/AthSimulation
• Projects/Athena
• Projects/VP1Light
• graphics/VP1/VP1Utils

Adding @jchapman ,@krumnack ,@vpascuzz ,@nkoehler ,@rbianchi as watchers

added EventDisplay Geometry labels

Hi @akraszna ,

I checked the code and I found this change:

GeoModelDev/GeoModelCore@62142525

While removing the LArCustomShape from the GeoModelIO package, also the handleLArCustom() method was removed from the GeoShapeAction class in GeoModelKernel. That change is fine for the standalone code, but apparently that method is still used by the Athena build of the LArCustomShape.

I will add the missing method back to quickly fix the master build.

Then, we will review the code in Athena to see if we can adapt it better.

Best, -- Ric.

Hi Ric,

Please don't do anything until you read all the discussion, and the code changes that I did!

mentioned in commit GeoModelDev/GeoModelCore@4dc6f24a

mentioned in merge request atlasexternals!650 (closed)

Hi @akraszna ,

here a new MR to update the GeoModelCore tag. There, I added the handleLArCustom() method back to the GeoShapeAction class:

atlasexternals!650 (closed)

That should be solve the problem.

(At the moment, I am not able to build a full build of Athena with the new External tag, I'm sorry)

Best, -- Ric.