AtlasGeometryCommon/SubDetectorEnvelopes/SubDetectorEnvelopes/IEnvelopeDefSvc.h

@@ -17,9 +17,6 @@
 // SubDetectorEnvelopes includes
 #include "SubDetectorEnvelopes/RZPair.h"
 
-// interface definition
-static const InterfaceID IID_IEnvelopeDefSvc("IEnvelopeDefSvc", 1, 0);
-
 class IEnvelopeDefSvc : virtual public IInterface {
   /**
    @class IEnvelopeDefSvc
@@ -32,12 +29,12 @@ class IEnvelopeDefSvc : virtual public IInterface {
    */
 
   public:
+    // interface definition
+    DeclareInterfaceID(IEnvelopeDefSvc, 1, 0);
+
     /** virtual distructor */
     virtual ~IEnvelopeDefSvc() {};
 
-    /** AlgTool interface methods */
-    static const InterfaceID& interfaceID() { return IID_IEnvelopeDefSvc; }
-
     /** return a vector of (r,z) pairs, defining the respective envelope */
     virtual const RZPairVector &getRZBoundary( AtlasDetDescr::AtlasRegion region ) const = 0;
 

AtlasGeometryCommon/SubDetectorEnvelopes/cmt/requirements

-package SubDetectorEnvelopes
-author <Elmar.Ritsch@cern.ch>
-manager Elmar Ritsch <Elmar.Ritsch@cern.ch>
-
-#################################################################
-# public use statements
-use AtlasPolicy                 AtlasPolicy-*
-use GaudiInterface              GaudiInterface-*        External
-use AtlasDetDescr               AtlasDetDescr-*         DetectorDescription
-
-#################################################################
-# private use statements
-private
-use AthenaBaseComps             AthenaBaseComps-*       Control
-use RDBAccessSvc                RDBAccessSvc-*          Database/AthenaPOOL
-use GeoModelInterfaces          GeoModelInterfaces-*    DetectorDescription/GeoModel
-use AtlasCLHEP                  AtlasCLHEP-*            External
-
-public
-library SubDetectorEnvelopes *.cxx components/*.cxx
-apply_pattern component_library
-
-apply_pattern declare_joboptions files="*.py"
-apply_pattern declare_python_modules files="*.py"
-
-# use the following lines to compile this package with debug symbols
-#private
-#macro cppdebugflags '$(cppdebugflags_s)'
-#macro_remove componentshr_linkopts "-Wl,-s"

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'   )
@@ -152,3 +165,126 @@ class Volume:
   def getZs(self):
     return self.z
 
+# For new configuration - doesn't have access to DetFlags as of writing, so all HGTD stuff is missing.
+# Just copied from above.
+def EnvelopeDefSvc(flags,  **kwargs):
+    kwargs.setdefault("DBInDetNode"       , 'InDetEnvelope'    )
+    kwargs.setdefault("DBBeamPipeNode"    , 'BeamPipeEnvelope' )
+    kwargs.setdefault("DBCaloNode"        , 'CaloEnvelope'     )
+    kwargs.setdefault("DBMSNode"          , 'MuonEnvelope'     )
+    kwargs.setdefault("DBCavernNode"      , 'CavernEnvelope'   )
+
+    # allow for python-based envelope definitions (see below)
+    #  -> TODO: set this to False once the envelope definitions are tagged in the DDDB
+    kwargs.setdefault("EnableFallback"  , True             )
+
+    # setup fallback BeamPipeEnvelope
+    BeamPipe = Volume()
+    BeamPipe.addRZ(   34.3,   3475.0 )
+    BeamPipe.addRZ(  120.0,   3475.0 ) # TODO - re-add HGTD stuff once we can configure 
+    BeamPipe.addRZ(  120.0,   4185.0 )
+    BeamPipe.addRZ(   41.0,   4185.0 )
+    BeamPipe.addRZ(   41.0,   6783.0 )
+    BeamPipe.addRZ(   70.0,   6783.0 )
+    BeamPipe.addRZ(   70.0,  12900.0 )
+    BeamPipe.addRZ(  279.0,  12900.0 )
+    BeamPipe.addRZ(  279.0,  18650.0 )
+    BeamPipe.addRZ(  436.0,  18650.0 )
+    BeamPipe.addRZ(  436.0,  22030.0 )
+    BeamPipe.addRZ( 1050.0,  22030.0 )
+    BeamPipe.addRZ( 1050.0,  26046.0 )
+    BeamPipe.addRZ(    0.0,  26046.0 )
+
+    kwargs.setdefault("FallbackBeamPipeR"    ,  BeamPipe.getRs()        )
+    kwargs.setdefault("FallbackBeamPipeZ"    ,  BeamPipe.getZs()        )
+
+
+    # setup fallback IDEnvelope
+    InDet = Volume()
+    InDet.addRZ( 1148.,  3475. )
+    InDet.addRZ(  34.3,  3475. )
+    kwargs.setdefault("FallbackInDetR"  , InDet.getRs()        )
+    kwargs.setdefault("FallbackInDetZ"  , InDet.getZs()        )
+
+
+    # setup fallback CaloEnvelope
+    Calo = Volume()
+    Calo.addRZ( 1148.0,  3475.0 )
+    Calo.addRZ(  120.0,  3475.0 ) # TODO - re-add HGTD stuff once we can configure 
+    Calo.addRZ(  120.0,  4185.0 )
+    Calo.addRZ(   41.0,  4185.0 )
+    Calo.addRZ(   41.0,  6783.0 )
+    Calo.addRZ(  420.0,  6783.0 )
+    Calo.addRZ(  420.0,  6736.0 )
+    Calo.addRZ( 3800.0,  6736.0 )
+    Calo.addRZ( 3800.0,  6550.0 )
+    Calo.addRZ( 4255.0,  6550.0 )
+
+    kwargs.setdefault("FallbackCaloR"   , Calo.getRs()        )
+    kwargs.setdefault("FallbackCaloZ"   , Calo.getZs()        )
+
+
+    # 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 , 12900.0 )
+    Muon.addRZ(   279.0 , 12900.0 )
+    Muon.addRZ(   279.0 , 18650.0 )
+    Muon.addRZ(   436.7 , 18650.0 )
+    Muon.addRZ(   436.7 , 22030.0 )
+    Muon.addRZ(  1050.0 , 22030.0 )
+    Muon.addRZ(  1050.0 , 26046.0 )
+    Muon.addRZ(  1500.0 , 26046.0 )
+    Muon.addRZ(  1500.0 , 23001.0 )
+    Muon.addRZ(  2750.0 , 23001.0 )
+    Muon.addRZ(  2750.0 , 22030.0 )
+    Muon.addRZ( 12650.0 , 22030.0 )
+    Muon.addRZ( 12650.0 , 18650.0 )
+    Muon.addRZ( 13400.0 , 18650.0 )
+    Muon.addRZ( 13400.0 , 12900.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
+    Cavern = Volume()
+    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
+    Cavern.addRZ( 12650.0 , 22030.0 ) # boundary with MS
+    Cavern.addRZ(  2750.0 , 22030.0 ) # boundary with MS
+    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 ) #
+
+    # the outer dimesions differ between collision and cosmics jobs
+    from AthenaCommon.BeamFlags import jobproperties
+    if flags.Beam.Type != 'cosmics':
+      #  -> for collision jobs the 'cavern' envelope is much smaller
+      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'   )
+      kwargs.setdefault("EnableFallback"  , True                   )
+      Cavern.addRZ(       0.0 , 3000000.0 ) # z= +3km
+      Cavern.addRZ( 3000000.0 , 3000000.0 ) # r=  3km
+    kwargs.setdefault("FallbackCavernR"   , Cavern.getRs()        )
+    kwargs.setdefault("FallbackCavernZ"   , Cavern.getZs()        )
+
+    from SubDetectorEnvelopes.SubDetectorEnvelopesConf import DetDescrDBEnvelopeSvc
+    return DetDescrDBEnvelopeSvc(**kwargs)
+    

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)

AtlasGeometryCommon/SubDetectorEnvelopes/src/DetDescrDBEnvelopeSvc.cxx

@@ -30,7 +30,7 @@
 
 /** Constructor */
 DetDescrDBEnvelopeSvc::DetDescrDBEnvelopeSvc(const std::string& name, ISvcLocator* svc) :
-  AthService(name,svc),
+  base_class(name,svc),
   m_dbAccess(0),
   m_geoModel(0),
   m_atlasNode("ATLAS"),
@@ -102,12 +102,6 @@ StatusCode DetDescrDBEnvelopeSvc::initialize()
     if ( !enableFallback()) return StatusCode::FAILURE;
   }
 
