AtlasGeometryCommon/SubDetectorEnvelopes/python/SubDetectorEnvelopesConfig.py

@@ -71,12 +71,13 @@ def getEnvelopeDefSvc(name="AtlasGeometry_EnvelopeDefSvc", **kwargs):
 
     # setup fallback MuonEnvelope
     Muon = Volume()
+    Muon.addRZ(  4255.0 ,  4000.0 )
     Muon.addRZ(  4255.0 ,  6550.0 )
     Muon.addRZ(  3800.0 ,  6550.0 )
     Muon.addRZ(  3800.0 ,  6736.0 )
     Muon.addRZ(   420.0 ,  6736.0 )
     Muon.addRZ(   420.0 ,  6783.0 )
-    Muon.addRZ(    70.0 ,  6783.0 ) 
+    Muon.addRZ(    70.0 ,  6783.0 )
     Muon.addRZ(    70.0 , 12900.0 )
     Muon.addRZ(   279.0 , 12900.0 )
     Muon.addRZ(   279.0 , 18650.0 )
@@ -92,18 +93,18 @@ def getEnvelopeDefSvc(name="AtlasGeometry_EnvelopeDefSvc", **kwargs):
     Muon.addRZ( 12650.0 , 18650.0 )
     Muon.addRZ( 13400.0 , 18650.0 )
     Muon.addRZ( 13400.0 , 12900.0 )
-    Muon.addRZ( 13910.0 , 12900.0 )
-    Muon.addRZ( 13910.0 , 6550.0 )
-    Muon.addRZ( 13000.0 , 6550.0 )
+    Muon.addRZ( 14200.0 , 12900.0 )
+    Muon.addRZ( 14200.0 ,  4000.0 )
+    Muon.addRZ( 13000.0 ,  4000.0 )
     kwargs.setdefault("FallbackMuonR"   , Muon.getRs()        )
     kwargs.setdefault("FallbackMuonZ"   , Muon.getZs()        )
 
 
-    # setup fallback CavernEnvelope 
+    # setup fallback CavernEnvelope
     Cavern = Volume()
-    Cavern.addRZ( 13000.0 , 6550.0 )
-    Cavern.addRZ( 13910.0 , 6550.0 )
-    Cavern.addRZ( 13910.0 , 12900.0 ) # boundary with MS
+    Cavern.addRZ( 13000.0 , 4000.0 )
+    Cavern.addRZ( 14200.0 , 4000.0 )
+    Cavern.addRZ( 14200.0 , 12900.0 ) # boundary with MS
     Cavern.addRZ( 13400.0 , 12900.0 ) # boundary with MS
     Cavern.addRZ( 13400.0 , 18650.0 ) # boundary with MS
     Cavern.addRZ( 12650.0 , 18650.0 ) # boundary with MS
@@ -112,7 +113,7 @@ def getEnvelopeDefSvc(name="AtlasGeometry_EnvelopeDefSvc", **kwargs):
     Cavern.addRZ(  2750.0 , 23001.0 ) # boundary with MS
     Cavern.addRZ(  1500.0 , 23001.0 ) # boundary with MS
     Cavern.addRZ(  1500.0 , 26046.0 ) # boundary with MS
-    Cavern.addRZ(     0.0 , 26046.0 ) # 
+    Cavern.addRZ(     0.0 , 26046.0 ) #
 
     # the outer dimesions differ between collision and cosmics jobs
     from AthenaCommon.BeamFlags import jobproperties

AtlasGeometryCommon/SubDetectorEnvelopes/share/postInclude.showEnvelopesGUI.py

+"""
+Visualize envelopes as defined in EnvelopeDefSvc
+Elmar Ritsch, 13/05/2016
+"""
+
+from AthenaCommon.CfgGetter import getService
+
+
+def draw_envelope(ax, rlist_half, zlist_half, color, label):
+
+    # mirror the given (r,z) values in the x-y plane
+    rlist = rlist_half[:]
+    zlist = zlist_half[:]
+    for r in reversed(rlist_half):
+        rlist.append(r)
+    for z in reversed(zlist_half):
+        zlist.append(-z)
+    rlist.append(rlist[0])
+    zlist.append(zlist[0])
+
+    area = Polygon(zip(zlist, rlist), alpha=0.5, closed=True, color=color, label=label, linewidth=0.)
+    ax.add_patch(area)
+
+
+if __name__ == "__main__":
+    import matplotlib
+    matplotlib.use('Qt4Agg') # use backend that supports GUI (rather than file output only)
+    import matplotlib.pyplot as plt
+    from matplotlib.patches import Polygon
+
+    svc = getService('AtlasGeometry_EnvelopeDefSvc')
+
+    fig, ax = plt.subplots(figsize=(20,10))
+
+    draw_envelope(ax, svc.FallbackBeamPipeR, svc.FallbackBeamPipeZ, 'r', label='BeamPipe')
+    draw_envelope(ax, svc.FallbackInDetR, svc.FallbackInDetZ, 'b', label='InDet')
+    draw_envelope(ax, svc.FallbackCaloR, svc.FallbackCaloZ, 'c', label='Calo')
+    draw_envelope(ax, svc.FallbackMuonR, svc.FallbackMuonZ, 'm', label='MS')
+    draw_envelope(ax, svc.FallbackCavernR, svc.FallbackCavernZ, 'k', label='Cavern')
+
+    ax.autoscale_view()
+    plt.ylabel('r  (mm)')
+    plt.xlabel('z  (mm)')
+    plt.legend()
+    plt.show(block=True)
+    exit(1)

