Skip to content

GitLab

Commit 7fb48697 authored by CI Runner's avatar CI Runner
Browse files

Merge branch 'master' into mramospe-neutrals

parents b6ef6acd 4601a20a
Expand all Hide whitespace changes
Inline Side-by-side
CMakeLists.txt
View file @ 7fb48697
......@@ -40,7 +40,6 @@ lhcb_add_subdirectories(
MicroDST/MicroDSTInterfaces
MicroDST/MicroDSTTools
Phys/BBDecTreeTool
Phys/CommonParticles
Phys/DaVinciFilters
Phys/DaVinciInterfaces
Phys/DaVinciKernel
......
MicroDST/MicroDSTBase/include/MicroDST/RelationsClonerAlg.h
View file @ 7fb48697
......@@ -12,7 +12,7 @@
#define MICRODST_RELATIONSCLONERALG_H 1
// Include files
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
#include <boost/function.hpp>
// From MicroDST
#include "MicroDST/BindType2ClonerDef.h"
......@@ -54,8 +54,8 @@ namespace MicroDST {
, m_cloner( NULL )
, m_clonerType( DEFAULTS::clonerType )
, m_useOriginalFrom( false )
, m_tableCloner( boost::bind( &RelationsClonerAlg<TABLE>::cloneFrom, &( *this ), _1 ),
boost::bind( &RelationsClonerAlg<TABLE>::cloneTo, &( *this ), _1 ) ) {
, m_tableCloner( boost::bind( &RelationsClonerAlg<TABLE>::cloneFrom, &( *this ), boost::placeholders::_1 ),
boost::bind( &RelationsClonerAlg<TABLE>::cloneTo, &( *this ), boost::placeholders::_1 ) ) {
declareProperty( "ClonerType", m_clonerType );
declareProperty( "UseOriginalFrom", m_useOriginalFrom, "Take 'from' object from original location" );
// setProperty( "OutputLevel", 1 );
......
MicroDST/MicroDSTBase/include/MicroDST/RelationsFromClonerAlg.h
View file @ 7fb48697
......@@ -15,7 +15,7 @@
#include <set>
// Include files
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
#include <boost/function.hpp>
// From MicroDST
......@@ -53,8 +53,9 @@ namespace MicroDST {
/// Standard constructor
RelationsFromClonerAlg( const std::string& name, ISvcLocator* pSvcLocator )
: MicroDSTAlgorithm( name, pSvcLocator )
, m_tableCloner( boost::bind( &RelationsFromClonerAlg<TABLE>::cloneFrom, &( *this ), _1 ),
boost::bind( &RelationsFromClonerAlg<TABLE>::cloneTo, &( *this ), _1 ) ) {}
, m_tableCloner( boost::bind( &RelationsFromClonerAlg<TABLE>::cloneFrom, &( *this ), boost::placeholders::_1 ),
boost::bind( &RelationsFromClonerAlg<TABLE>::cloneTo, &( *this ), boost::placeholders::_1 ) ) {
}
//===========================================================================
StatusCode initialize() override {
......
MicroDST/MicroDSTTools/src/CaloDigitCloner.h
View file @ 7fb48697
......@@ -25,7 +25,8 @@ namespace StoreCaloUtils {
class DigitFromCalo {
public:
explicit DigitFromCalo( const int calo ) : m_calo( calo ) {}
explicit DigitFromCalo( const std::string& calo ) : DigitFromCalo( CaloCellCode::CaloNumFromName( calo ) ) {}
explicit DigitFromCalo( const std::string& calo )
: DigitFromCalo( LHCb::Calo::CellCode::CaloNumFromName( calo ) ) {}
inline bool operator()( const LHCb::CaloDigit* digit ) const {
return digit && ( ( (int)digit->cellID().calo() ) == m_calo );
}
......
Phys/CommonParticles/CMakeLists.txt deleted 100644 → 0
View file @ b6ef6acd
###############################################################################
# (c) Copyright 2000-2021 CERN for the benefit of the LHCb Collaboration #
# #
# This software is distributed under the terms of the GNU General Public #
# Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING". #
# #
# In applying this licence, CERN does not waive the privileges and immunities #
# granted to it by virtue of its status as an Intergovernmental Organization #
# or submit itself to any jurisdiction. #
###############################################################################
#[=======================================================================[.rst:
Phys/CommonParticles
--------------------
#]=======================================================================]
gaudi_install(PYTHON)
gaudi_add_tests(pytest)
Phys/CommonParticles/doc/release.notes deleted 100755 → 0
View file @ b6ef6acd
This diff is collapsed.
Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsDownElectrons.py deleted 100755 → 0
View file @ b6ef6acd
#!/usr/bin/env python
###############################################################################
# (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration #
# #
# This software is distributed under the terms of the GNU General Public #
# Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING". #
# #
# In applying this licence, CERN does not waive the privileges and immunities #
# granted to it by virtue of its status as an Intergovernmental Organization #
# or submit itself to any jurisdiction. #
###############################################################################
# =============================================================================
# =============================================================================
## @file CommonParticles/StdNoPIDsElectrons.py
# configuration file for 'Standard NoPIDs Pions'
# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
# @date 2009-01-14
# =============================================================================
"""
Configuration file for 'NoBrem NoPIDs Electrons with downstram tracks'
"""
from __future__ import print_function
__author__ = "Ulrich Kerzel Ulrich.Kerzel@cern.ch"
# =============================================================================
__all__ = ('NoBremNoPIDsDownElectrons', 'locations')
# =============================================================================
from Gaudi.Configuration import *
from Configurables import NoPIDsParticleMaker
from CommonParticles.Utils import *
## create the algorithm
algorithm = NoPIDsParticleMaker(
'NoBremNoPIDsDownElectrons',
DecayDescriptor='Electron',
Particle='electron')
algorithm.AddBremPhotonTo = []
# configure the track selector
selector = trackSelector(algorithm, trackTypes=["Downstream"])
## configure Data-On-Demand service
locations = updateDoD(algorithm)
## finally: define the symbol
NoBremNoPIDsDownElectrons = algorithm
## ============================================================================
if '__main__' == __name__:
print(__doc__)
print(__author__)
print(locationsDoD(locations))
# =============================================================================
# The END
# =============================================================================
Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsElectrons.py deleted 100755 → 0
View file @ b6ef6acd
#!/usr/bin/env python
###############################################################################
# (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration #
# #
# This software is distributed under the terms of the GNU General Public #
# Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING". #
# #
# In applying this licence, CERN does not waive the privileges and immunities #
# granted to it by virtue of its status as an Intergovernmental Organization #
# or submit itself to any jurisdiction. #
###############################################################################
# =============================================================================
# =============================================================================
## @file CommonParticles/StdNoPIDsElectrons.py
# configuration file for 'Standard NoPIDs Electrons'
# @author Patrick Koppenburg
# @date 2011-07-18
# =============================================================================
"""
Configuration file for 'No Brem NoPIDs Electrons wioth loose cuts'
"""
from __future__ import print_function
__author__ = "Patrick Koppenburg "
# =============================================================================
__all__ = ('NoBremNoPIDsElectrons', 'locations')
# =============================================================================
from Gaudi.Configuration import *
from Configurables import NoPIDsParticleMaker
from CommonParticles.Utils import *
## create the algorithm
algorithm = NoPIDsParticleMaker(
'NoBremNoPIDsElectrons', DecayDescriptor='Electron', Particle='electron')
selector = trackSelector(algorithm, trackTypes=["Long"])
algorithm.AddBremPhotonTo = []
## configure Data-On-Demand service
locations = updateDoD(algorithm)
## finally: define the symbol
NoBremNoPIDsElectrons = algorithm
## ============================================================================
if '__main__' == __name__:
print(__doc__)
print(__author__)
print(locationsDoD(locations))
# =============================================================================
# The END
# =============================================================================
Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsTtrackElectrons.py deleted 100755 → 0
View file @ b6ef6acd
#!/usr/bin/env python
###############################################################################
# (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration #
# #
# This software is distributed under the terms of the GNU General Public #
# Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING". #
# #
# In applying this licence, CERN does not waive the privileges and immunities #
# granted to it by virtue of its status as an Intergovernmental Organization #
# or submit itself to any jurisdiction. #
###############################################################################
# =============================================================================
# =============================================================================
## @file CommonParticles/StdNoPIDsElectrons.py
# configuration file for 'Standard NoPIDs Pions'
# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
# @date 2009-01-14
# =============================================================================
"""
Configuration file for 'NoBrem NoPIDs Electrons with Ttrack tracks'
"""
from __future__ import print_function
__author__ = "Ulrich Kerzel Ulrich.Kerzel@cern.ch"
# =============================================================================
__all__ = ('NoBremNoPIDsTtrackElectrons', 'locations')
# =============================================================================
from Gaudi.Configuration import *
from Configurables import NoPIDsParticleMaker
from CommonParticles.Utils import *
## create the algorithm
algorithm = NoPIDsParticleMaker(
'NoBremNoPIDsTtrackElectrons',
DecayDescriptor='Electron',
Particle='electron')
algorithm.AddBremPhotonTo = []
# configure the track selector
selector = trackSelector(algorithm, trackTypes=["Ttrack"])
## configure Data-On-Demand service
locations = updateDoD(algorithm)
## finally: define the symbol
NoBremNoPIDsTtrackElectrons = algorithm
## ============================================================================
if '__main__' == __name__:
print(__doc__)
print(__author__)
print(locationsDoD(locations))
# =============================================================================
# The END
# =============================================================================
Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsUpElectrons.py deleted 100755 → 0
View file @ b6ef6acd
#!/usr/bin/env python
###############################################################################
# (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration #
# #
# This software is distributed under the terms of the GNU General Public #
# Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING". #
# #
# In applying this licence, CERN does not waive the privileges and immunities #
# granted to it by virtue of its status as an Intergovernmental Organization #
# or submit itself to any jurisdiction. #
###############################################################################
# =============================================================================
# =============================================================================
## @file CommonParticles/StdNoPIDsElectrons.py
# configuration file for 'Standard NoPIDs Pions'
# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
# @date 2009-01-14
# =============================================================================
"""
Configuration file for 'NoBrem NoPIDs Electrons with Upstream tracks'
"""
from __future__ import print_function
__author__ = "Ulrich Kerzel Ulrich.Kerzel@cern.ch"
# =============================================================================
__all__ = ('NoBremNoPIDsUpElectrons', 'locations')
# =============================================================================
from Gaudi.Configuration import *
from Configurables import NoPIDsParticleMaker
from CommonParticles.Utils import *
## create the algorithm
algorithm = NoPIDsParticleMaker(
'NoBremNoPIDsUpElectrons', DecayDescriptor='Electron', Particle='electron')
algorithm.AddBremPhotonTo = []
# configure the track selector
selector = trackSelector(algorithm, trackTypes=["Upstream"])
## configure Data-On-Demand service
locations = updateDoD(algorithm)
## finally: define the symbol
NoBremNoPIDsUpElectrons = algorithm
## ============================================================================
if '__main__' == __name__:
print(__doc__)
print(__author__)
print(locationsDoD(locations))
# =============================================================================
# The END
# =============================================================================
Phys/CommonParticles/python/CommonParticles/NoBremNoPIDsVeloElectrons.py deleted 100755 → 0
View file @ b6ef6acd
#!/usr/bin/env python
###############################################################################
# (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration #
# #
# This software is distributed under the terms of the GNU General Public #
# Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING". #
# #
# In applying this licence, CERN does not waive the privileges and immunities #
# granted to it by virtue of its status as an Intergovernmental Organization #
# or submit itself to any jurisdiction. #
###############################################################################
# =============================================================================
# =============================================================================
## @file CommonParticles/StdNoPIDsElectrons.py
# configuration file for 'Standard NoPIDs Pions'
# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
# @date 2009-01-14
# =============================================================================
"""
Configuration file for 'Standard NoPIDs Electrons with VELO tracks'
"""
from __future__ import print_function
__author__ = "Ulrich Kerzel Ulrich.Kerzel@cern.ch"
# =============================================================================
__all__ = ('StdNoPIDsElectrons', 'locations')
# =============================================================================
from Gaudi.Configuration import *
from Configurables import NoPIDsParticleMaker
from CommonParticles.Utils import *
## create the algorithm
algorithm = NoPIDsParticleMaker(
'StdNoPIDsVeloElectrons', DecayDescriptor='Electron', Particle='electron')
# configure the track selector
selector = trackSelector(algorithm, trackTypes=["Velo"])
## configure Data-On-Demand service
locations = updateDoD(algorithm)
## finally: define the symbol
StdNoPIDsVeloElectrons = algorithm
## ============================================================================
if '__main__' == __name__:
print(__doc__)
print(__author__)
print(locationsDoD(locations))
# =============================================================================
# The END
# =============================================================================
Phys/CommonParticles/python/CommonParticles/StandardBasic.py deleted 100755 → 0
View file @ b6ef6acd
#!/usr/bin/env python
###############################################################################
# (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration #
# #
# This software is distributed under the terms of the GNU General Public #
# Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING". #
# #
# In applying this licence, CERN does not waive the privileges and immunities #
# granted to it by virtue of its status as an Intergovernmental Organization #
# or submit itself to any jurisdiction. #
###############################################################################
# =============================================================================
# =============================================================================
## @file CommonParticles/StandardBasic.py
# configuration file for 'Standard Basic'
# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
# @date 2009-01-14
# =============================================================================
"""
Configuration file for 'Standard Basic' particles
"""
from __future__ import print_function
__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl"
# =============================================================================
_locations = {}
from CommonParticles.StandardBasicCharged import *
_locations.update(locations)
from CommonParticles.StandardBasicNeutral import *
_locations.update(locations)
from CommonParticles.StandardJets import *
_locations.update(locations)
# redefine the locations
locations = _locations
## ============================================================================
if '__main__' == __name__:
print(__doc__)
print(__author__)
from CommonParticles.Utils import locationsDoD
print(locationsDoD(locations))
# =============================================================================
# The END
# =============================================================================
Phys/CommonParticles/python/CommonParticles/StandardBasicCharged.py deleted 100755 → 0
View file @ b6ef6acd
#!/usr/bin/env python
###############################################################################
# (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration #
# #
# This software is distributed under the terms of the GNU General Public #
# Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING". #
# #
# In applying this licence, CERN does not waive the privileges and immunities #
# granted to it by virtue of its status as an Intergovernmental Organization #
# or submit itself to any jurisdiction. #
###############################################################################
# =============================================================================
# =============================================================================
## @file CommonParticles/StandardBasicCharged.py
# configuration file for 'Standard BasicCharged'
# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
# @date 2009-01-14
# =============================================================================
"""
Configuration file for 'Standard Basic Charged' particles
"""
from __future__ import print_function
__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl"
# =============================================================================
_locations = {}
from CommonParticles.StandardPions import *
_locations.update(locations)
from CommonParticles.StandardKaons import *
_locations.update(locations)
from CommonParticles.StandardMuons import *
_locations.update(locations)
from CommonParticles.StandardElectrons import *
_locations.update(locations)
from CommonParticles.StandardProtons import *
_locations.update(locations)
# redefine the locations
locations = _locations
## ============================================================================
if '__main__' == __name__:
print(__doc__)
print(__author__)
from CommonParticles.Utils import locationsDoD
print(locationsDoD(locations))
# =============================================================================
# The END
# =============================================================================
Phys/CommonParticles/python/CommonParticles/StandardBasicNeutral.py deleted 100755 → 0
View file @ b6ef6acd
#!/usr/bin/env python
###############################################################################
# (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration #
# #
# This software is distributed under the terms of the GNU General Public #
# Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING". #
# #
# In applying this licence, CERN does not waive the privileges and immunities #
# granted to it by virtue of its status as an Intergovernmental Organization #
# or submit itself to any jurisdiction. #
###############################################################################
# =============================================================================
# =============================================================================
## @file CommonParticles/StandardBasicNeutral.py
# configuration file for 'Standard Basic Neutral'
# @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
# @date 2009-01-14
# =============================================================================
"""
Configuration file for 'Standard Basic Neutral' particles
"""
from __future__ import print_function
__author__ = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl"
# =============================================================================
_locations = {}
from CommonParticles.StandardPhotons import *
_locations.update(locations)
from CommonParticles.StandardPi0 import *
_locations.update(locations)
from CommonParticles.StandardEta import *
_locations.update(locations)
from CommonParticles.StdLooseDiElectron import *
_locations.update(locations)
# redefine the locations
locations = _locations
## ============================================================================
if '__main__' == __name__:
print(__doc__)
print(__author__)
from CommonParticles.Utils import locationsDoD
print(locationsDoD(locations))
# =============================================================================
# The END
# =============================================================================
Phys/CommonParticles/python/CommonParticles/StandardD0.py deleted 100755 → 0
View file @ b6ef6acd
#!/usr/bin/env python
###############################################################################
# (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration #
# #
# This software is distributed under the terms of the GNU General Public #
# Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING". #
# #
# In applying this licence, CERN does not waive the privileges and immunities #
# granted to it by virtue of its status as an Intergovernmental Organization #
# or submit itself to any jurisdiction. #
###############################################################################
# =============================================================================
# =============================================================================
## @file CommonParticles/StandardD0.py
# configuration file for 'Standard D0'
# @author Patrick Koppenburg
# @date 2009-02-28
# =============================================================================
"""
Configuration file for 'Standard D0'
"""
from __future__ import print_function
__author__ = "Patrick Koppenburg"
# =============================================================================
_locations = {}
from CommonParticles.StdLooseD02KsHH import *
_locations.update(locations)
from CommonParticles.StdLooseD02HH import *
_locations.update(locations)
# redefine the locations
locations = _locations
## ============================================================================
if '__main__' == __name__:
print(__doc__)
print(__author__)
from CommonParticles.Utils import locationsDoD
print(locationsDoD(locations))
# =============================================================================
# The END
# =============================================================================
Phys/CommonParticles/python/CommonParticles/StandardDiElectron.py deleted 100755 → 0
View file @ b6ef6acd
#!/usr/bin/env python
###############################################################################
# (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration #
# #
# This software is distributed under the terms of the GNU General Public #
# Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING". #
# #
# In applying this licence, CERN does not waive the privileges and immunities #