.gitignore

+# Ignore the most common extra files that can
+# be produced while developing
+*~
+*.sw?
+#*
+.DS_Store
+.pydevproject
+.project
+*.pyc
+.asetup*
+.cproject

AtlasGeometryCommon/SubDetectorEnvelopes/python/SubDetectorEnvelopesConfig.py

@@ -26,7 +26,13 @@ def getEnvelopeDefSvc(name="AtlasGeometry_EnvelopeDefSvc", **kwargs):
     # setup fallback BeamPipeEnvelope
     BeamPipe = Volume()
     BeamPipe.addRZ(   34.3,   3475.0 )
-    BeamPipe.addRZ(  120.0,   3475.0 )
+    from AthenaCommon.DetFlags import DetFlags
+    if hasattr(DetFlags.simulate, 'HGTD_on') and DetFlags.simulate.HGTD_on():
+        BeamPipe.addRZ(   47.0,   3475.0 )
+        BeamPipe.addRZ(   47.0,   3535.0 )
+        BeamPipe.addRZ(  120.0,   3535.0 )
+    else:
+        BeamPipe.addRZ(  120.0,   3475.0 )
     BeamPipe.addRZ(  120.0,   4185.0 )
     BeamPipe.addRZ(   41.0,   4185.0 )
     BeamPipe.addRZ(   41.0,   6783.0 )
@@ -55,7 +61,13 @@ def getEnvelopeDefSvc(name="AtlasGeometry_EnvelopeDefSvc", **kwargs):
     # setup fallback CaloEnvelope
     Calo = Volume()
     Calo.addRZ( 1148.0,  3475.0 )
-    Calo.addRZ(  120.0,  3475.0 )
+    from AthenaCommon.DetFlags import DetFlags
+    if hasattr(DetFlags.simulate, 'HGTD_on') and DetFlags.simulate.HGTD_on():
+        Calo.addRZ(   47.0,  3475.0 )
+        Calo.addRZ(   47.0,  3535.0 )
+        Calo.addRZ(  120.0,  3535.0 )
+    else:
+        Calo.addRZ(  120.0,  3475.0 )
     Calo.addRZ(  120.0,  4185.0 )
     Calo.addRZ(   41.0,  4185.0 )
     Calo.addRZ(   41.0,  6783.0 )
@@ -71,12 +83,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 +105,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,14 +125,14 @@ 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
     if jobproperties.Beam.beamType() != 'cosmics':
       #  -> for collision jobs the 'cavern' envelope is much smaller
-      Cavern.addRZ(      0.0 , 50000.0 ) # z= +50m
-      Cavern.addRZ( 50000.0  , 50000.0 ) # r=  50m
+      Cavern.addRZ(      0.0 , 500000.0 ) # z= +500m
+      Cavern.addRZ( 500000.0  , 500000.0 ) # r=  500m
     else:
       #  -> for cosmics simulation the 'cavern' envelope spans much further
       kwargs.setdefault("DBCavernNode"    , 'CavernEnvelopeNONE'   )

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

@@ -17,8 +17,8 @@
         
         <TEST name="SharedPoolReader" type="script" suite="athenamp">
             <package_atn>AtlasTest/AthenaMPTest</package_atn>