AtlasTest/AthenaMPTest/test/AthenaMP_Reco_trf_Test.xml

@@ -31,7 +31,7 @@
 
         <TEST name="RECOSHIFT_RAWtoESD" type="script" suite="athenamp">
             <package_atn>AtlasTest/AthenaMPTest</package_atn>
-            <options_atn>TRF_ECHO=1 Reco_tf.py '--inputBSFile' '/afs/cern.ch/atlas/project/rig/referencefiles/dataStreams_10Events/data10_7TeV.00167607.physics_JetTauEtmiss.merge.RAW._lb0087._SFO-4._0001.1_10events' '--maxEvents' '4' '--outputESDFile' 'myESD.pool.root' '--athenaopts=--nprocs=2' '--geometryVersion=ATLAS-R2-2015-03-01-00' '--preExec' 'rec.doTrigger=False' </options_atn>
+            <options_atn>TRF_ECHO=1 Reco_tf.py '--inputBSFile' '/afs/cern.ch/atlas/project/rig/referencefiles/dataStreams_10Events/data10_7TeV.00167607.physics_JetTauEtmiss.merge.RAW._lb0087._SFO-4._0001.1_10events' '--maxEvents' '4' '--outputESDFile' 'myESD.pool.root' '--athenaopts=--nprocs=2' '--geometryVersion=ATLAS-R1-2010-02-00-00' '--preExec' 'rec.doTrigger=False' </options_atn>
             <timelimit>90</timelimit>
             <author> Vakho Tsulaia </author>
             <mailto> tsulaia@cern.ch  </mailto>

AtlasTest/ControlTest/CMakeLists.txt

-# $Id: CMakeLists.txt 730270 2016-03-16 07:57:19Z krasznaa $
+# $Id: CMakeLists.txt 757711 2016-06-26 13:59:12Z ssnyder $
 ################################################################################
 # Package: ControlTest
 ################################################################################
@@ -89,9 +89,16 @@ atlas_add_test( ClearStore_test
    EXTRA_PATTERNS "^JobOptionsSvc +INFO|Service base class initialized successfully|DEBUG Property update for OutputLevel"
    ENVIRONMENT "JOBOPTSEARCHPATH=${_jobOPath}" )
 
+atlas_add_test( StoreID
+   SOURCES test/StoreID_test.cxx
+   LINK_LIBRARIES TestTools StoreGateLib
+   EXTRA_PATTERNS "^JobOptionsSvc +INFO|Service base class initialized successfully|DEBUG Property update for OutputLevel"
+   ENVIRONMENT "JOBOPTSEARCHPATH=${_jobOPath}" )
+
 atlas_add_test( FortranAlgorithm
    SCRIPT test/FortranAlgorithm.sh
-   EXTRA_PATTERNS "^Py:ConfigurableDb +(WARNING|INFO|ERROR)|Py:Athena +INFO including file |Warning in .TEnvRec::ChangeValue.: duplicate entry|calling initialize_|ToolSvc.finalize.. +INFO| [A-Z]+ 2[0-9][0-9][0-9]$$|^Py:Athena +INFO|[Rr]oo[Ff]it|NIKHEF|DeprecationWarning: object.__new__|^  newobj =|^\*+$$|drop-and-reload|^ *$$|we will keep the configuration around|ApplicationMgr +INFO|Start StoreGateSvc" )
+   EXTRA_PATTERNS "^Py:ConfigurableDb +(WARNING|INFO|ERROR)|Py:Athena +INFO including file |Warning in .TEnvRec::ChangeValue.: duplicate entry|calling initialize_|ToolSvc.finalize.. +INFO| [A-Z]+ 2[0-9][0-9][0-9]$$|^Py:Athena +INFO|[Rr]oo[Ff]it|NIKHEF|DeprecationWarning: object.__new__|^  newobj =|^\*+$$|drop-and-reload|^ *$$|we will keep the configuration around|ApplicationMgr +INFO|Start StoreGateSvc" 
+   PROPERTIES TIMEOUT 300 )
 
 if( "${CMAKE_BUILD_TYPE}" STREQUAL "Release" OR
       "${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo" )
