Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Target

Show changes

Only incoming changes from source

Include changes to target after source was created

Commits on Source 11

Add debug tutorial. · 69d8a935
scott snyder authored Sep 17, 2019

69d8a935
Add parameters so we can make tests with different numbers of threads. · 4a1e5986
Edward Moyse authored Sep 20, 2019

4a1e5986
Trying to make it possible to run and still be able to dump functional pickle. · e59734d2
Edward Moyse authored Sep 23, 2019

e59734d2
Merge remote-tracking branch 'upstream/master' into SoftwareDevTutorial · 90c5c83c
Edward Moyse authored Sep 24, 2019

90c5c83c
Adding demo package for the 2019 SW dev tutorial · b0e00a34
Edward Moyse authored Sep 24, 2019

b0e00a34
Add check for thread safety. · 8f24a88b
Edward Moyse authored Sep 24, 2019

8f24a88b
Removed explicit constructor. · c2fc6dcc
Edward Moyse authored Sep 24, 2019

c2fc6dcc

Ongoing effort to get Muon standalone working. Now added ability to set... · 987c1ff5

Edward Moyse authored Sep 25, 2019

Ongoing effort to get Muon standalone working. Now added ability to set arguments, to be used in ART tests. Found some missing configuration which is now added. And a protection against a rare crash.

Fixes for configutation of MooSegmentCombinationFinder to allow it to be overridden properly for NCB
Added missing MuonChamberHoleRecoveryToolCfg for track building
General fixes to make the concurrency configurable at runtime
Added some args to allow new threaded tests to work
Whitespace fixes, and also a protection against crashing for ATLASRECTS-5087 (real fix still under investigation).

987c1ff5

Handle the (unfortunate) fact that the name of the TGC container has changed. · 02bb9818
Edward Moyse authored Sep 26, 2019

02bb9818
Write out old tracks too. · ae64892f
Edward Moyse authored Sep 26, 2019

ae64892f
Merge branch 'master-add-more-new-config-muon-test' into master-SoftwareDevTutorial · 4ec44bdc
Edward Moyse authored Sep 26, 2019

4ec44bdc

Control/AthenaExamples/DevTutorialWriteAlgAndTool/CMakeLists.txt0 → 100644

+14
−0

Original line number
Diff line number
Diff line

atlas_subdir( DevTutorialWriteAlgAndTool )

atlas_depends_on_subdirs( PUBLIC

                          GaudiKernel

                          PRIVATE

                          Control/AthenaBaseComps

                          Event/xAOD/xAODTracking )