-	    <options_atn>TRF_ECHO=1 Reco_tf.py '--athenaopts=--nprocs=2' '--inputRDOFile' '/afs/cern.ch/atlas/project/rig/referencefiles/MC/valid1.105200.T1_McAtNlo_Jimmy.digit.RDO.e835_s1256_s1258_d566_tid464353_00/RDO.464353._000001.pool.root.1' '--outputESDFile' 'ESD.pool.root' '--autoConfiguration' 'everything' '--maxEvents=4' '--preExec' 'from AthenaMP.AthenaMPFlags import jobproperties as jps' 'jps.AthenaMPFlags.Strategy="SharedReader"' 'rec.doTrigger=False'</options_atn>
-            <timelimit>90</timelimit>
+	    <options_atn>TRF_ECHO=1 ATHENA_PROC_NUMBER=2 Reco_tf.py '--inputRDOFile' '/afs/cern.ch/atlas/project/rig/referencefiles/MC/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.e3099_s2578/RDO.04919495._000958.pool.root.1' '--outputESDFile' 'ESD.pool.root' '--autoConfiguration' 'everything' '--maxEvents=4' '--preExec' 'from AthenaMP.AthenaMPFlags import jobproperties as jps' 'jps.AthenaMPFlags.UseSharedReader=True' 'rec.doTrigger=False'</options_atn>
+            <timelimit>30</timelimit>
             <author> Vakho Tsulaia </author>
             <mailto> tsulaia@cern.ch  </mailto>
             <prescript>rm -f $ATN_WORK_AREA/*; env > env.txt</prescript>
@@ -26,12 +26,11 @@
                 <errorMessage>ERROR</errorMessage>
                 <returnValue>0</returnValue>
             </expectations>
-            <nightly_exclude>17.7.NEW.Y-VAL</nightly_exclude>
         </TEST>
 
         <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/data11_7TeV.00178044.physics_JetTauEtmiss.merge.RAW._lb0092._SFO-4._0001.1_25events' '--maxEvents' '4' '--outputESDFile' 'myESD.pool.root' '--athenaopts=--nprocs=2' '--geometryVersion=ATLAS-R1-2011-02-00-00' '--preExec' 'rec.doTrigger=False' </options_atn>
             <timelimit>90</timelimit>
             <author> Vakho Tsulaia </author>
             <mailto> tsulaia@cern.ch  </mailto>

AtlasTest/AthenaMPTest/test/AthenaMP_SimulationTest.xml

@@ -2,7 +2,7 @@
 <unifiedTestConfiguration>
   <atn>
 
-    <TEST name="G4AtlasMP" type="athena" suite="AthenaMPSim">
+    <TEST name="G4AtlasMP" type="athena" suite="AthenaMPSimJobOpt">
       <doc>Tests standard simu job</doc>
       <options_atn>--nprocs=2 -c "from AthenaMP.AthenaMPFlags import jobproperties as jps; jps.AthenaMPFlags.CollectSubprocessLogs=True" G4AtlasApps/jobOptions.G4Atlas.py</options_atn>
       <timelimit>30</timelimit>
@@ -17,7 +17,7 @@
    <TEST name="AtlasG4_tfMP" type="script" suite="AthenaMPSim">
       <package_atn>AtlasTest/AthenaMPTest</package_atn>
       <doc>Tests MP simulation in TF with ATHENA_PROC_NUMBER</doc>
-      <options_atn>TRF_ECHO=1 ATHENA_PROC_NUMBER=2 AtlasG4_tf.py '--inputEvgenFile' '/afs/cern.ch/atlas/offline/ProdData/17.1.X/17.1.3.1.1/mu_E50_eta0-25.evgen.pool.root' '--outputHitsFile' 'myHITS.pool.root' '--maxEvents=4' '--randomSeed=26741007' '--geometryVersion' 'ATLAS-GEO-20-00-01' '--physicsList' 'QGSP_BERT' '--conditionsTag' 'OFLCOND-MC12-SIM-00' '--preInclude' 'sim:SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py,SimulationJobOptions/preInclude.BeamPipeKill.py' '--postInclude' 'RecJobTransforms/UseFrontier.py' '--athenaopts="--preloadlib=${ATLASMKLLIBDIR_PRELOAD}/libimf.so"' '--preExec' 'from AthenaMP.AthenaMPFlags import jobproperties as jps' 'jps.AthenaMPFlags.CollectSubprocessLogs=True'</options_atn>
+      <options_atn>TRF_ECHO=1 ATHENA_PROC_NUMBER=2 AtlasG4_tf.py --inputEVNTFile '/afs/cern.ch/atlas/offline/ProdData/16.6.X/16.6.7.Y/ttbar_muplusjets-pythia6-7000.evgen.pool.root' --outputHITSFile 'HITSMPSim.pool.root' --maxEvents '4' --skipEvents '0' --randomSeed '10' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'FTFP_BERT' --postInclude 'PyJobTransforms/UseFrontier.py' 'AtlasG4Tf:G4AtlasTests/postInclude.DCubeTest.py' --preExec 'AtlasG4Tf:simFlags.ReleaseGeoModel=False'</options_atn>
       <timelimit>30</timelimit>
       <author>Vakho Tsulaia</author>
       <mailto>tsulaia@cern.ch</mailto>
@@ -26,11 +26,22 @@
       </expectations>
     </TEST>
 
+   <TEST name="AtlasG4_tfMP-SharedReader" type="script" suite="AthenaMPSimSharedReader">
+      <package_atn>AtlasTest/AthenaMPTest</package_atn>
+      <doc>Tests MP simulation in TF with the Shared Reader process</doc>
+      <options_atn>TRF_ECHO=1 ATHENA_PROC_NUMBER=2 AtlasG4_tf.py --inputEVNTFile '/afs/cern.ch/atlas/offline/ProdData/16.6.X/16.6.7.Y/ttbar_muplusjets-pythia6-7000.evgen.pool.root' --outputHITSFile 'HITSMPSimSharedReader.pool.root' --maxEvents '4' --skipEvents '0' --randomSeed '10' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'FTFP_BERT' --postInclude 'PyJobTransforms/UseFrontier.py' 'AtlasG4Tf:G4AtlasTests/postInclude.DCubeTest.py' --preExec 'AtlasG4Tf:simFlags.ReleaseGeoModel=False;from AthenaMP.AthenaMPFlags import jobproperties as jps;jps.AthenaMPFlags.UseSharedReader=True'</options_atn>
+      <timelimit>30</timelimit>
+      <author>Vakho Tsulaia</author>
+      <mailto>tsulaia@cern.ch</mailto>
+      <expectations>
+        <returnValue>0</returnValue>
+      </expectations>
+    </TEST>
 
-    <TEST name="DigiTfPileUpMP" type="script" suite="AthenaMPSim">
+    <TEST name="DigiTfPileUpMP" type="script" suite="AthenaMPDigi">
       <package_atn>AtlasTest/AthenaMPTest</package_atn>
-      <doc>Tests pile-up digitization</doc>
-      <options_atn>TRF_ECHO=1 Digi_tf.py '--athenaopts=--nprocs=2' '--inputHitsFile' '/afs/cern.ch/atlas/offline/ProdData/MC12/digitization/mc11_7TeV.105200.T1_McAtNlo_Jimmy.merge.HITS.e835_s1310_s1300/HITS.508808._000857.pool.root.1' '--outputRDOFile' 'mc11_ttbar.RDO.pool.root' '--maxEvents=4' '--skipEvents=0' '--geometryVersion' 'ATLAS-GEO-18-01-03' '--conditionsTag' 'OFLCOND-SDR-BS7T-05-24' '--digiRndmSvc' 'AtDSFMTGenSvc' '--digiSeedOffset1' '11' '--digiSeedOffset2' '22' '--preExec' 'from AthenaMP.AthenaMPFlags import jobproperties as jps' 'jps.AthenaMPFlags.CollectSubprocessLogs=True' 'from Digitization.DigitizationFlags import digitizationFlags' 'digitizationFlags.overrideMetadata=["SimLayout","PhysicsList"]' '--preInclude' 'Digitization/ForceUseOfPileUpTools.py' '--numberOfHighPtMinBias'  '0.022668' '--numberOfLowPtMinBias' '19.977332' '--LowPtMinbiasHitsFile' '/afs/cern.ch/atlas/offline/ProdData/MC12/digitization/mc11_7TeV.108118.Pythia8_minbias_Inelastic_low.merge.HITS.e816_s1354_s1360/HITS.580376._000431.pool.root.1,/afs/cern.ch/atlas/offline/ProdData/MC12/digitization/mc11_7TeV.108118.Pythia8_minbias_Inelastic_low.merge.HITS.e816_s1354_s1360/HITS.580376._000962.pool.root.1,/afs/cern.ch/atlas/offline/ProdData/MC12/digitization/mc11_7TeV.108118.Pythia8_minbias_Inelastic_low.merge.HITS.e816_s1354_s1360/HITS.580376._001224.pool.root.1,/afs/cern.ch/atlas/offline/ProdData/MC12/digitization/mc11_7TeV.108118.Pythia8_minbias_Inelastic_low.merge.HITS.e816_s1354_s1360/HITS.580376._001354.pool.root.1' '--HighPtMinbiasHitsFile' '/afs/cern.ch/atlas/offline/ProdData/MC12/digitization/mc11_7TeV.108119.Pythia8_minbias_Inelastic_high.merge.HITS.e848_s1354_s1360/HITS.580377._004008.pool.root.1,/afs/cern.ch/atlas/offline/ProdData/MC12/digitization/mc11_7TeV.108119.Pythia8_minbias_Inelastic_high.merge.HITS.e848_s1354_s1360/HITS.580377._004706.pool.root.1,/afs/cern.ch/atlas/offline/ProdData/MC12/digitization/mc11_7TeV.108119.Pythia8_minbias_Inelastic_high.merge.HITS.e848_s1354_s1360/HITS.580377._006612.pool.root.1,/afs/cern.ch/atlas/offline/ProdData/MC12/digitization/mc11_7TeV.108119.Pythia8_minbias_Inelastic_high.merge.HITS.e848_s1354_s1360/HITS.580377._009049.pool.root.1'</options_atn>
+      <doc>Tests MP pile-up digitization</doc>
+      <options_atn>ATHENA_PROC_NUMBER=4 Digi_tf.py @/afs/cern.ch/user/t/tsulaia/public/DigiTfPileUpMP/HitsFile --conditionsTag default:OFLCOND-RUN12-SDR-25 --digiSeedOffset1 170 --digiSeedOffset2 170 --geometryVersion ATLAS-R2-2015-03-01-00 @/afs/cern.ch/user/t/tsulaia/public/DigiTfPileUpMP/HighPtMinbiasHitsFile @/afs/cern.ch/user/t/tsulaia/public/DigiTfPileUpMP/LowPtMinbiasHitsFile --jobNumber 1 --maxEvents 12 --numberOfCavernBkg 0 --numberOfHighPtMinBias 0.12268057 --numberOfLowPtMinBias 39.8773194 --outputRDOFile mc15_2015_ttbar.RDO.pool.root --postExec 'all:CfgMgr.MessageSvc().setError+=["HepMcParticleLink"]' 'HITtoRDO:from AthenaCommon.CfgGetter import getPublicTool;getPublicTool("MergeMcEventCollTool").OnlySaveSignalTruth=True;ToolSvc.LArAutoCorrTotalToolDefault.deltaBunch=1' --postInclude 'default:PyJobTransforms/UseFrontier.py' --pileupFinalBunch 6 --preExec    'all:from AthenaCommon.BeamFlags import jobproperties;jobproperties.Beam.numberOfCollisions.set_Value_and_Lock(20.0);from LArROD.LArRODFlags import larRODFlags;larRODFlags.NumberOfCollisions.set_Value_and_Lock(20);larRODFlags.nSamples.set_Value_and_Lock(4);larRODFlags.doOFCPileupOptimization.set_Value_and_Lock(True);larRODFlags.firstSample.set_Value_and_Lock(0);larRODFlags.useHighestGainAutoCorr.set_Value_and_Lock(True)' --preInclude 'HITtoRDO:Digitization/ForceUseOfPileUpTools.py,SimulationJobOptions/preInclude.PileUpBunchTrainsMC15_2015_25ns_Config1.py,RunDependentSimData/configLumi_run222525_v1.py' --skipEvents 0</options_atn>
       <timelimit>30</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/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/AthenaPoolTestD.h

@@ -24,20 +24,11 @@
 #ifndef ATHENAPOOLTESTDATA_ATHENAPOOLTESTD_H
 # define ATHENAPOOLTESTDATA_ATHENAPOOLTESTD_H
 
-//<<<<<< INCLUDES                                                       >>>>>>
 
 #include "AthenaPoolTestData/AthenaPoolTestC.h"
 //#include "CLHEP/Geometry/Point3D.h"
-//#include <string>
+#include <string>
 
-//<<<<<< PUBLIC DEFINES                                                 >>>>>>
-//<<<<<< PUBLIC CONSTANTS                                               >>>>>>
-//<<<<<< PUBLIC TYPES                                                   >>>>>>
-//<<<<<< PUBLIC VARIABLES                                               >>>>>>
-//<<<<<< PUBLIC FUNCTIONS                                               >>>>>>
-//<<<<<< CLASS DECLARATIONS                                             >>>>>>
-
-class string;
 
 class AthenaPoolTestD : public AthenaPoolTestC 
 {

AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/AthenaPoolTestMapData.h

@@ -39,7 +39,6 @@ public:
 
     AthenaPoolTestMapData();
     AthenaPoolTestMapData (const std::vector< Deposit >& deposits, int simDataWord = 0);
-    AthenaPoolTestMapData (const AthenaPoolTestMapData& other);
     virtual ~AthenaPoolTestMapData();
 
     int word() const;                           // Get the packed simdata word