@@ -103,18 +110,22 @@ endif()
 
 atlas_add_test( StoreGateReentrant
    SCRIPT test/StoreGateReentrant.sh
+   PROPERTIES TIMEOUT 300
    EXTRA_PATTERNS "^Py:ConfigurableDb +(WARNING|INFO|ERROR)|Py:Athena +INFO including file |Warning in .TEnvRec::ChangeValue.: duplicate entry|ToolSvc.finalize.. +INFO|^WriteData +INFO in initialize$$| [A-Z]+ 2[0-9][0-9][0-9]$$${SGGoptignore}|^Py:Athena +INFO|[Rr]oo[Ff]it|NIKHEF|DeprecationWarning: object.__new__|^  newobj =|^\*+$$|drop-and-reload|^ *$$|we will keep the configuration around|object not modifiable when retrieved|Retrieved const handle to default|type EventInfo|^StoreGateSvc +DEBUG|^ of type|object modifiable when retrieved|ApplicationMgr +INFO|Start StoreGateSvc" )
 
 atlas_add_test( StoreGateGen
    SCRIPT test/StoreGateGen.sh
+   PROPERTIES TIMEOUT 300
    EXTRA_PATTERNS "^Py:ConfigurableDb +(WARNING|INFO|ERROR)|Py:Athena +INFO including file |Warning in .TEnvRec::ChangeValue.: duplicate entry|ToolSvc.finalize.. +INFO|^WriteData +INFO in initialize$$| [A-Z]+ 2[0-9][0-9][0-9]$$${SGGoptignore}|^Py:Athena +INFO|[Rr]oo[Ff]it|NIKHEF|DeprecationWarning: object.__new__|^  newobj =|^\*+$$|drop-and-reload|^ *$$|we will keep the configuration around|object not modifiable when retrieved|Retrieved const handle to default|type EventInfo|^StoreGateSvc +DEBUG|^ of type|object modifiable when retrieved|ApplicationMgr +INFO|Start StoreGateSvc" )
 
 atlas_add_test( StoreGateDFlow
    SCRIPT test/StoreGateDFlow.sh
+   PROPERTIES TIMEOUT 300
    EXTRA_PATTERNS "^Py:ConfigurableDb +(WARNING|INFO|ERROR)|Py:Athena +INFO including file |Warning in .TEnvRec::ChangeValue.: duplicate entry|ToolSvc.finalize.. +INFO|^WriteData +INFO in initialize$$| [A-Z]+ 2[0-9][0-9][0-9]$$${SGGoptignore}|^Py:Athena +INFO|[Rr]oo[Ff]it|NIKHEF|DeprecationWarning: object.__new__|^  newobj =|^\*+$$|drop-and-reload|^ *$$|we will keep the configuration around|object not modifiable when retrieved|Retrieved const handle to default|type EventInfo|^StoreGateSvc +DEBUG|^ of type|object modifiable when retrieved|ApplicationMgr +INFO|WARNING could not get proxy for key|Start StoreGateSvc" )
 
 atlas_add_test( test_interactive_athena
    SCRIPT test/test_interactive_athena.sh
+   PROPERTIES TIMEOUT 300
    EXTRA_PATTERNS "^Py:ConfigurableDb +(WARNING|INFO|ERROR)|Py:Athena +INFO including file |Warning in .TEnvRec::ChangeValue.: duplicate entry|calling initialize_|ToolSvc.finalize.. +INFO| [A-Z]+ 2[0-9][0-9][0-9]$$|^Py:Athena +INFO|[Rr]oo[Ff]it|NIKHEF|DeprecationWarning: object.__new__|^  newobj =|^\*+$$|drop-and-reload|^ *$$|we will keep the configuration around|ApplicationMgr +INFO|Start StoreGateSvc|already in TClassTable" )
 
 # Install files from the package:

AtlasTest/ControlTest/cmt/requirements

@@ -57,6 +57,9 @@ apply_pattern UnitTest_run unit_test=ClearStore \
 macro_append ClearStore_testlinkopts " -lSGtests"
 #macro ClearStore_test_cppflags " -D __PROXYDEBUG"
 
+apply_pattern UnitTest_run unit_test=StoreID \
+  extrapatterns="^JobOptionsSvc +INFO|Service base class initialized successfully"
+
 #integration tests
 apply_pattern install_applications
 apply_pattern install_xmls