-  // connect to DDDB
-  if ( !m_doFallback && m_dbAccess->connect()==false) {
-    ATH_MSG_ERROR("Unable not connect to ATLASDD Database");
-    if ( !enableFallback()) return StatusCode::FAILURE;
-  }
-
   // retrieve the GeoModelSvc
   if ( !m_doFallback && svcLocator->service("GeoModelSvc", m_geoModel).isFailure()) {
     ATH_MSG_ERROR("Could not locate GeoModelSvc");
@@ -135,8 +129,6 @@ StatusCode DetDescrDBEnvelopeSvc::initialize()
       }
     }
 
-    // disconnect the DB access svc
-    m_dbAccess->disconnect();
   }
 
   // (#) or use the fallback solution right away
@@ -241,7 +233,7 @@ StatusCode DetDescrDBEnvelopeSvc::retrieveRZBoundary( std::string  &node,
   //              << parentVersionTag << " / " << envVersionTag );
 
   // get a handle on the DB entries (don't delete, handeled internally)
-  const IRDBRecordset *envelopeRec = m_dbAccess->getRecordset( node,
+  IRDBRecordset_ptr envelopeRec = m_dbAccess->getRecordsetPtr( node,
                                                                m_atlasVersionTag,
                                                                m_atlasNode );
 
@@ -301,16 +293,3 @@ StatusCode DetDescrDBEnvelopeSvc::fallbackRZBoundary( FallbackDoubleVector &r,
 }
 
 
-/** Query the interfaces. */
-StatusCode DetDescrDBEnvelopeSvc::queryInterface(const InterfaceID& riid, void** ppvInterface) {
-
- if ( IID_IEnvelopeDefSvc == riid ) 
-    *ppvInterface = (IEnvelopeDefSvc*)this;
- else  {
-   // Interface is not directly available: try out a base class
-   return Service::queryInterface(riid, ppvInterface);
- }
- addRef();
- return StatusCode::SUCCESS;
-}
-

AtlasGeometryCommon/SubDetectorEnvelopes/src/DetDescrDBEnvelopeSvc.h

@@ -27,7 +27,7 @@ class IGeoModelSvc;
 typedef std::vector< double >           FallbackDoubleVector;
 
 
-class DetDescrDBEnvelopeSvc : public IEnvelopeDefSvc, virtual public AthService {
+class DetDescrDBEnvelopeSvc : public extends<AthService, IEnvelopeDefSvc> {
 
   public:
     /** public AthService constructor */
@@ -36,9 +36,6 @@ class DetDescrDBEnvelopeSvc : public IEnvelopeDefSvc, virtual public AthService
     /** Destructor */
     ~DetDescrDBEnvelopeSvc();
 
-    /** Query the interfaces. */
-    StatusCode queryInterface( const InterfaceID& riid, void** ppvInterface );
-
     /** AthService initialize method.*/
     StatusCode initialize();
     /** AthService finalize method */

AtlasGeometryCommon/SubDetectorEnvelopes/src/components/SubDetectorEnvelopes_entries.cxx

-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "src/DetDescrDBEnvelopeSvc.h"
 
-DECLARE_SERVICE_FACTORY( DetDescrDBEnvelopeSvc )
-
-DECLARE_FACTORY_ENTRIES( SubDetectorEnvelopes ) {
-  DECLARE_SERVICE( DetDescrDBEnvelopeSvc )
-}
+DECLARE_COMPONENT( DetDescrDBEnvelopeSvc )
 

AtlasGeometryCommon/SubDetectorEnvelopes/src/components/SubDetectorEnvelopes_load.cxx

-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( SubDetectorEnvelopes )
-

AtlasTest/AthenaMPTest/cmt/requirements

-package AthenaMPTest
-author Mous Tatarkhanov <tmmous@berkeley.edu>
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasReconstructionRunTime AtlasReconstructionRunTime-* -no_auto_imports
-use TestPolicy          TestPolicy-*
-use TestTools       TestTools-*          AtlasTest
-
-apply_pattern declare_joboptions files="*.py"
-
-#integration tests
-apply_pattern install_applications
-apply_pattern install_xmls
-
-private
-apply_pattern validate_xml
-public
-

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 764877 2016-07-28 01:48:11Z ssnyder $
 ################################################################################
 # Package: ControlTest
 ################################################################################
@@ -13,7 +13,6 @@ atlas_depends_on_subdirs(
    Control/AthenaExamples/AthExFortranAlgorithm
    Control/AthenaExamples/AthExStoreGateExample
    Control/AthenaPython
-   Control/MinimalRunTime
    TestPolicy
    PRIVATE
    Control/CxxUtils
@@ -89,9 +88,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,20 +109,30 @@ endif()
 
 atlas_add_test( StoreGateReentrant
    SCRIPT test/StoreGateReentrant.sh
-   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" )
+   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|TExMapRemove" )
 
 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" )
 
+atlas_add_test( test_cfgItemList
+                SCRIPT test/test_cfgItemList.sh )
+
+atlas_add_test( test_keyStore
+                SCRIPT test/test_keyStore.sh )
+
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/StoreGateTestCommon.txt share/*.py )

AtlasTest/ControlTest/cmt/requirements

-package ControlTest
-author Paolo Calafiura <Paolo.Calafiura@cern.ch>
-use AtlasPolicy     AtlasPolicy-*
-
-use MinimalRunTime  MinimalRunTime-*     Control  -no_auto_imports
-
-#apply_pattern declare_runtime_extras extras="pre.sh"
-#apply_pattern declare_scripts files="pre.sh"
-
-use TestPolicy      TestPolicy-*   
-use TestTools       TestTools-*          AtlasTest
-
-#FIXME AthenaServices should not be needed but actually is (make check fails)
-#use AthenaServices  AthenaServices-*     Control
-use AthenaPython    AthenaPython-*       Control -no_auto_imports
-
-#SGTools/SGComps test that can't be run there due to ToyConversion dep
-#use SGComps         SGComps-*            Control
-
-private
-use GaudiInterface  GaudiInterface-*     External
-use CxxUtils        CxxUtils-*           Control
-use AthenaKernel    AthenaKernel-*       Control
-use AthContainers   AthContainers-*      Control
-use AthLinks        AthLinks-*           Control
-use SGTools         SGTools-*            Control
-use StoreGate       StoreGate-*          Control
-use ToyConversion   ToyConversion-*      Control/AthenaExamples
-end_private
-
-macro PPSoptignore "" \
-      optimized "requestRelease|"
-
-
-apply_pattern UnitTest_run unit_test=DataProxy \
-  extrapatterns="HistogramPersis.* +INFO|EventPersistenc.*INFO|^JobOptionsSvc +INFO|IConversionSvc ptr not set"
-apply_pattern UnitTest_run unit_test=ProxyProviderSvc \
-              extrapatterns="$(PPSoptignore)^ClassIDSvc +DEBUG|Histogram.* (DEBUG|INFO)|DetectorStore +DEBUG|ToyConversionSvc +DEBUG|EventDataSvc +DEBUG|EventPersis.* +(DEBUG|INFO)|HistoryStore +DEBUG|^JobOptionsSvc +INFO|^DataProxy +VERBOSE|^ProxyProviderSvc +DEBUG|^ServiceManager +DEBUG|Service base class initialized successfully|found service"
-
-#DataModel tests that can't be run there due to StoreGate dep
-apply_pattern UnitTest_run unit_test=CircularDep \
-  extrapatterns="^JobOptionsSvc +INFO|Service base class initialized successfully"
-apply_pattern UnitTest_run unit_test=SGDataLink \
-  extrapatterns="^JobOptionsSvc +INFO|Service base class initialized successfully"
-apply_pattern UnitTest_run unit_test=ElementLink \
-  extrapatterns="^JobOptionsSvc +INFO|Service base class initialized successfully"
-apply_pattern UnitTest_run unit_test=ElementLinkVector \
-  extrapatterns="^JobOptionsSvc +INFO|Service base class initialized successfully"
-
-#StoreGate tests that are better run here due to the SGComps (PPS) run-time dependency
-apply_pattern declare_joboptions files="StoreGateTestCommon.txt *.py"
-
-apply_pattern UnitTest_run unit_test=StoreGateSvcClient extrapatterns="modifiable when retrieved|HistogramPersis.* +INFO|^JobOptionsSvc +INFO|Service base class initialized successfully|VERBOSE committing dataObj|DetectorStore.*error setting up proxy|DetectorStore.*record_impl: failed"
-macro_append StoreGateSvcClient_testlinkopts " -lSGtests"
-apply_pattern UnitTest_run unit_test=ClearStore \
-  extrapatterns="^JobOptionsSvc +INFO|Service base class initialized successfully"
-macro_append ClearStore_testlinkopts " -lSGtests"
-#macro ClearStore_test_cppflags " -D __PROXYDEBUG"
-
-#integration tests
-apply_pattern install_applications
-apply_pattern install_xmls
-
-#FIXME does not work
-#apply_pattern athenarun_test name="<example>" \
-#	      pre_script="../cmt/setup.sh"	\	      
-#	      options=" AthEx<example>/<example>Options.txt" \
-#	      post_script="'${TESTTOOLSROOT}/share/post.sh <example>'"	      
-	      
-#apply_pattern athexample_run example="FortranAlgorithm"
-
-use AthExFortranAlgorithm AthExFortranAlgorithm-*   Control/AthenaExamples -no_auto_imports
-apply_pattern athenarun_test name="FortranAlgorithm" \
-	      pre_script="preFortAlgEx.sh"	\	      
-	      options="AthExFortranAlgorithm/FortranAlgorithmOptions.py" \
-	      post_script="${TESTTOOLSROOT}/share/post.sh FortranAlgorithm $(q)^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$(q)"
-
-macro SGGoptignore "" \
-      optimized "|Retrieved const handle to default object|of type EventInfo|object not modifiable when retrieved|requestRelease"
-use AthExStoreGateExample AthExStoreGateExample-*   Control/AthenaExamples -no_auto_imports
-
-apply_pattern athenarun_test name="StoreGateReentrant" \
-	      pre_script="../cmt/setup.sh"	\	      
-	      options="AthExStoreGateExample/StoreGateExample_Reentrant_jobOptions.py" \
-	      post_script="${TESTTOOLSROOT}/share/post.sh StoreGateReentrant $(q)^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$(q)"
-
-apply_pattern athenarun_test name="StoreGateGen" \
-	      pre_script="../cmt/setup.sh"	\	      
-	      options="AthExStoreGateExample/StoreGateExample_Gen_jobOptions.py" \
-	      post_script="${TESTTOOLSROOT}/share/post.sh StoreGateGen $(q)^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$(q)"
-
-apply_pattern athenarun_test name="StoreGateDFlow" \
-	      pre_script="../cmt/setup.sh"	\	      
-	      options="AthExStoreGateExample/dflow_jobo.py" \
-	      post_script="${TESTTOOLSROOT}/share/post.sh StoreGateDFlow $(q)^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$(q)"
-
-apply_pattern athenarun_test name="test_interactive_athena" \
-	      pre_script="../cmt/setup.sh"	\	      
-	      options="ControlTest/test_interactive_athena.py" \
-	      post_script="${TESTTOOLSROOT}/share/post.sh test_interactive_athena $(q)^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$(q)"
-
-## AthenaCommon/python unit-test
-apply_pattern declare_python_modules files="*.py"
-

AtlasTest/ControlTest/share/DataProxy_test.ref

@@ -2,43 +2,32 @@
 
 
 Initializing Gaudi ApplicationMgr using job opts ../share/DataProxy_test.txt
-JobOptionsSvc        INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work14/InstallArea/jobOptions/ControlTest/StoreGateTestCommon.txt
-JobOptionsSvc        INFO # (5,1): ApplicationMgr.ExtSvc += ["StoreGateSvc/DetectorStore", "StoreGateSvc/HistoryStore"]
+JobOptionsSvc        INFO # =======> /home/sss/atlas/rootaccess/build/joboptions/ControlTest/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 # =======> /afs/cern.ch/atlas/software/builds/nightlies/mig14/AtlasCore/rel_3/InstallArea/jobOptions/ToyConversion/ToyConversionOpts.txt
+JobOptionsSvc        INFO # =======> /home/sss/atlas/rootaccess/build/joboptions/ToyConversion/ToyConversionOpts.txt
 JobOptionsSvc        INFO # (5,1): EventPersistencySvc.CnvServices += ["ToyConversionSvc"]
 JobOptionsSvc        INFO Job options successfully read in from ../share/DataProxy_test.txt
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v2r1)
-                                          running on lxplus0158 on Wed Apr 23 20:31:29 2014
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
+                                          running on karma on Thu Aug  3 19:40:18 2017
 ====================================================================================================================================
 ApplicationMgr       INFO Application Manager Configured successfully
-DetectorStore        INFO Initializing DetectorStore - package version StoreGate-02-41-08
-ClassIDSvc           INFO Initializing ClassIDSvc - package version CLIDComps-00-06-11
-ClassIDSvc           INFO  getRegistryEntries: read 153 CLIDRegistry entries for module ALL
-ProxyProviderSvc     INFO Initializing ProxyProviderSvc - package version SGComps-00-01-07
-HistoryStore         INFO Initializing HistoryStore - package version StoreGate-02-41-08
+ClassIDSvc           INFO  getRegistryEntries: read 1913 CLIDRegistry entries for module ALL
 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
-Now we expect to see a warning message:
-----Warning Message Starts--->>
-<<---Warning Message Ends-------
-FIXME: in opt 32 bits we need to print the address of addressProxy to avoid a crash when the jobs ends!?!  @0x7fff17a40a10
-building toy 0xff8ae0
+FIXME: in opt 32 bits we need to print the address of addressProxy to avoid a crash when the jobs ends!?!  @0x7ffc8985ffb0
 EventPersistenc...   INFO Added successfully Conversion service:ToyConversionSvc
 Now we expect to see a warning message:
 ----Warning Message Starts--->>
 DataProxy         WARNING accessData:  IOA pointer not set
 <<---Warning Message Ends-------
-Now we expect to see an warning message:
-----Warning Message Starts--->>
-<<---Warning Message Ends-------
 *** DataProxy_test OK ***

AtlasTest/ControlTest/share/FortranAlgorithm.ref

-Sat Mar 12 19:56:23 CET 2016
+Fri Mar 17 15:16:35 CET 2017
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [AtlasOffline-21.0.0] [x86_64-slc6-gcc49-dbg] [21.X.Y-VAL/rel_6] -- built on [2016-03-11 22:40]
-Py:Athena            INFO including file "AthenaCommon/Bootstrap.py"
+Py:Athena            INFO using release [AthenaExternals-22.0.0] [x86_64-slc6-gcc49-opt] [private/private] -- built on [2017-03-16 21:31]
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Py:Athena            INFO executing ROOT6Setup
 [?1034hPy:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "AthExFortranAlgorithm/FortranAlgorithmOptions.py"
 Py:Athena            INFO including file "AthenaCommon/runbatch.py"
-Py:ConfigurableDb    INFO Read module info for 5022 configurables from 10 genConfDb files
-Py:ConfigurableDb WARNING Found 1 duplicates among the 10 genConfDb files :
-Py:ConfigurableDb WARNING --------------------------------------------------
-Py:ConfigurableDb WARNING   -<component name>: <module> - [ <duplicates> ]
-Py:ConfigurableDb WARNING --------------------------------------------------
-Py:ConfigurableDb WARNING   -TrigHLTJetHypo: TrigJetHypo.TrigJetHypoConf - ['TrigHLTJetHypo.TrigHLTJetHypoConf']
-Py:ConfigurableDb WARNING Fix your cmt/requirements file !!
-ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level=0
+Py:ConfigurableDb    INFO Read module info for 5282 configurables from 2 genConfDb files
+Py:ConfigurableDb    INFO No duplicates have been found: that's good !
+ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v3r4)
-                                          running on lxplus031.cern.ch on Sat Mar 12 19:56:35 2016
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v28r1)
+                                          running on p05614910w96644.cern.ch on Fri Mar 17 15:16:49 2017
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
-ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level=0
+ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 StatusCodeSvc        INFO initialize
 AthDictLoaderSvc     INFO in initialize...
 AthDictLoaderSvc     INFO acquired Dso-registry
-ClassIDSvc           INFO Initializing ClassIDSvc - package version CLIDComps-00-06-19
-ClassIDSvc           INFO  getRegistryEntries: read 2109 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 2252 CLIDRegistry entries for module ALL
 ChronoStatSvc        INFO  Number of skipped events for MemStat-1
 CoreDumpSvc          INFO install f-a-t-a-l handler... (flag = -1)
 CoreDumpSvc          INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception) 
-AthenaEventLoopMgr   INFO Initializing AthenaEventLoopMgr - package version AthenaServices-01-60-02
-AthMasterSeq         INFO Member list: AthSequencer/AthAlgSeq, AthSequencer/AthOutSeq, AthSequencer/AthRegSeq
-AthAlgSeq            INFO Member list: FortranAlgorithm
+AthenaEventLoopMgr   INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
 FortranAlgorithm     INFO calling initialize_()
-StoreGateSvc         INFO Initializing StoreGateSvc - package version StoreGate-03-06-31
-ProxyProviderSvc     INFO Initializing ProxyProviderSvc - package version SGComps-00-02-07
 HistogramPersis...WARNING Histograms saving not required.
-ActiveStoreSvc       INFO Initializing ActiveStoreSvc - package version StoreGate-03-06-31
 ApplicationMgr       INFO Application Manager Initialized successfully
-StoreGateSvc         INFO Start StoreGateSvc
 ApplicationMgr       INFO Application Manager Started successfully
+ClassIDSvc           INFO  getRegistryEntries: read 767 CLIDRegistry entries for module ALL
 AthenaEventLoopMgr   INFO   ===>>>  start of run 1    <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #1, run #1 0 events processed so far  <<<===
 FortranAlgorithm     INFO calling execute_()
@@ -54,21 +42,16 @@ Before the backspace
 Reading 4A
 Reading 5B
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #1, run #1 1 events processed so far  <<<===
-StoreGateSvc         INFO Stop StoreGateSvc
-StoreGateSvc         INFO stop: setting service priority to 101 so that event stores get finalized and cleared before other stores
 ApplicationMgr       INFO Application Manager Stopped successfully
+IncidentProcAlg1     INFO Finalize
 FortranAlgorithm     INFO calling finalize_()
-AthAlgSeq            INFO Finalizing AthAlgSeq...
-AthOutSeq            INFO Finalizing AthOutSeq...
-AthRegSeq            INFO Finalizing AthRegSeq...
-AthMasterSeq         INFO Finalizing AthMasterSeq...
-StoreGateSvc         INFO Finalizing StoreGateSvc - package version StoreGate-03-06-31
+IncidentProcAlg2     INFO Finalize
 AthDictLoaderSvc     INFO in finalize...
 ToolSvc              INFO Removing all tools created by ToolSvc
 *****Chrono*****     INFO ****************************************************************************************************
 *****Chrono*****     INFO  The Final CPU consumption ( Chrono ) Table (ordered)
 *****Chrono*****     INFO ****************************************************************************************************
-ChronoStatSvc        INFO Time User   : Tot=  107 [ms]                                             #=  1
+ChronoStatSvc        INFO Time User   : Tot=   90 [ms]                                             #=  1
 *****Chrono*****     INFO ****************************************************************************************************
 ChronoStatSvc.f...   INFO  Service finalized successfully 
 ApplicationMgr       INFO Application Manager Finalized successfully

AtlasTest/ControlTest/share/HelloWorld.ref

@@ -17,7 +17,7 @@ ApplicationMgr.EventLoop = "AthenaEventLoopMgr";
 
 ApplicationMgr.DLLs   += { "StoreGate", "CLIDSvc" };
 ApplicationMgr.ExtSvc += { "ClassIDSvc" };
-ApplicationMgr.ExtSvc += { "StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/ConditionsStore" };
+ApplicationMgr.ExtSvc += { "StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/ConditionStore" };
 ApplicationMgr.ExtSvc += { "ActiveStoreSvc" };
 //FIXME uncomment to verify that your  CLIDs are good!
 //ClassIDSvc.CLIDDBFiles += { "$CLIDSVCROOT/share/clid.db" };
@@ -143,9 +143,9 @@ ProxyProviderSvc     INFO Initializing ProxyProviderSvc - package version StoreG
 ServiceManager      DEBUG Initializing service DetectorStore
 DetectorStore       DEBUG Service base class initialized successfully
 DetectorStore        INFO Initializing DetectorStore - package version StoreGate-02-12-08
-ServiceManager      DEBUG Initializing service ConditionsStore
-ConditionsStore     DEBUG Service base class initialized successfully
-ConditionsStore      INFO Initializing ConditionsStore - package version StoreGate-02-12-08
+ServiceManager      DEBUG Initializing service ConditionStore
+ConditionStore     DEBUG Service base class initialized successfully
+ConditionStore      INFO Initializing ConditionStore - package version StoreGate-02-12-08
 ServiceManager      DEBUG Initializing service ActiveStoreSvc
 ActiveStoreSvc      DEBUG Service base class initialized successfully
 ActiveStoreSvc       INFO Initializing ActiveStoreSvc - package version StoreGate-02-12-08

AtlasTest/ControlTest/share/HistNtup.ref

@@ -49,7 +49,7 @@ AthenaEventLoopMgr.OutStreamType = "AthenaOutputStream";
 
 ApplicationMgr.DLLs   += { "StoreGate", "CLIDSvc" };
 ApplicationMgr.ExtSvc += { "ClassIDSvc" };
-ApplicationMgr.ExtSvc += { "StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/ConditionsStore" };
+ApplicationMgr.ExtSvc += { "StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/ConditionStore" };
 ApplicationMgr.ExtSvc += { "ActiveStoreSvc" };
 //FIXME uncomment to verify that your  CLIDs are good!
 //ClassIDSvc.CLIDDBFiles += { "$CLIDSVCROOT/share/clid.db" };
@@ -322,7 +322,7 @@ ClassIDSvc           INFO ClassIDSvc Initialized successfully
 StoreGateSvc         INFO Initializing StoreGateSvc - package version StoreGate-02-12-08
 ProxyProviderSvc     INFO Initializing ProxyProviderSvc - package version StoreGate-02-12-08
 DetectorStore        INFO Initializing DetectorStore - package version StoreGate-02-12-08
-ConditionsStore      INFO Initializing ConditionsStore - package version StoreGate-02-12-08
+ConditionStore      INFO Initializing ConditionStore - package version StoreGate-02-12-08
 ActiveStoreSvc       INFO Initializing ActiveStoreSvc - package version StoreGate-02-12-08
 DetDescrCnvSvc       INFO  initializing 
 DetDescrCnvSvc       INFO Found DetectorStore service