atlas_add_component( DevTutorialWriteAlgAndTool

                     src/*.cxx

                     src/components/*.cxx 

                     LINK_LIBRARIES GaudiKernel AthenaBaseComps xAODTracking )

atlas_install_python_modules( python/*.py )

Control/AthenaExamples/DevTutorialWriteAlgAndTool/DevTutorialWriteAlgAndTool/ATLAS_CHECK_THREAD_SAFETY0 → 100644

+0
−0

Original line number
Diff line number
Diff line

Control/AthenaExamples/DevTutorialWriteAlgAndTool/DevTutorialWriteAlgAndTool/IMyAlgTool.h0 → 100644

+28
−0

Original line number
Diff line number
Diff line

/*

  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration

*/

#ifndef MYNEWPACKAGE_IMYALGTOOL_H

#define MYNEWPACKAGE_IMYALGTOOL_H

#include "GaudiKernel/IAlgTool.h"

#include "xAODTracking/TrackParticle.h"

static const InterfaceID IID_IMyAlgTool("IMyAlgTool", 1, 0);

/** @class IMyAlgTool

    @brief Interface to demonstrate how to make an interface which actually does something useful.

*/

class IMyAlgTool : virtual public IAlgTool {

  public:

  static const InterfaceID& interfaceID( );

  virtual bool selectTrackParticle( const xAOD::TrackParticle& particle) const = 0 ;

};

inline const InterfaceID& IMyAlgTool::interfaceID()

{ 

	return IID_IMyAlgTool; 

}

#endif 

Control/AthenaExamples/DevTutorialWriteAlgAndTool/python/ExampleAlgConfig.py0 → 100644

+45
−0

Original line number
Diff line number
Diff line

# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration

from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator

from AthenaCommon.Constants import VERBOSE

from DevTutorialWriteAlgAndTool.DevTutorialWriteAlgAndToolConf import ExampleAlg

from TrkExTools.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg

def ExampleAlgCfg(configFlags, **kwargs):

    result=ComponentAccumulator()

    alg = ExampleAlg(**kwargs )

    result.addEventAlgo(alg)

    return result

if __name__=="__main__":

    from AthenaCommon.Configurable import Configurable

    from AthenaCommon.Logging import log

    from AthenaConfiguration.AllConfigFlags import ConfigFlags

    from AthenaConfiguration.MainServicesConfig import MainServicesThreadedCfg    

    from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg

    Configurable.configurableRun3Behavior=1

    from AthenaConfiguration.TestDefaults import defaultTestFiles

    ConfigFlags.Input.Files = defaultTestFiles.ESD

    ConfigFlags.Detector.GeometryPixel = True     

    ConfigFlags.Detector.GeometrySCT   = True 

    ConfigFlags.Detector.GeometryTRT   = True

    ConfigFlags.Concurrency.NumThreads = 1

    ConfigFlags.Concurrency.NumConcurrentEvents = 1

    ConfigFlags.lock()

    cfg=MainServicesThreadedCfg(ConfigFlags)

    cfg.merge(PoolReadCfg(ConfigFlags))

    from AthenaCommon.Constants import VERBOSE

    acc=ExampleAlgCfg(ConfigFlags, OutputLevel=VERBOSE)

    cfg.merge(acc)

    cfg.run(10)

Control/AthenaExamples/DevTutorialWriteAlgAndTool/python/ExampleAlgConfig_step2.py0 → 100644

+46
−0

Original line number
Diff line number
Diff line

# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration

from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator

from AthenaCommon.Constants import VERBOSE

from DevTutorialWriteAlgAndTool.DevTutorialWriteAlgAndToolConf import ExampleAlg_step1 as ExampleAlg

from TrkExTools.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg

def ExampleAlgCfg(configFlags, **kwargs):

    result=ComponentAccumulator()

    alg = ExampleAlg(**kwargs )

    result.addEventAlgo(alg)

    return result

if __name__=="__main__":

    from AthenaCommon.Configurable import Configurable

    from AthenaCommon.Logging import log

    from AthenaConfiguration.AllConfigFlags import ConfigFlags

    from AthenaConfiguration.MainServicesConfig import MainServicesThreadedCfg    

    from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg

    Configurable.configurableRun3Behavior=1

    from AthenaConfiguration.TestDefaults import defaultTestFiles

    ConfigFlags.Input.Files = defaultTestFiles.ESD

    ConfigFlags.Detector.GeometryPixel = True     

    ConfigFlags.Detector.GeometrySCT   = True 

    ConfigFlags.Detector.GeometryTRT   = True

    ConfigFlags.Concurrency.NumThreads = 8

    ConfigFlags.Concurrency.NumConcurrentEvents = 8

    ConfigFlags.lock()

    cfg=MainServicesThreadedCfg(ConfigFlags)

    cfg.merge(PoolReadCfg(ConfigFlags))

    from AthenaCommon.Constants import VERBOSE

    acc=ExampleAlgCfg(ConfigFlags, OutputLevel=VERBOSE)

    cfg.merge(acc)

    cfg.run(10)

Control/AthenaExamples/DevTutorialWriteAlgAndTool/python/ExampleAlgConfig_step4.py0 → 100644

+46
−0

Original line number
Diff line number
Diff line

# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration

from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator

from AthenaCommon.Constants import VERBOSE

from DevTutorialWriteAlgAndTool.DevTutorialWriteAlgAndToolConf import ExampleAlg_step4 as ExampleAlg

from TrkExTools.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg

def ExampleAlgCfg(configFlags, **kwargs):

    result=ComponentAccumulator()

    alg = ExampleAlg(**kwargs )

    result.addEventAlgo(alg)

    return result

if __name__=="__main__":

    from AthenaCommon.Configurable import Configurable

    from AthenaCommon.Logging import log

    from AthenaConfiguration.AllConfigFlags import ConfigFlags

    from AthenaConfiguration.MainServicesConfig import MainServicesThreadedCfg    

    from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg

    Configurable.configurableRun3Behavior=1

    from AthenaConfiguration.TestDefaults import defaultTestFiles

    ConfigFlags.Input.Files = defaultTestFiles.ESD

    ConfigFlags.Detector.GeometryPixel = True     

    ConfigFlags.Detector.GeometrySCT   = True 

    ConfigFlags.Detector.GeometryTRT   = True

    ConfigFlags.Concurrency.NumThreads = 8

    ConfigFlags.Concurrency.NumConcurrentEvents = 8

    ConfigFlags.lock()

    cfg=MainServicesThreadedCfg(ConfigFlags)

    cfg.merge(PoolReadCfg(ConfigFlags))

    from AthenaCommon.Constants import VERBOSE

    acc=ExampleAlgCfg(ConfigFlags, OutputLevel=VERBOSE)

    cfg.merge(acc)

    cfg.run(10)

Control/AthenaExamples/DevTutorialWriteAlgAndTool/src/ExampleAlg.cxx0 → 100644

+25
−0

Original line number
Diff line number
Diff line

/*

  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration

*/

#include "ExampleAlg.h"

StatusCode ExampleAlg::initialize()

{

  ATH_CHECK( m_trackParticleKey.initialize());

  ATH_CHECK( m_algTool.retrieve() );

  return StatusCode::SUCCESS;

}

StatusCode ExampleAlg::execute(const EventContext& ctx) const

{

  SG::ReadHandle<xAOD::TrackParticleContainer> handle(m_trackParticleKey, ctx);

  ATH_MSG_VERBOSE(ctx<< " Got back "<<handle->size()<<" trackparticles");

  unsigned int count=0;

  for (auto tp : *handle) {

    if ( m_algTool->selectTrackParticle( *tp ) ) count++;

  }

  ATH_MSG_VERBOSE(ctx << " " << count << " pass selection");

  return StatusCode::SUCCESS;

}

Control/AthenaExamples/DevTutorialWriteAlgAndTool/src/ExampleAlg.h0 → 100644

+26
−0

Original line number
Diff line number
Diff line

/*

  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration

*/

#ifndef MYNEWPACKAGE_EXAMPLEALG_H

#define MYNEWPACKAGE_EXAMPLEALG_H

#include "AthenaBaseComps/AthReentrantAlgorithm.h"

#include "xAODTracking/TrackParticleContainer.h"

#include "DevTutorialWriteAlgAndTool/IMyAlgTool.h"

/** An example algorithm that reads and writes objects from the event store

 using handles.*/

class ExampleAlg

  : public AthReentrantAlgorithm

{

public:

  using AthReentrantAlgorithm::AthReentrantAlgorithm;

  virtual StatusCode initialize() override;

  virtual StatusCode execute (const EventContext& ctx) const override;

private:

  SG::ReadHandleKey<xAOD::TrackParticleContainer>   m_trackParticleKey

     { this, "TrackParticleContainerKey", "InDetTrackParticles", "Key for TrackParticle Containers" };

  ToolHandle<IMyAlgTool> m_algTool {this, "SelectionTool", "MyAlgTool", "The selection tool"};

};

#endif

Control/AthenaExamples/DevTutorialWriteAlgAndTool/src/ExampleAlg_step1.cxx0 → 100644

+16
−0

Original line number
Diff line number
Diff line

/*

  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration

*/

#include "ExampleAlg_step1.h"

StatusCode ExampleAlg_step1::initialize()

{

  return StatusCode::SUCCESS;

}

StatusCode ExampleAlg_step1::execute(const EventContext& ctx) const

{

  ATH_MSG_VERBOSE("Events processed: "<<ctx.evt());

  return StatusCode::SUCCESS;

}

Control/AthenaExamples/DevTutorialWriteAlgAndTool/src/ExampleAlg_step1.h0 → 100644

+20
−0

Original line number
Diff line number
Diff line

/*

  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration

*/

#ifndef MYNEWPACKAGE_EXAMPLEALG_STEP1_H

#define MYNEWPACKAGE_EXAMPLEALG_STEP1_H

#include "AthenaBaseComps/AthReentrantAlgorithm.h"

/** An example algorithm that reads and writes objects from the event store

 using handles.*/

class ExampleAlg_step1

  : public AthReentrantAlgorithm

{

public:

  using AthReentrantAlgorithm::AthReentrantAlgorithm;

  virtual StatusCode initialize() override;

  virtual StatusCode execute (const EventContext& ctx) const override;

private:

};

#endif

Control/AthenaExamples/DevTutorialWriteAlgAndTool/src/ExampleAlg_step3.cxx0 → 100644

+19
−0

Original line number
Diff line number
Diff line

/*

  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration

*/

#include "ExampleAlg_step3.h"

StatusCode ExampleAlg_step3::initialize()

{

  ATH_CHECK( m_trackParticleKey.initialize());

  return StatusCode::SUCCESS;

}

StatusCode ExampleAlg_step3::execute(const EventContext& ctx) const

{

  ATH_MSG_VERBOSE("Events processed: "<<ctx.evt());

  SG::ReadHandle<xAOD::TrackParticleContainer> handle(m_trackParticleKey, ctx);

  ATH_MSG_VERBOSE("Got back  "<<handle->size());

  return StatusCode::SUCCESS;

}

Control/AthenaExamples/DevTutorialWriteAlgAndTool/src/ExampleAlg_step3.h0 → 100644

+24
−0

Original line number
Diff line number
Diff line

/*

  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration

*/

#ifndef MYNEWPACKAGE_ExampleAlg_STEP3_H

#define MYNEWPACKAGE_ExampleAlg_STEP3_H

#include "AthenaBaseComps/AthReentrantAlgorithm.h"

#include "xAODTracking/TrackParticleContainer.h"

/** An example algorithm that reads and writes objects from the event store

 using handles.*/

class ExampleAlg_step3

  : public AthReentrantAlgorithm

{

public:

  using AthReentrantAlgorithm::AthReentrantAlgorithm;

  virtual StatusCode initialize() override;

  virtual StatusCode execute (const EventContext& ctx) const override;

private:

  /// 

  SG::ReadHandleKey<xAOD::TrackParticleContainer>   m_trackParticleKey

     { this, "TrackParticleContainerKey", "InDetTrackParticles", "Key for TrackParticle Containers" };

};

#endif

Control/AthenaExamples/DevTutorialWriteAlgAndTool/src/ExampleAlg_step4.cxx0 → 100644

+20
−0

Original line number
Diff line number
Diff line

/*

  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration

*/

#include "ExampleAlg_step4.h"

StatusCode ExampleAlg_step4::initialize()

{

  ATH_CHECK( m_trackParticleKey.initialize());

  ATH_CHECK( m_algTool.retrieve() );

  return StatusCode::SUCCESS;

}

StatusCode ExampleAlg_step4::execute(const EventContext& ctx) const

{

  ATH_MSG_VERBOSE("Event slot: "<<ctx.evt());

  SG::ReadHandle<xAOD::TrackParticleContainer> handle(m_trackParticleKey, ctx);

  ATH_MSG_VERBOSE("Got back  "<<handle->size()<<" trackparticles");

  return StatusCode::SUCCESS;

}

Control/AthenaExamples/DevTutorialWriteAlgAndTool/src/ExampleAlg_step4.h0 → 100644

+26
−0

Original line number
Diff line number
Diff line

/*

  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration

*/

#ifndef MYNEWPACKAGE_EXAMPLEALG_STEP4_H

#define MYNEWPACKAGE_EXAMPLEALG_STEP4_H

#include "AthenaBaseComps/AthReentrantAlgorithm.h"

#include "xAODTracking/TrackParticleContainer.h"

#include "DevTutorialWriteAlgAndTool/IMyAlgTool.h"

/** An example algorithm that reads and writes objects from the event store

 using handles.*/

class ExampleAlg_step4

  : public AthReentrantAlgorithm

{

public:

  using AthReentrantAlgorithm::AthReentrantAlgorithm;

  virtual StatusCode initialize() override;

  virtual StatusCode execute (const EventContext& ctx) const override;

private:

  SG::ReadHandleKey<xAOD::TrackParticleContainer>   m_trackParticleKey

     { this, "TrackParticleContainerKey", "InDetTrackParticles", "Key for TrackParticle Containers" };

  ToolHandle<IMyAlgTool> m_algTool {this, "SelectionTool", "MyAlgTool", "The selection tool"};

};

#endif

Control/AthenaExamples/DevTutorialWriteAlgAndTool/src/MyAlgTool.cxx0 → 100644

+15
−0

Original line number
Diff line number
Diff line

/*

  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration

*/

#include "MyAlgTool.h"

MyAlgTool::MyAlgTool(const std::string& t, const std::string& n,  const IInterface* p ) :

AthAlgTool(t,n,p)

{

  declareInterface<IMyAlgTool>(this);

}

bool MyAlgTool::selectTrackParticle( const xAOD::TrackParticle& particle) const {

  return particle.pt()>2.0;

}

Control/AthenaExamples/DevTutorialWriteAlgAndTool/src/MyAlgTool.h0 → 100644

+19
−0

Original line number
Diff line number
Diff line

/*

  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration

*/

#ifndef MYNEWPACKAGE_MYALGTOOL_H

#define MYNEWPACKAGE_MYALGTOOL_H

#include "AthenaBaseComps/AthAlgTool.h"

#include "DevTutorialWriteAlgAndTool/IMyAlgTool.h"

class MyAlgTool : public AthAlgTool, virtual public IMyAlgTool {

public:

      MyAlgTool(const std::string&,const std::string&,const IInterface*);

      MyAlgTool& operator= (const MyAlgTool& ) = delete;

      bool selectTrackParticle( const xAOD::TrackParticle& particle) const override;

};

#endif

Control/AthenaExamples/DevTutorialWriteAlgAndTool/src/components/MyNewPackage_entries.cxx0 → 100644

+10
−0

Original line number
Diff line number
Diff line

#include "../ExampleAlg.h"

#include "../ExampleAlg_step1.h"

#include "../ExampleAlg_step3.h"

#include "../ExampleAlg_step4.h"

#include "../MyAlgTool.h"

DECLARE_COMPONENT( ExampleAlg )

DECLARE_COMPONENT( ExampleAlg_step1 )

DECLARE_COMPONENT( ExampleAlg_step3 )

DECLARE_COMPONENT( ExampleAlg_step4 )

DECLARE_COMPONENT( MyAlgTool )

MuonSpectrometer/MuonConfig/python/MuonRIO_OnTrackCreatorConfig.py

+0
−1

Original line number
Diff line number
Diff line

@@ -17,7 +17,6 @@ def TriggerChamberClusterOnTrackCreatorCfg(flags, **kwargs):

    result.setPrivateTools(Muon__TriggerChamberClusterOnTrackCreator(**kwargs))

    return result

def CscClusterOnTrackCreatorCfg(flags,**kwargs):

    from MuonConfig.MuonSegmentFindingConfig import QratCscClusterFitterCfg, CscClusterUtilToolCfg

MuonSpectrometer/MuonConfig/python/MuonRecToolsConfig.py

+4
−1

Original line number
Diff line number
Diff line

@@ -29,10 +29,13 @@ def MuonSeededSegmentFinderCfg(flags,name="MuonSeededSegmentFinder", **kwargs):

        kwargs.setdefault("SegmentMakerNoHoles", seg_maker) #FIXME. Just remove one.

    if not flags.Detector.GeometryCSC:

        kwargs.setdefault("CscPrepDataContainer","")

    else:

    if not flags.Detector.GeometrysTGC:

        kwargs.setdefault("sTgcPrepDataContainer","")

    if not flags.Detector.GeometryMM:

        kwargs.setdefault("MMPrepDataContainer","")

    kwargs.setdefault('TgcPrepDataContainer', 'TGC_MeasurementsAllBCs' if not flags.Muon.useTGCPriorNextBC and not flags.Muon.useTGCPriorNextBC else 'TGC_Measurements')

    muon_seeded_segment_finder = Muon__MuonSeededSegmentFinder(name, **kwargs)

    result.setPrivateTools(muon_seeded_segment_finder)

    return result

MuonSpectrometer/MuonConfig/python/MuonSegmentFindingConfig.py

+71
−35

Original line number
Diff line number
Diff line

@@ -511,19 +511,19 @@ def MooSegmentFinderCfg(flags, name='MooSegmentFinder', **kwargs):

        csc_2d_segment_maker=None

        csc_4d_segment_maker=None

    segment_finder_tool = Muon__MooSegmentCombinationFinder(name=name, 

        SegmentCombiner = muon_curved_segment_combiner_tool,

        SegmentCombinationCleaner = muon_segment_combination_cleaner_tool,

        HoughPatternFinder =muon_pattern_finder_tool,

        MdtSegmentMaker=muon_pattern_segment_maker,

        DoSegmentCombinations=False,

        DoSegmentCombinationCleaning=False,

        DoCscSegments = flags.Muon.doCSCs,

        DoMdtSegments = flags.Muon.doMDTs,   

        Csc2dSegmentMaker = csc_2d_segment_maker,

        Csc4dSegmentMaker = csc_4d_segment_maker,

        DoSummary = flags.Muon.printSummary

        )

    kwargs.setdefault('SegmentCombiner', muon_curved_segment_combiner_tool)

    kwargs.setdefault('SegmentCombinationCleaner', muon_segment_combination_cleaner_tool)

    kwargs.setdefault('HoughPatternFinder', muon_pattern_finder_tool)

    kwargs.setdefault('MdtSegmentMaker', muon_pattern_segment_maker)

    kwargs.setdefault('DoSegmentCombinations', False)

    kwargs.setdefault('DoSegmentCombinationCleaning', False)

    kwargs.setdefault('DoCscSegments', flags.Muon.doCSCs)

    kwargs.setdefault('DoMdtSegments', flags.Muon.doMDTs)

    kwargs.setdefault('Csc2dSegmentMaker', csc_2d_segment_maker)

    kwargs.setdefault('Csc4dSegmentMaker', csc_4d_segment_maker)

    kwargs.setdefault('DoSummary', flags.Muon.printSummary)

    segment_finder_tool = Muon__MooSegmentCombinationFinder(name=name, **kwargs)

    result.setPrivateTools(segment_finder_tool)

    return result

@@ -638,6 +638,7 @@ def MooSegmentFinderAlgCfg(flags, name = "MuonSegmentMaker",  **kwargs):

    kwargs.setdefault('MuonSegmentOutputLocation', "ThirdChainSegments" if flags.Muon.segmentOrigin=="TruthTracking" else "MuonSegments")

    moo_segment_finder_alg = MooSegmentFinderAlg( name=name, **kwargs )

    moo_segment_finder_alg.Cardinality=10

    result.addEventAlgo( moo_segment_finder_alg )

    return result

@@ -658,7 +659,9 @@ def MooSegmentFinderAlg_NCBCfg(flags, name = "MuonSegmentMaker_NCB", **kwargs):

    csc_4d_segment_maker = acc.getPrimary()

    result.merge(acc)

    acc  = MooSegmentFinderCfg(flags, name='MooSegmentFinder_NCB', Csc2dSegmentMaker=csc_2d_segment_maker, Csc4dSegmentMaker=csc_4d_segment_maker)

    acc  = MooSegmentFinderCfg(flags, name='MooSegmentFinder_NCB', Csc2dSegmentMaker=csc_2d_segment_maker, 

                               Csc4dSegmentMaker=csc_4d_segment_maker, 

                               DoMdtSegments=False,DoSegmentCombinations=False,DoSegmentCombinationCleaning=False)

    segment_finder_tool=(acc.popPrivateTools())

    result.addPublicTool(segment_finder_tool)

    result.merge(acc)

@@ -703,12 +706,31 @@ def MuonSegmentFindingCfg(flags):

if __name__=="__main__":                        

    # To run this, do e.g. 

    # python ../athena/MuonSpectrometer/MuonConfig/python/MuonSegmentFindingConfig.py

    # python -m MuonConfig.MuonSegmentFindingConfig --run --threads=1

    from argparse import ArgumentParser

    parser = ArgumentParser()

    parser.add_argument("-t", "--threads", dest="threads", type=int,

                        help="number of threads", default=1)

    parser.add_argument("-o", "--output", dest="output", default='newESD.pool.root',

                        help="write ESD to FILE", metavar="FILE")

    parser.add_argument("--run", help="Run directly from the python. If false, just stop once the pickle is written.",

                        action="store_true")

    args = parser.parse_args()

    from AthenaCommon.Configurable import Configurable

    from AthenaConfiguration.AllConfigFlags import ConfigFlags

    from AthenaCommon.Logging import log

    from AthenaConfiguration.TestDefaults import defaultTestFiles

    ConfigFlags.Concurrency.NumThreads=args.threads

    ConfigFlags.Concurrency.NumConcurrentEvents=args.threads # Might change this later, but good enough for the moment.

    Configurable.configurableRun3Behavior=1

    ConfigFlags.Detector.GeometryMDT   = True 

@@ -717,41 +739,55 @@ if __name__=="__main__":

    ConfigFlags.Detector.GeometryRPC   = True 

    ConfigFlags.Input.Files = defaultTestFiles.ESD

    ConfigFlags.Output.ESDFileName='newESD.pool.root'

    ConfigFlags.Output.ESDFileName=args.output

    # from AthenaCommon.Constants import DEBUG

    #log.setLevel(DEBUG)

    from AthenaCommon.Constants import DEBUG

    log.setLevel(DEBUG)

    log.debug('About to set up Segment Finding.')

    ConfigFlags.Input.isMC = True

    ConfigFlags.lock()

    ConfigFlags.dump()

    # import pdb; pdb.set_trace()

    # When running from a pickled file, athena inserts some services automatically. So only use this if running now.

    if args.run:

        from AthenaConfiguration.MainServicesConfig import MainServicesThreadedCfg

        cfg = MainServicesThreadedCfg(ConfigFlags)

    else:

        cfg=ComponentAccumulator()

    from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg

    cfg.merge(PoolReadCfg(ConfigFlags))

    cfg.merge(MuonSegmentFindingCfg(ConfigFlags))

    # from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg

    # itemsToRecord = ["Trk::SegmentCollection#MuonSegments"]

    #

    # cfg.merge( OutputStreamCfg( ConfigFlags, 'ESD', ItemList=itemsToRecord) )

    # outstream = cfg.getEventAlgo("OutputStreamESD")

    # outstream.OutputLevel=DEBUG

    # outstream.ForceRead = True

    # This is a temporary fix - it should go someplace central as it replaces the functionality of addInputRename from here:

    # https://gitlab.cern.ch/atlas/athena/blob/master/Control/SGComps/python/AddressRemappingSvc.py

    from SGComps.SGCompsConf import AddressRemappingSvc, ProxyProviderSvc

    pps = ProxyProviderSvc()

    ars=AddressRemappingSvc()

    pps.ProviderNames += [ 'AddressRemappingSvc' ]

    ars.TypeKeyRenameMaps += [ '%s#%s->%s' % ("Trk::SegmentCollection", "MuonSegments", "MuonSegments_old") ]

    ars.TypeKeyRenameMaps += [ '%s#%s->%s' % ("Trk::SegmentCollection", "MuonSegments_NCB", "MuonSegments_NCB_old") ]

    ConfigFlags.dump()

    cfg.printConfig()

    cfg.addService(pps)

    cfg.addService(ars)

    # cfg.getService("StoreGateSvc").Dump = True

    # Set up output

    from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg

    itemsToRecord = ["Trk::SegmentCollection#MuonSegments", "Trk::SegmentCollection#NCB_MuonSegments"]

    cfg.merge( OutputStreamCfg( ConfigFlags, 'ESD', ItemList=itemsToRecord) )

    outstream = cfg.getEventAlgo("OutputStreamESD")

    outstream.OutputLevel=DEBUG

    outstream.ForceRead = True

    # cfg.getService("StoreGateSvc").Dump = True

    cfg.printConfig()

    f=open("MuonSegmentFinding.pkl","w")

    cfg.store(f)

    f.close()

    # cfg.run()

    if args.run:

        cfg.run(20)

MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py

+92
−22

Original line number
Diff line number
Diff line

@@ -188,10 +188,41 @@ def MuPatCandidateToolCfg(flags, name="MuPatCandidateTool", **kwargs):

    kwargs.setdefault("SegmentExtender", "") #FIXME If this is always empty, can it be removed?

    mu_pat_cand_tool = Muon__MuPatCandidateTool(name, **kwargs)

    from AthenaCommon.Constants import VERBOSE

    mu_pat_cand_tool = Muon__MuPatCandidateTool(name, OutputLevel=VERBOSE, **kwargs)

    result.setPrivateTools(mu_pat_cand_tool)

    return result

def MuonChamberHoleRecoveryToolCfg(flags, name="MuonChamberHoleRecoveryTool", **kwargs):

    from MuonTrackFinderTools.MuonTrackFinderToolsConf import Muon__MuonChamberHoleRecoveryTool

    result=ComponentAccumulator()

    kwargs.setdefault("AddMeasurements",  not flags.Muon.doSegmentT0Fit )

    if flags.Detector.GeometryCSC:

        from MuonConfig.MuonRIO_OnTrackCreatorConfig import CscClusterOnTrackCreatorCfg

        extrakwargs={}

        if flags.Muon.enableErrorTuning or not flags.Input.isMC:

            extrakwargs["ErrorScalerBeta"] = 0.200

        acc = CscClusterOnTrackCreatorCfg(flags, **extrakwargs)

        csc_cluster_creator = acc.getPrimary()

        result.merge(acc)

        kwargs.setdefault("CscRotCreator", csc_cluster_creator)

    else:

        kwargs["CscRotCreator"] = None

    if not flags.Detector.GeometrysTGC:

        kwargs.setdefault("sTgcPrepDataContainer","")

    if not flags.Detector.GeometryMM:

        kwargs.setdefault("MMPrepDataContainer","")

    kwargs.setdefault('TgcPrepDataContainer', 'TGC_MeasurementsAllBCs' if not flags.Muon.useTGCPriorNextBC and not flags.Muon.useTGCPriorNextBC else 'TGC_Measurements')

    hole_rec_tool = Muon__MuonChamberHoleRecoveryTool(name, **kwargs)

    result.setPrivateTools(hole_rec_tool)

    return result

def MuonTrackSteeringCfg(flags, name="MuonTrackSteering", **kwargs):

    from MuonTrackSteeringTools.MuonTrackSteeringToolsConf import Muon__MuonTrackSteering

    # This is based on https://gitlab.cern.ch/atlas/athena/blob/release/22.0.3/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonStandalone.py#L35

@@ -270,6 +301,13 @@ def MuonTrackSteeringCfg(flags, name="MuonTrackSteering", **kwargs):

    kwargs.setdefault("MuonSegmentFittingTool",       seg_fitting_tool) 

    kwargs.setdefault("MuonTrackSelector",       MuonTrackSelector(flags)) 

    acc = MuonChamberHoleRecoveryToolCfg(flags)

    hole_recovery_tool =  acc.getPrimary()

    result.addPublicTool(hole_recovery_tool)

    result.merge(acc)

    kwargs.setdefault("HoleRecoveryTool",       hole_recovery_tool) 

    track_maker_steering = Muon__MuonTrackSteering(name,**kwargs)

    result.setPrivateTools(track_maker_steering)

    return result

@@ -311,20 +349,39 @@ def MuonTrackBuildingCfg(flags):

    result.merge(acc)

    result.addPublicTool(track_steering)

    track_builder = MuPatTrackBuilder("MuPatTrackBuilder", TrackSteering = track_steering )

    track_builder = MuPatTrackBuilder("MuPatTrackBuilder", TrackSteering = track_steering, MuonSegmentCollection="MuonSegments", SpectrometerTrackOutputLocation="MuonSpectrometerTracks" )

    track_builder.Cardinality=10

    result.addEventAlgo( track_builder )

    return result

if __name__=="__main__":

    # To run this, do e.g. 

    # python ../athena/MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py

    # python -m MuonConfig.MuonTrackBuildingConfig --run --threads=

    from argparse import ArgumentParser    

    parser = ArgumentParser()

    parser.add_argument("-t", "--threads", dest="threads", type=int,

                        help="number of threads", default=1)

    parser.add_argument("-o", "--output", dest="output", default='newESD.pool.root',

                        help="write ESD to FILE", metavar="FILE")

    parser.add_argument("--run", help="Run directly from the python. If false, just stop once the pickle is written.",

                        action="store_true")

    args = parser.parse_args()

    from AthenaCommon.Configurable import Configurable

    Configurable.configurableRun3Behavior=1

    from AthenaCommon.Logging import log

    from AthenaConfiguration.AllConfigFlags import ConfigFlags

    ConfigFlags.Concurrency.NumThreads=args.threads

    ConfigFlags.Concurrency.NumConcurrentEvents=args.threads # Might change this later, but good enough for the moment.

    ConfigFlags.Detector.GeometryMDT   = True 

    ConfigFlags.Detector.GeometryTGC   = True

    ConfigFlags.Detector.GeometryCSC   = True     

@@ -332,47 +389,60 @@ if __name__=="__main__":

    from AthenaConfiguration.TestDefaults import defaultTestFiles

    ConfigFlags.Input.Files = defaultTestFiles.ESD

    ConfigFlags.Output.ESDFileName='newESD.pool.root'

    ConfigFlags.Output.ESDFileName=args.output

    # from AthenaCommon.Constants import DEBUG

    #log.setLevel(DEBUG)

    log.debug('About to set up Muon Track Building.')    

    from AthenaCommon.Constants import DEBUG

    # log.setLevel(DEBUG)

    # log.info('About to set up Muon Track Building.')

    ConfigFlags.Input.isMC = True

    ConfigFlags.lock()

    log.info('Flags set as follows:')

    ConfigFlags.dump()

    # When running from a pickled file, athena inserts some services automatically. So only use this if running now.

    if args.run:

        from AthenaConfiguration.MainServicesConfig import MainServicesThreadedCfg

        cfg = MainServicesThreadedCfg(ConfigFlags)

    else:

        cfg=ComponentAccumulator()

    # cfg = ComponentAccumulator()

    # acc = MainServicesThreadedCfg(ConfigFlags)

    # print acc._isMergable

    # cfg.merge(acc)

    log.info(cfg._allSequences)

    from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg

    cfg.merge(PoolReadCfg(ConfigFlags))

    log.info(cfg._allSequences)

    cfg.merge(MuonTrackBuildingCfg(ConfigFlags))

    log.info(cfg._allSequences)

    # This is a temporary fix - it should go someplace central as it replaces the functionality of addInputRename from here:

    # https://gitlab.cern.ch/atlas/athena/blob/master/Control/SGComps/python/AddressRemappingSvc.py

    from SGComps.SGCompsConf import AddressRemappingSvc, ProxyProviderSvc

    pps = ProxyProviderSvc()

    ars=AddressRemappingSvc()

    pps.ProviderNames += [ 'AddressRemappingSvc' ]

    ars.TypeKeyRenameMaps += [ '%s#%s->%s' % ("TrackCollection", "MuonSpectrometerTracks", "MuonSpectrometerTracks_old") ]

    cfg.addService(pps)

    cfg.addService(ars)

    from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg

    itemsToRecord = ["TrackCollection#MuonSpectrometerTracks"] 

    itemsToRecord = ["TrackCollection#MuonSpectrometerTracks", "TrackCollection#MuonSpectrometerTracks_old"] 

    cfg.merge( OutputStreamCfg( ConfigFlags, 'ESD', ItemList=itemsToRecord) )

    log.info(cfg._allSequences)

    outstream = cfg.getEventAlgo("OutputStreamESD")

    outstream.OutputLevel=DEBUG

    # outstream.OutputLevel=DEBUG

    outstream.ForceRead = True

    # cfg.printConfig(withDetails = True, summariseProps = True)

    msgService = cfg.getService('MessageSvc')

    msgService.Format = "% F%48W%S%7W%R%T %0W%M"

    msgService.OutputLevel=DEBUG

    cfg.printConfig(withDetails = True, summariseProps = True)

    f=open("MuonTrackBuilding.pkl","w")

    cfg.store(f)

    f.close()

    # cfg.run()

    if args.run:

        cfg.run(20)

MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuPatCandidateTool.cxx

+24
−19

Original line number
Diff line number
Diff line

@@ -496,7 +496,12 @@ namespace Muon {

      std::vector<const MuonClusterOnTrack*>::iterator clit = chit->second.begin();

      std::vector<const MuonClusterOnTrack*>::iterator clit_end = chit->second.end();

      for( ;clit!=clit_end;++clit){

	prds.push_back( (*clit)->prepRawData() );

        const Trk::PrepRawData* prd = (*clit)->prepRawData();

        if (prd){ 

          prds.push_back( prd );

        } else {

          ATH_MSG_ERROR("MuonClusterOnTrack has no PRD.");

        }

      }

      const CompetingMuonClustersOnTrack* comprot = m_compClusterCreator->createBroadCluster(prds,0);

Tutorials/DebugTutorial/CMakeLists.txt0 → 100644

+30
−0

Original line number
Diff line number
Diff line

################################################################################

# Package: DebugTutorial

################################################################################

# Declare the package name:

atlas_subdir( DebugTutorial )

# Declare the package's dependencies:

atlas_depends_on_subdirs( PUBLIC

                          Control/AthContainers

                          Control/StoreGate

                          Control/AthenaBaseComps

                          Event/xAOD/xAODJet )

# External dependencies:

find_package( ROOT COMPONENTS Core Hist )

find_package( CLHEP )

atlas_add_component( DebugTutorial

                     src/*.cxx src/components/*.cxx

                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}

                     LINK_LIBRARIES AthContainers StoreGateLib AthenaBaseComps

                                    xAODJet

                                    ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} )

# Install files from the package:

atlas_install_joboptions( share/*.py )

Tutorials/DebugTutorial/share/DebugTutorial_jo.py0 → 100644

+33
−0

Original line number
Diff line number
Diff line

#

# File: DebugTutorial/share/DebugTutorial_jo.py

# Author: snyder@bnl.gov

# Date: Sep 2019

# Purpose: debugging tutorial

#

## basic job configuration

import AthenaCommon.AtlasUnixStandardJob

## get a handle to the default top-level algorithm sequence

from AthenaCommon.AlgSequence import AlgSequence

topSequence = AlgSequence()

## get a handle to the ServiceManager

from AthenaCommon.AppMgr import ServiceMgr as svcMgr

#--------------------------------------------------------------

# Load POOL support

#--------------------------------------------------------------

import AthenaPoolCnvSvc.ReadAthenaPool

#--------------------------------------------------------------

# Define input

#--------------------------------------------------------------

#/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/aod/

svcMgr.EventSelector.InputCollections = [

    "/eos/atlas/atlascerngroupdisk/data-art/grid-input/aod/AOD-20.1.6.4/AOD-20.1.6.4-full.pool.root"

    ]

from DebugTutorial.DebugTutorialConf import Tutorial__TestAlg

topSequence += Tutorial__TestAlg ("TestAlg", Jets = 'AntiKt4LCTopoJets',

                                  OutputLevel = VERBOSE)

Tutorials/DebugTutorial/src/TestAlg.cxx0 → 100644

+86
−0

Original line number
Diff line number
Diff line

/**

 * @file DebugTutorial/src/TestAlg.cxx

 * @author scott snyder <snyder@bnl.gov>

 * @date Sep, 2019

 * @brief debugging tutorial

 */

#include "TestAlg.h"

#include "CLHEP/Units/SystemOfUnits.h"

#include "TH1F.h"

#include <vector>

#include <string>

using CLHEP::GeV;

namespace Tutorial {

/// Standard Gaudi @c initialize method.

StatusCode TestAlg::initialize()

{

  ATH_CHECK( m_jetsKey.initialize() );

  // Build the pair index lookup table.

  for (int i=0; i<6; i++) {

    for (int j=0; j<=i; j++) {

      m_pairtable.push_back(i);

      m_pairtable.push_back(j);

    }

    m_end.push_back (m_pairtable.size());

  }

  return StatusCode::SUCCESS;

}

/// Standard Gaudi @c finalize method.

StatusCode TestAlg::finalize()

{

  m_hist->Print("ALL");

  return StatusCode::SUCCESS;

}

// Generate a label for jet I.

std::string jetlab (int i)

{

  char* buf = new char[16];

  // 15 chars +  null byte

  sprintf (buf, "jet %1d xverse pt", i);

  std::string s(buf);

  delete [] buf;

  return s;

}

/// Standard Gaudi @c execute method.

StatusCode TestAlg::execute()

{

  // First dump jets.

  int i = 0;

  SG::ReadHandle<xAOD::JetContainer> jets (m_jetsKey);

  for (const xAOD::Jet* jet : *jets) {

    msg(MSG::VERBOSE) << jetlab(i) << " " << jet->auxdata<float> ("Pt") << endmsg;

    ++i;

  }

  // Fill the histogram with invariant masses of jet pairs from the table.

  unsigned int njet = jets->size();

  if (njet > 1) {

    if (njet > m_end.size())

      njet = m_end.size();

    for (int i=0; i < m_end[njet]; i += 2) {

      const xAOD::Jet* j1 = (*jets)[m_pairtable[i]];

      const xAOD::Jet* j2 = (*jets)[m_pairtable[i+1]];

      float minv = (j1->p4() + j2->p4()).M();

      m_hist->Fill (minv / GeV);

    }

  }

  return StatusCode::SUCCESS;

}

} // namespace TestAlg

Tutorials/DebugTutorial/src/TestAlg.h0 → 100644

+66
−0

Original line number
Diff line number
Diff line

// This file's extension implies that it's C, but it's really -*- C++ -*-.

/**

 * @file DebugTutorial/src/TestAlg.h

 * @author scott snyder <snyder@bnl.gov>

 * @date Sep, 2019

 * @brief debugging tutorial

 */

#ifndef DEBUGTUTORIAL_TESTALG_H

#define DEBUGTUTORIAL_TESTALG_H

#include "xAODJet/JetContainer.h"

#include "AthenaBaseComps/AthAlgorithm.h"

#include "StoreGate/ReadHandleKey.h"

#include "TH1.h"

#include <vector>

#include <memory>

namespace Tutorial {

class TestAlg

  : public AthAlgorithm

{

public:

  /// Use base class constructor.

  using AthAlgorithm::AthAlgorithm;

  /// Standard Gaudi @c initialize method.

  virtual StatusCode initialize() override final;

  /// Standard Gaudi @c finalize method.

  virtual StatusCode finalize() override final;

  /// Standard Gaudi @c execute method.

  virtual StatusCode execute() override final;

private:

  /// Handle used to access jets from the current event.

  SG::ReadHandleKey<xAOD::JetContainer> m_jetsKey

  { this, "Jets", "", "" };

  /// Adjacent entries contain the (i,j) indices of jets to combine.

  std::vector<int> m_pairtable;

  /// Number of pairs for each jet multiplicity.

  std::vector<int> m_end;

  /// Output histogram.

  std::unique_ptr<TH1> m_hist

  { new TH1F ("hist", "hist", 20, 0, 200) };

};

} // namespace Tutorial

#endif // not DEBUGTUTORIAL_TESTALG_H

Tutorials/DebugTutorial/src/components/DebugTutorial_entries.cxx0 → 100644

+12
−0

Original line number
Diff line number
Diff line

// $Id$

/**

 * @file DebugTutorial/src/components/DebugTutorial_entries.cxx

 * @author scott snyder <snyder@bnl.gov>

 * @date Sep, 2019

 * @brief debugging tutorial

 */

#include "../TestAlg.h"

DECLARE_COMPONENT( Tutorial::TestAlg )