@@ -101,4 +104,3 @@ apply_pattern athenarun_test name="test_interactive_athena" \
 
 ## AthenaCommon/python unit-test
 apply_pattern declare_python_modules files="*.py"
-

AtlasTest/ControlTest/share/StoreGateTestCommon.txt

@@ -2,7 +2,7 @@
 
 // $Id: StoreGateTestCommon.txt,v 1.2 2008-05-30 22:53:11 calaf Exp $
 
-ApplicationMgr.ExtSvc += { "StoreGateSvc/DetectorStore", "StoreGateSvc/HistoryStore" };
+ApplicationMgr.ExtSvc += { "StoreGateSvc/DetectorStore", "StoreGateSvc/HistoryStore", "StoreGateSvc/ConditionsStore" };
 AuditorSvc.Auditors  += { "AlgContextAuditor"};
 StoreGateSvc.OutputLevel = 1;
 StoreGateSvc.ActivateHistory = false;

AtlasTest/ControlTest/share/StoreID_test.ref

+*** StoreID_test BEGINS ***
+
+
+Initializing Gaudi ApplicationMgr using job opts ../share/StoreGateTestCommon.txt
+JobOptionsSvc        INFO # =======> /home/sss/nobackup/atlas/build-clang/../tests/../share/StoreGateTestCommon.txt
+JobOptionsSvc        INFO # (5,1): ApplicationMgr.ExtSvc += ["StoreGateSvc/DetectorStore", "StoreGateSvc/HistoryStore", "StoreGateSvc/ConditionsStore"]
+JobOptionsSvc        INFO # (6,1): AuditorSvc.Auditors += ["AlgContextAuditor"]
+JobOptionsSvc        INFO # (7,1): StoreGateSvc.OutputLevel = 1
+JobOptionsSvc        INFO # (8,1): StoreGateSvc.ActivateHistory = 0
+JobOptionsSvc        INFO # (9,1): CLIDSvc.OutputLevel = 2
+JobOptionsSvc        INFO # (10,1): MessageSvc.useColors = 1
+JobOptionsSvc        INFO Job options successfully read in from ../share/StoreGateTestCommon.txt
+ApplicationMgr    SUCCESS 
+====================================================================================================================================
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
+                                          running on karma on Sun Jun 12 23:09:39 2016
+====================================================================================================================================
+ApplicationMgr       INFO Application Manager Configured successfully
+ClassIDSvc           INFO Initializing ClassIDSvc - package version CLIDComps-00-00-00
+ClassIDSvc           INFO  getRegistryEntries: read 995 CLIDRegistry entries for module ALL
+ProxyProviderSvc     INFO Initializing ProxyProviderSvc - package version SGComps-00-00-00
+EventLoopMgr      WARNING Unable to locate service "EventSelector" 
+EventLoopMgr      WARNING No events will be processed from external input.
+HistogramPersis...WARNING Histograms saving not required.
+ApplicationMgr       INFO Application Manager Initialized successfully
+ApplicationMgr Ready
+StoreGateSvc        DEBUG Property update for OutputLevel : new value = 1
+StoreGateSvc        DEBUG Service base class initialized successfully
+StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc
+StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service ClassIDSvc
+*** StoreID_test OK ***

AtlasTest/ControlTest/test/ProxyProviderSvc_test.cxx

@@ -122,7 +122,7 @@ void testReadPrivate(StoreGateSvc& rSG) {
   SGASSERTERROR((rSG.readPrivateCopy<Foo>("NotThere")).get() != 0);
   
   apFoo=rSG.readUniquePrivateCopy<Foo>("diskFoo");
-  assert(0 != &*apFoo);
+  assert(0 != apFoo.get());
   assert(floatEQ(0, static_cast<float>(apFoo->a()))); //check that our Foo is the def constr one
 
   //now test the situation in which we have a transient obj in the way
@@ -132,11 +132,11 @@ void testReadPrivate(StoreGateSvc& rSG) {
   assert(rSG.overwrite(CxxUtils::make_unique<Foo>(6.28), "privFoo").isSuccess());
   
   apFoo=rSG.readUniquePrivateCopy<Foo>("privFoo");
-  assert(0 != &*apFoo);
+  assert(0 != apFoo.get());
   assert(floatNEQ(6.28f, static_cast<float>(apFoo->a()))); //check that our Foo is a different one
   apFoo->setA(3.14);
   std::unique_ptr<Foo> bpFoo(rSG.readUniquePrivateCopy<Foo>("privFoo"));
-  assert(0 != &*bpFoo);
+  assert(0 != bpFoo.get());
   assert(&*bpFoo != &*apFoo); //two independent instances
   assert(floatNEQ(6.28f, static_cast<float>(bpFoo->a()))); 
   assert(floatNEQ(3.14f, static_cast<float>(bpFoo->a()))); 

AtlasTest/ControlTest/test/StoreGateSvcClient_test.cxx

@@ -348,6 +348,10 @@ int main() {
   testRetrieveAux(*pStore);
   testBoundReset(*pStore);
 
+  testRecordObject(*pStore);
+
+  testWriteAux(*pStore);
+
   test_lock (*pStore);
 
   pStore->finalize().ignore();

AtlasTest/ControlTest/test/StoreID_test.cxx

+/*
+  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+/***************************************************************************
+ test the store ID setting
+ -------------------------------------------
+ ATLAS Collaboration
+ ***************************************************************************/
+
+// $Id: StoreID_test.cxx 753911 2016-06-09 13:40:32Z calaf $
+
+#include <iostream>
+
+#undef NDEBUG
+
+#include "StoreGate/StoreGateSvc.h"
+#include "StoreGate/SGtests.h"
+
+
+#ifndef NOGAUDI
+#include "TestTools/initGaudi.h"
+using namespace Athena_test;
+using namespace std;
+
+int main() {
+  cout << "*** StoreID_test BEGINS ***" <<endl;
+  ISvcLocator* pSvcLoc;
+  if (!initGaudi("StoreGateTestCommon.txt", pSvcLoc)) {
+    cerr << "This test can not be run" << endl;
+    return 0;
+  }  
+  assert(pSvcLoc);
+
+  StoreGateSvc* pStore(0);
+  static const bool CREATE(true);
+  assert((pSvcLoc->service("StoreGateSvc", pStore, CREATE)).isSuccess());
+  assert(pStore);
+  
+  assert(pStore->storeID() == StoreID::EVENT_STORE);
+  pStore->setStoreID(StoreID::SPARE_STORE);
+  assert(pStore->storeID() == StoreID::SPARE_STORE);
+
+  assert((pSvcLoc->service("DetectorStore", pStore)).isSuccess());
+  assert(pStore);
+  assert(pStore->storeID() == StoreID::DETECTOR_STORE);
+  
+  assert((pSvcLoc->service("ConditionsStore", pStore, CREATE)).isSuccess());
+  assert(pStore);
+  assert(pStore->storeID() == StoreID::CONDITION_STORE);
+  
+  cout << "*** StoreID_test OK ***" <<endl;
+  return 0;
+}
+#endif /*NOGAUDI*/
+
+
+
+
+
+
+
+
+
+
+
+
+

AtlasTest/DatabaseTest/AthenaDBTestRec/CMakeLists.txt

+################################################################################
+# Package: AthenaDBTestRec
+################################################################################
+
+# Declare the package name:
+atlas_subdir( AthenaDBTestRec )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+                          Control/AthenaBaseComps
+                          Control/AthenaKernel
+                          Control/CLIDSvc
+                          Control/SGTools
+                          Control/StoreGate
+                          Database/AthenaPOOL/AthenaPoolUtilities
+                          GaudiKernel
+                          PRIVATE
+                          Database/APR/CollectionBase
+                          Database/APR/CollectionUtilities
+                          Database/APR/POOLCore
+                          Database/APR/PersistencySvc
+                          Database/APR/StorageSvc
+                          Database/AthenaPOOL/AthenaPoolCnvSvc
+                          Database/CoraCool
+                          Database/PersistentDataModel
+                          Event/EventInfo )
+
+# External dependencies:
+find_package( Boost COMPONENTS filesystem thread system )
+find_package( COOL COMPONENTS CoolKernel CoolApplication )
+find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
+find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+
+include_directories(src)
+
+# Component(s) in the package:
+atlas_add_library( AthenaDBTestRecLib
+                   src/lib/*.cxx
+                   PUBLIC_HEADERS AthenaDBTestRec
+                   PRIVATE_INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
+                   LINK_LIBRARIES AthenaBaseComps AthenaKernel SGTools AthenaPoolUtilities GaudiKernel StoreGateLib SGtests AthenaPoolCnvSvcLib
+                   PRIVATE_LINK_LIBRARIES ${COOL_LIBRARIES} ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} CollectionBase CollectionUtilities POOLCore PersistencySvc StorageSvc CoraCool PersistentDataModel EventInfo )
+
+atlas_add_component( AthenaDBTestRec
+                     src/components/*.cxx
+                     INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${COOL_LIBRARIES} ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} AthenaBaseComps AthenaKernel SGTools StoreGateLib SGtests AthenaPoolUtilities GaudiKernel CollectionBase CollectionUtilities POOLCore PersistencySvc StorageSvc AthenaPoolCnvSvcLib CoraCool PersistentDataModel EventInfo AthenaDBTestRecLib )
+
+atlas_add_poolcnv_library( AthenaDBTestRecPoolCnv
+                           src/*.cxx
+                           FILES AthenaDBTestRec/TestCoolRecPoolData.h AthenaDBTestRec/TestCoolRecPoolDataColl.h
+                           MULT_CHAN_TYPES TestCoolRecPoolDataColl
+                           INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
+                           LINK_LIBRARIES ${COOL_LIBRARIES} ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} AthenaBaseComps AthenaKernel SGTools StoreGateLib SGtests AthenaPoolUtilities GaudiKernel CollectionBase CollectionUtilities POOLCore PersistencySvc StorageSvc AthenaPoolCnvSvcLib CoraCool PersistentDataModel EventInfo AthenaDBTestRecLib )
+
+atlas_add_dictionary( AthenaDBTestRecDataDict
+                      AthenaDBTestRec/AthenaDBTestRecDataDict.h
+                      AthenaDBTestRec/selection.xml
+                      INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
+                      LINK_LIBRARIES ${COOL_LIBRARIES} ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} AthenaBaseComps AthenaKernel SGTools StoreGateLib SGtests AthenaPoolUtilities GaudiKernel CollectionBase CollectionUtilities POOLCore PersistencySvc StorageSvc AthenaPoolCnvSvcLib CoraCool PersistentDataModel EventInfo AthenaDBTestRecLib )
+
+atlas_add_executable( TestCoolRecWriter
+                      src/app/*.cxx
+                      INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
+                      LINK_LIBRARIES ${COOL_LIBRARIES} ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} AthenaBaseComps AthenaKernel SGTools StoreGateLib SGtests AthenaPoolUtilities GaudiKernel CollectionBase CollectionUtilities POOLCore PersistencySvc StorageSvc AthenaPoolCnvSvcLib CoraCool PersistentDataModel EventInfo AthenaDBTestRecLib )
+
+# Install files from the package:
+atlas_install_joboptions( share/*.py )
+

AtlasTest/DatabaseTest/AthenaPoolTest/CMakeLists.txt

+################################################################################
+# Package: AthenaPoolTest
+################################################################################
+
+# Declare the package name:
+atlas_subdir( AthenaPoolTest )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PRIVATE
+                          AtlasTest/DatabaseTest/AthenaPoolTestData
+                          Calorimeter/CaloDetDescr
+                          Calorimeter/CaloEvent
+                          Calorimeter/CaloIdentifier
+                          Control/AthenaBaseComps
+                          Control/AthenaKernel
+                          Control/StoreGate
+                          Database/AthenaPOOL/AthenaPoolUtilities
+                          DetectorDescription/GeoModel/GeoModelInterfaces
+                          DetectorDescription/GeoPrimitives
+                          DetectorDescription/Identifier
+                          Event/EventInfo
+                          Event/EventInfoMgt
+                          GaudiKernel
+                          InnerDetector/InDetDetDescr/InDetIdentifier
+                          InnerDetector/InDetDetDescr/InDetReadoutGeometry
+                          InnerDetector/InDetRawEvent/InDetRawData
+                          InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack
+                          InnerDetector/InDetRecEvent/InDetPrepRawData
+                          InnerDetector/InDetRecEvent/InDetRIO_OnTrack
+                          LArCalorimeter/LArRecEvent
+                          TestPolicy
+                          Tracking/TrkDetDescr/TrkSurfaces
+                          Tracking/TrkEvent/TrkCompetingRIOsOnTrack
+                          Tracking/TrkEvent/TrkEventPrimitives
+                          Tracking/TrkEvent/TrkMaterialOnTrack
+                          Tracking/TrkEvent/TrkParameters
+                          Tracking/TrkEvent/TrkTrack
+                          Tracking/TrkEvent/TrkVertexOnTrack )
+
+# External dependencies:
+find_package( Eigen )
+
+# Component(s) in the package:
+atlas_add_component( AthenaPoolTest
+                     src/AthenaPoolTestDataReader.cxx
+                     src/AthenaPoolTestDataWriter.cxx
+                     src/AthenaPoolTestAttrWriter.cxx
+                     src/AthenaPoolTestAttrReader.cxx
+                     src/InDetRawDataFakeReader.cxx
+                     src/InDetRawDataFakeWriter.cxx
+                     src/LArCellContFakeWriter.cxx
+                     src/LArCellContFakeReader.cxx
+                     src/EventInfoWriter.cxx
+                     src/EventInfoReader.cxx
+                     src/PileUpEventInfoWriter.cxx
+                     src/PileUpEventInfoReader.cxx
+                     src/TrkTrackFakeReader.cxx
+                     src/TrkTrackFakeWriter.cxx
+                     src/FakeTrackBuilder.cxx
+                     src/components/*.cxx
+                     INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaPoolTestData CaloDetDescrLib CaloEvent CaloIdentifier AthenaBaseComps AthenaKernel StoreGateLib SGtests AthenaPoolUtilities GeoPrimitives Identifier EventInfo GaudiKernel InDetIdentifier InDetReadoutGeometry InDetRawData InDetCompetingRIOsOnTrack InDetPrepRawData InDetRIO_OnTrack LArRecEvent TrkSurfaces TrkCompetingRIOsOnTrack TrkEventPrimitives TrkMaterialOnTrack TrkParameters TrkTrack TrkVertexOnTrack )
+
+# Install files from the package:
+atlas_install_headers( AthenaPoolTest )
+atlas_install_joboptions( share/*.py )
+

AtlasTest/DatabaseTest/AthenaPoolTest/src/InDetRawDataFakeWriter.cxx

@@ -328,8 +328,7 @@ StatusCode InDetRawDataFakeWriter::printRDOs() const
             rdo!=rdocoll->end() ; ++rdo) {
         
             ATH_MSG_DEBUG("RDO ID=" << m_sctId->show_to_string((*rdo)->identify()) 
-                          << "RDO grp=" << (*rdo)->getGroupSize() << " strip:" << 
-                          (*rdo)->getStrip() );
+                          << "RDO grp=" << (*rdo)->getGroupSize() );
         
         }
     }

AtlasTest/TestTools/CMakeLists.txt

+# $Id: CMakeLists.txt 744649 2016-05-03 19:33:39Z krasznaa $
 ################################################################################
 # Package: TestTools
 ################################################################################
@@ -6,25 +7,28 @@
 atlas_subdir( TestTools )
 
 # Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaCommon
-                          TestPolicy
-                          PRIVATE
-                          GaudiKernel )
+atlas_depends_on_subdirs(
+   PUBLIC
+   Control/AthenaCommon
+   TestPolicy
+   PRIVATE
+   GaudiKernel )
 
-# External dependencies:
-find_package( PythonLibs )
-
-# Component(s) in the package:
-atlas_add_library( TestTools
-                   src/*.cxx
-                   PUBLIC_HEADERS TestTools
-                   INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS}
-                   LINK_LIBRARIES ${PYTHON_LIBRARIES}
-                   PRIVATE_LINK_LIBRARIES GaudiKernel )
+# In standalone mode we just use the headers from the package. While in
+# offline mode we build a proper library.
+if( XAOD_STANDALONE )
+   atlas_add_library( TestTools
+      TestTools/*.h
+      INTERFACE
+      PUBLIC_HEADERS TestTools )
+else()
+   atlas_add_library( TestTools
+      TestTools/*.h src/*.cxx
+      PUBLIC_HEADERS TestTools
+      PRIVATE_LINK_LIBRARIES GaudiKernel )
+endif()
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/*.py )
 atlas_install_scripts( share/runUnitTests.sh share/post.sh )
-

AtlasTest/TestTools/cmt/requirements

@@ -43,4 +43,3 @@ macro_append DOXYGEN_INPUT " ../doc"
 macro_append DOXYGEN_INPUT " ../share" 
 macro_append DOXYGEN_FILE_PATTERNS    " *.sh"
 macro_append DOXYGEN_FILE_PATTERNS    " *.txt"
-

AtlasTest/TestTools/share/post.sh

@@ -145,6 +145,9 @@ PP="$PP"'|^ConditionStore +INFO Stop ConditionStore'
 # Differences between Gaudi versions.
 PP="$PP"'|DEBUG input handles:|DEBUG output handles:|DEBUG Data Deps for|DEBUG Property update for OutputLevel :|-ExtraInputs |-ExtraOutputs |-Cardinality |-IsClonable |-NeededResources |-Timeline '
 
+# StoreGate INFO messages changed to VERBOSE
+PP="$PP"'|^(StoreGateSvc|[^ ]+Store) +(INFO|VERBOSE) (Stop|stop|Start)'
+
 
 if [ "$extrapatterns" != "" ]; then
  PP="$PP""|$extrapatterns"

Build/AtlasCMake/AtlasCMakeConfig.cmake

 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-# $Id: AtlasCMakeConfig.cmake 746543 2016-05-12 11:31:22Z krasznaa $
+# $Id: AtlasCMakeConfig.cmake 756309 2016-06-20 15:39:40Z krasznaa $
 #
 # This file is used to make it possible to pull in the code of this package into
 # a top level CMake file using:
@@ -21,7 +21,7 @@
 
 # Print a status message that the file was found:
 if( NOT AtlasCMake_FIND_QUIETLY )
-   message( STATUS "AtlasCMake found with version: $Revision: 746543 $" )
+   message( STATUS "AtlasCMake found with version: $Revision: 756309 $" )
 endif()
 
 # Get the current directory:
@@ -43,7 +43,10 @@ set( ATLAS_DONT_PREPEND_PROJECT_MODULES TRUE
    CACHE BOOL "Prevent built projects from prepending to CMAKE_MODULE_PATH" )
 
 # Install the helper script(s) from the package:
-install( PROGRAMS ${_thisdir}/scripts/acmake.py DESTINATION bin )
+install( PROGRAMS ${_thisdir}/scripts/acmake.py
+   ${_thisdir}/scripts/cmakeNightlyInstall.sh
+   ${_thisdir}/scripts/cmakeReleaseInstall.sh
+   DESTINATION bin )
 install( DIRECTORY ${_thisdir}/cmt2cmake DESTINATION .
    USE_SOURCE_PERMISSIONS
    PATTERN ".*" EXCLUDE

Build/AtlasCMake/modules/AtlasCompilerSettings.cmake

 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-# $Id: AtlasCompilerSettings.cmake 744652 2016-05-03 19:40:31Z krasznaa $
+# $Id: AtlasCompilerSettings.cmake 782946 2016-11-08 12:41:46Z alibrari $
 #
 # This file collects settings fine-tuning all the compiler and linker options
 # used in an ATLAS build in one place. It is included by default when using
@@ -29,16 +29,7 @@ set( CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard used for the build" )
 set( CMAKE_CXX_EXTENSIONS FALSE CACHE BOOL "(Dis)allow using GNU extensions" )
 
 # Set the definitions needed everywhere:
-add_definitions( -DHAVE_PRETTY_FUNCTION
-   -DHAVE_EXPLICIT -DHAVE_MUTABLE -DHAVE_SIGNED -DHAVE_TYPENAME
-   -DHAVE_NEW_STYLE_CASTS -DHAVE_DYNAMIC_CAST -DHAVE_TYPEID
-   -DHAVE_ANSI_TEMPLATE_INSTANTIATION -DHAVE_TEMPLATE_DEFAULT_ARGS
-   -DHAVE_BROKEN_TEMPLATE_RESCOPE -DHAVE_TEMPLATE_NULL_ARGS
-   -DHAVE_TEMPLATE_NULL_SPEC -DHAVE_TEMPLATE_PARTIAL_SPEC
-   -DHAVE_MEMBER_TEMPLATES -DHAVE_ANSI_OPERATOR_ARROW
-   -DHAVE_NAMESPACES -DHAVE_NAMESPACE_STD
-   -DHAVE_OSTREAM_CHAR_OVERLOAD -DHAVE_ITERATOR_TRAITS -DHAVE_ITERATOR
-   -DHAVE_REVERSE_ITERATOR_STYLE -DHAVE_CXX_STDC_HEADERS )
+add_definitions( -DHAVE_PRETTY_FUNCTION )
 
 # Function helping with setting up variable type checks
 function( _check_for_type typeName definition )
@@ -48,10 +39,6 @@ function( _check_for_type typeName definition )
    endif()
 endfunction( _check_for_type )
 
-# Check for various C++ types:
-_check_for_type( "long long" LONG_LONG )
-_check_for_type( "bool" BOOL )
-
 # Function helping with setting up header checks
 function( _check_for_include include definition )
    check_include_file_cxx( ${include} ${definition} )
@@ -60,9 +47,6 @@ function( _check_for_include include definition )
    endif()
 endfunction( _check_for_include )
 
-# Check for various C++ includes:
-_check_for_include( "iostream" HAVE_NEW_IOSTREAMS )
-
 # Clean up:
 unset( _check_for_type )
 unset( _check_for_include )
@@ -116,6 +100,7 @@ if( CMAKE_COMPILER_IS_GNUCXX )
       _add_flag( CMAKE_CXX_FLAGS_${mode} "-Wextra" )
       _add_flag( CMAKE_CXX_FLAGS_${mode} "-Werror=return-type" )
    endforeach()
+   _add_flag( CMAKE_CXX_FLAGS_DEBUG "-fsanitize=undefined" )
 endif()
 foreach( mode RELEASE RELWITHDEBINFO DEBUG )
    _add_flag( CMAKE_CXX_FLAGS_${mode} "-pedantic" )