diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a4d9cc3f99d12ba1da041b571f9dc8e389f8689..2efae476eec3c6e48977553e4dbe258efb1e29be 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,6 @@ find_package(GaudiProject)
# Declare project name and version
gaudi_project(DaVinci v51r0
USE Analysis v31r0
- Stripping v15r2
DATA AppConfig VERSION v3r*
FieldMap VERSION v5r*
ParamFiles VERSION v8r*
diff --git a/DaVinciSys/CMakeLists.txt b/DaVinciSys/CMakeLists.txt
index e2666d97751c8b3b66bc14a67bafe4949f37c761..f7814943027a098596c29f946102c42d827f2091 100644
--- a/DaVinciSys/CMakeLists.txt
+++ b/DaVinciSys/CMakeLists.txt
@@ -14,10 +14,6 @@
gaudi_subdir(DaVinciSys)
gaudi_depends_on_subdirs(DaVinciTests
- ##############################
- # Temporarily moved in from Stripping
- Phys/StrippingCache
- ##############################
Phys/DaVinci
Phys/Tesla
Phys/TurboCache
diff --git a/DaVinciTests/tests/options/DVMonitorDst.py b/DaVinciTests/tests/options/DVMonitorDst.py
deleted file mode 100644
index 0b736868b43717b298485b58721a7633561a1b41..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/options/DVMonitorDst.py
+++ /dev/null
@@ -1,36 +0,0 @@
-###############################################################################
-# (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. #
-###############################################################################
-##############################################################################
-# $Id: DVMonitorDst.py,v 1.4 2010/03/17 18:44:33 pkoppenb Exp $
-#
-# syntax: gaudirun.py $DAVINCIMONITORSROOT/options/DVMonitorDst.py
-#
-# Author: Patrick Koppenburg <patrick.koppenburg@cern.ch>
-#
-##############################################################################
-from DaVinci.Configuration import *
-from Gaudi.Configuration import *
-##############################################################################
-#
-# the stuff
-#
-importOptions("$DAVINCIMONITORSROOT/options/DaVinciMonitoring.py")
-##############################################################################
-#
-# Histograms
-#
-DaVinci().HistogramFile = "DVMonitors.root"
-##############################################################################
-#
-# Most of this will be configured from Dirac
-#
-##############################################################################
-DaVinci().EvtMax = 100
diff --git a/DaVinciTests/tests/options/DVReadKs.py b/DaVinciTests/tests/options/DVReadKs.py
deleted file mode 100644
index 7f129540d5417b72739094bd1f7a44a8941f2d8c..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/options/DVReadKs.py
+++ /dev/null
@@ -1,57 +0,0 @@
-###############################################################################
-# (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. #
-###############################################################################
-#
-# Stripping selections job (DST output)
-#
-# @author J. Palacios/A. Poluektov
-# @date 2009-11-05
-#
-
-from Gaudi.Configuration import *
-from Configurables import PrintDecayTree, DaVinci
-from Configurables import CountParticles
-
-##############################################################################
-#
-# Ks
-#
-kalgs = []
-lalgs = []
-for i in ['','_noPV','_noPV_ws','_ws' ]:
- lalgs.append('StrippingLambda0'+i)
- kalgs.append('StrippingK0S'+i)
-kalgs.append('StrippingKSAllGeoLineCombine')
-lalgs.append('StrippingLambdaAllGeoLineCombine')
-algs = kalgs + lalgs
-
-head = '/Event/Strip/Phys/'
-locs = []
-for i in algs :
- locs.append( head+i )
-
-CC = CountParticles(Inputs = locs )
-##############################################################################
-#
-# DaVinci
-#
-DaVinci().DataType = "2009" # Default is "MC09"
-from Configurables import StoreExplorerAlg
-DaVinci().UserAlgorithms = [ CC ] # , PT
-DaVinci().EvtMax = 10000
-DaVinci().PrintFreq = 100
-##############################################################################
-#
-# Real Data
-#
-EventSelector().Input = [
-"DATAFILE='PFN:root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/swtest/2009_00005803_00000001_1.V0.dst' TYP='POOL_ROOTTREE' OPT='READ'" ]
-
-MessageSvc().Format = "% F%60W%S%7W%R%T %0W%M"
diff --git a/DaVinciTests/tests/options/DVStrippingDST-RealData.py b/DaVinciTests/tests/options/DVStrippingDST-RealData.py
deleted file mode 100644
index dda72ca2b87a0ba0263457d22935400e7365352c..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/options/DVStrippingDST-RealData.py
+++ /dev/null
@@ -1,57 +0,0 @@
-###############################################################################
-# (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. #
-###############################################################################
-#
-# Stripping selections job (DST output)
-#
-# @author J. Palacios/A. Poluektov
-# @date 2009-11-05
-#
-
-from Gaudi.Configuration import *
-from Configurables import SelDSTWriter, DaVinci
-##############################################################################
-#
-# Monitoring
-#
-importOptions( "$DAVINCIMONITORSROOT/options/DaVinciMonitoring.py")
-##############################################################################
-#
-# Stripping
-#
-from StrippingConf.Configuration import StrippingConf
-from StrippingSelections.Streams import allStreams
-
-sc = StrippingConf( Streams = allStreams )
-##############################################################################
-#
-# Hlt
-#
-# DaVinci().Hlt = True
-# DaVinci().HltThresholdSettings = 'Physics_320Vis_300L0_10Hlt1_Jan10'
-# DaVinci().L0 = True
-# DaVinci().ReplaceL0BanksWithEmulated = True
-##############################################################################
-#
-# DaVinci
-#
-DaVinci().DataType = "2009" # Default is "MC09"
-DaVinci().UserAlgorithms = [ sc.sequence() ]
-DaVinci().EvtMax = 1000
-##############################################################################
-#
-# Real Data
-#
-importOptions( "$DAVINCIROOT/options/2009-RealData-Reco07.py" ) # change
-##############################################################################
-
-MessageSvc().Format = "% F%60W%S%7W%R%T %0W%M"
-#from Configurables import CondDB
-#CondDB(UseOracle = True)
diff --git a/DaVinciTests/tests/options/DVTestReadETC.py b/DaVinciTests/tests/options/DVTestReadETC.py
deleted file mode 100644
index 774593e80afe44849445efb5ffe034b3be50de58..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/options/DVTestReadETC.py
+++ /dev/null
@@ -1,40 +0,0 @@
-###############################################################################
-# (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. #
-###############################################################################
-## $Id: DVTestReadETC.py,v 1.5 2010/01/28 07:21:10 pkoppenb Exp $
-## ============================================================================
-## CVS tag $Name: $, version $Revision: 1.5 $
-## ============================================================================
-#
-# Example options to read a user-defined ETC
-#
-from Gaudi.Configuration import *
-from Configurables import DaVinci
-from StrippingConf.Configuration import StrippingConf
-
-from StrippingArchive.Utils import buildStream
-stream = buildStream('Stripping17', 'Dimuon')
-sc = StrippingConf()
-sc.appendStream( stream )
-
-DaVinci().appendToMainSequence( [ sc.sequence() ] )
-DaVinci().EvtMax = -1
-DaVinci().PrintFreq = 1
-DaVinci().DataType = "MC09"
-DaVinci().Simulation = True
-
-DaVinci().Input = [
- "COLLECTION='TagCreator/EventTuple' DATAFILE='etc.root' TYP='POOL_ROOT' SEL='(StrippingBs2JpsiPhiLine==1)'" ]
-
-from Configurables import TagCollectionSvc
-ApplicationMgr().ExtSvc += [ TagCollectionSvc("EvtTupleSvc") ]
-
-FileCatalog().Catalogs = [ "xmlcatalog_file:$DAVINCITESTSROOT/tests/options/Stripping/Sim2010_Bs2JpsiPhi.xml" ]
-MessageSvc().Format = "% F%60W%S%7W%R%T %0W%M"
diff --git a/DaVinciTests/tests/options/Stripping/DVTestBd2KstarMuMu.py b/DaVinciTests/tests/options/Stripping/DVTestBd2KstarMuMu.py
deleted file mode 100644
index dc91d6755583f51ec104cd7d237de4472c7f4155..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/options/Stripping/DVTestBd2KstarMuMu.py
+++ /dev/null
@@ -1,86 +0,0 @@
-###############################################################################
-# (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. #
-###############################################################################
-## CVS tag $Name: $, version $Revision: 1.15 $
-## ============================================================================
-"""
-@file DVTestBd2KstarMuMu.py
-
-Test file for B0->mumuK* selection
-
-@author J. Palacios
-@date 2007-11-12
-"""
-from Gaudi.Configuration import *
-MessageSvc().Format = "% F%60W%S%7W%R%T %0W%M"
-##--------------------------------------------------------------
-##
-## Truth checking
-##
-from Configurables import GaudiSequencer
-trueSeq = GaudiSequencer("FindTrueDecay")
-trueSeq.IgnoreFilterPassed = True
-##------------------------------------------------------------------------------##
-## Truth filter No PID
-##
-from Configurables import FilterTrueTracks, MCDecayFinder
-trueSeq.Members += [ FilterTrueTracks() ]
-FilterTrueTracks().addTool(MCDecayFinder)
-FilterTrueTracks().MCDecayFinder.Decay = "[[B0]nos => ^K+ ^pi- ^mu+ ^mu- {,gamma}{,gamma}{,gamma}{,gamma}]cc, [[B0]os => ^K- ^pi+ ^mu+ ^mu- {,gamma}{,gamma}{,gamma}{,gamma}]cc"
-##
-## Correlations
-##
-from Configurables import AlgorithmCorrelationsAlg, AlgorithmCorrelations
-TestCorrelations = AlgorithmCorrelationsAlg("TestCorrelations")
-TestCorrelations.addTool(AlgorithmCorrelations())
-TestCorrelations.AlgorithmCorrelations.OnlyNonZero = False
-TestCorrelations.Algorithms = ["FilterTrueTracks",
- "StdVeryLooseMuons",
- "StdNoPIDsKaons",
- "StdNoPIDsPions",
- "Sel_Bd2KstarMuMu_DiMuon",
- "Sel_Bd2KstarMuMu_Kstar",
- "StrippingBd2KstarMuMu_BdToKstarMuMuLine" ]
-###
-# DaVinci
-###
-## Preselection
-
-from StrippingConf.Configuration import StrippingConf
-from StrippingConf.StrippingStream import StrippingStream
-
-from StrippingArchive.Utils import lineBuilder
-lineBuilder = lineBuilder('Stripping17', 'Bd2KstarMuMu')
-stream = StrippingStream("BKstarMuMuTest", Lines = lineBuilder.lines())
-sc = StrippingConf()
-sc.appendStream( stream )
-
-from Configurables import DaVinci
-DaVinci().UserAlgorithms = [ trueSeq ]
-DaVinci().MoniSequence = [ TestCorrelations ]
-DaVinci().appendToMainSequence( [ sc.sequence() ] )
-########################################################################
-#-- GAUDI jobOptions generated on Tue Jan 18 17:40:43 2011
-#-- Contains event types :
-#-- 11114004 - 1 files - 10000 events - 2.78 GBytes
-# MC_2010_428935_2010-Sim08Reco06-withTruth_11114004
-#
-from Gaudi.Configuration import *
-
-EventSelector().Input = [
- "DATAFILE='PFN:root://castorlhcb.cern.ch//castor/cern.ch/grid/lhcb/MC/2010/DST/00008055/0000/00008055_00000053_1.dst' TYP='POOL_ROOTTREE' OPT='READ'"]
-########################################################################
-DaVinci().EvtMax = 500
-DaVinci().SkipEvents = 0
-DaVinci().PrintFreq = 10
-DaVinci().DataType = "MC09"
-########################################################################
-MessageSvc().Format = "% F%60W%S%7W%R%T %0W%M"
-
diff --git a/DaVinciTests/tests/options/Stripping/Sim2010_Bd2JpsiKs.py b/DaVinciTests/tests/options/Stripping/Sim2010_Bd2JpsiKs.py
deleted file mode 100644
index 7fe555a746d34b8f163f0a50e7977461a4406c9b..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/options/Stripping/Sim2010_Bd2JpsiKs.py
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# (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. #
-###############################################################################
-#-- GAUDI jobOptions generated on Mon Jan 17 17:06:59 2011
-#-- Contains event types :
-#-- 11144103 - 1 files - 10000 events - 4.10 GBytes
-
-from Gaudi.Configuration import *
-
-EventSelector().Input = [
-" DATAFILE='root://castorlhcb.cern.ch//castor/cern.ch/grid/lhcb/MC/2010/DST/00008414/0000/00008414_00000106_1.dst?svcClass=lhcbdata' TYP='POOL_ROOTTREE' OPT='READ'"]
-FileCatalog().Catalogs = [ 'xmlcatalog_file:$DAVINCITESTSROOT/tests/options/Stripping/Sim2010_Bd2JpsiKs.xml' ]
diff --git a/DaVinciTests/tests/options/Stripping/Sim2010_Bd2JpsiKs.xml b/DaVinciTests/tests/options/Stripping/Sim2010_Bd2JpsiKs.xml
deleted file mode 100644
index 37a07ad490a8be375f07211895a454d8d1ede284..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/options/Stripping/Sim2010_Bd2JpsiKs.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<!--
- (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.
--->
-<!-- Edited By PoolXMLCatalog.py -->
-<!DOCTYPE POOLFILECATALOG SYSTEM "InMemory">
-<POOLFILECATALOG>
-
-
- <File ID="467AE927-AA01-E011-96DF-0030487CAEA4">
- <physical>
- <pfn filetype="ROOT_All" name="root://castorlhcb.cern.ch//castor/cern.ch/grid/lhcb/MC/2010/DST/00008414/0000/00008414_00000106_1.dst?svcClass=lhcbdata"/>
- </physical>
- <logical>
- <lfn name="/lhcb/MC/2010/DST/00008414/0000/00008414_00000106_1.dst"/>
- </logical>
- </File>
-
-</POOLFILECATALOG>
diff --git a/DaVinciTests/tests/options/Stripping/Sim2010_Bs2JpsiPhi.py b/DaVinciTests/tests/options/Stripping/Sim2010_Bs2JpsiPhi.py
deleted file mode 100644
index b43f8e8940765f624642c77f406ac1971738d0cb..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/options/Stripping/Sim2010_Bs2JpsiPhi.py
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# (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. #
-###############################################################################
-#-- GAUDI jobOptions generated on Mon Jan 17 17:13:58 2011
-#-- Contains event types :
-#-- 13144006 - 1 files - 10000 events - 4.13 GBytes
-
-from Gaudi.Configuration import *
-
-EventSelector().Input = [
-" DATAFILE='root://castorlhcb.cern.ch//castor/cern.ch/grid/lhcb/MC/2010/DST/00008405/0000/00008405_00000506_1.dst?svcClass=lhcbdata' TYP='POOL_ROOTTREE' OPT='READ'"]
-FileCatalog().Catalogs = [ 'xmlcatalog_file:$DAVINCITESTSROOT/tests/options/Stripping/Sim2010_Bs2JpsiPhi.xml' ]
diff --git a/DaVinciTests/tests/options/Stripping/Sim2010_Bs2JpsiPhi.xml b/DaVinciTests/tests/options/Stripping/Sim2010_Bs2JpsiPhi.xml
deleted file mode 100644
index b467514818ba2a1d2814428ed5d1107414501b32..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/options/Stripping/Sim2010_Bs2JpsiPhi.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<!--
- (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.
--->
-<!-- Edited By PoolXMLCatalog.py -->
-<!DOCTYPE POOLFILECATALOG SYSTEM "InMemory">
-<POOLFILECATALOG>
-
-
- <File ID="2C580501-EF03-E011-8F76-0030487CB9F0">
- <physical>
- <pfn filetype="ROOT_All" name="root://castorlhcb.cern.ch//castor/cern.ch/grid/lhcb/MC/2010/DST/00008405/0000/00008405_00000506_1.dst?svcClass=lhcbdata"/>
- </physical>
- <logical>
- <lfn name="/lhcb/MC/2010/DST/00008405/0000/00008405_00000506_1.dst"/>
- </logical>
- </File>
-
-</POOLFILECATALOG>
diff --git a/DaVinciTests/tests/options/Stripping/test_express_appconfig.py b/DaVinciTests/tests/options/Stripping/test_express_appconfig.py
deleted file mode 100644
index d81ab2539f2d50d6beea326cb8360da5786340a9..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/options/Stripping/test_express_appconfig.py
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# (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. #
-###############################################################################
-from Gaudi.Configuration import importOptions
-importOptions("$APPCONFIGOPTS/DaVinci/DVMonitor-RealData.py")
-importOptions("$APPCONFIGOPTS/DaVinci/DataType-2010.py")
-from Configurables import DaVinci
-DaVinci().EvtMax=1000
-
diff --git a/DaVinciTests/tests/options/fsrs/davinci-merge-bhadron.py b/DaVinciTests/tests/options/fsrs/davinci-merge-bhadron.py
deleted file mode 100644
index b1b27dee8b8817ef7ee8ef44680a48821b6a7700..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/options/fsrs/davinci-merge-bhadron.py
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# (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. #
-###############################################################################
-from Gaudi.Configuration import *
-importOptions('$APPCONFIGOPTS/Merging/DV-Stripping-Merging.py')
-importOptions('$APPCONFIGOPTS/Merging/WriteFSR.py')
-importOptions('$DAVINCITESTSROOT/tests/options/fsrs/davinci-merge.py')
-EventSelector().Input = ["DATAFILE='PFN:MagUp.Bhadron.dst' TYP='POOL_ROOTTREE' OPT='READ'", "DATAFILE='PFN:MagDown.Bhadron.dst' TYP='POOL_ROOTTREE' OPT='READ'"]
diff --git a/DaVinciTests/tests/options/fsrs/davinci-merge-ew.py b/DaVinciTests/tests/options/fsrs/davinci-merge-ew.py
deleted file mode 100644
index c73e6b1f1e6a4cb8079ebf6e35c299cc04bb2315..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/options/fsrs/davinci-merge-ew.py
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# (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. #
-###############################################################################
-from Gaudi.Configuration import *
-importOptions('$APPCONFIGOPTS/Merging/DV-Stripping-Merging.py')
-importOptions('$APPCONFIGOPTS/Merging/WriteFSR.py')
-importOptions('$DAVINCITESTSROOT/tests/options/fsrs/davinci-merge.py')
-EventSelector().Input = ["DATAFILE='PFN:MagUp.EW.dst' TYP='POOL_ROOTTREE' OPT='READ'", "DATAFILE='PFN:MagDown.EW.dst' TYP='POOL_ROOTTREE' OPT='READ'"]
diff --git a/DaVinciTests/tests/options/gpython_algs.py b/DaVinciTests/tests/options/gpython_algs.py
index 51c568491fc3781614e285c362d6ac9428a73dc8..55434b42b72b95b0410f33be037894c3936745ed 100755
--- a/DaVinciTests/tests/options/gpython_algs.py
+++ b/DaVinciTests/tests/options/gpython_algs.py
@@ -33,9 +33,12 @@ dv = DaVinci(
##
## put some algorithms into "user" list
##
-from StandardParticles import StdLooseKaons
+
+from PhysConf.Selections import AutomaticData
+Kaons = AutomaticData('Phys/StdAllLooseKaons/Particles')
+
from PhysSelPython.Wrappers import SelectionSequence
-seq = SelectionSequence( 'KAONS' , StdLooseKaons )
+seq = SelectionSequence( 'KAONS' , Kaons )
dv.UserAlgorithms += [ seq.sequence() ]
## produde a lot of prints
diff --git a/DaVinciTests/tests/qmtest/io.qms/test_monitor_reco14_fulldst.qmt b/DaVinciTests/tests/qmtest/io.qms/test_monitor_reco14_fulldst.qmt
deleted file mode 100755
index 4d4e9afe07f9d7b7161a120e2993a5061e1875ea..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/qmtest/io.qms/test_monitor_reco14_fulldst.qmt
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" ?>
-<!--
- (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.
--->
-<!DOCTYPE extension PUBLIC '-//QM/2.3/Extension//EN' 'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'>
-<extension class="GaudiTest.GaudiExeTest" kind="test">
-<argument name="program"><text>gaudirun.py</text></argument>
-<argument name="timeout"><integer>3600</integer></argument>
-<argument name="args"><set>
- <text>-T</text>
- <text>$DAVINCITESTSROOT/tests/options/DVMonitorDst.py</text>
- <text>$APPCONFIGOPTS/DaVinci/DataType-2012.py</text>
- <text>$PRCONFIGOPTS/DaVinci/Stripping/Collision12-4TeV-Reco14-FULLDST.py</text>
-</set></argument>
-<argument name="validator"><text>
-findReferenceBlock("""
-ApplicationMgr INFO Application Manager Finalized successfully
-ApplicationMgr INFO Application Manager Terminated successfully
-""", stdout, result, causes, signature_offset = 0)
-countErrorLines({"FATAL":0})
-</text></argument>
-</extension>
diff --git a/DaVinciTests/tests/qmtest/stripping.qms/test_allstreams_instantiation.qmt b/DaVinciTests/tests/qmtest/stripping.qms/test_allstreams_instantiation.qmt
deleted file mode 100644
index 00799ce70394067c195c589285f08e7dac711288..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/qmtest/stripping.qms/test_allstreams_instantiation.qmt
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" ?>
-<!--
- (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.
--->
-<!DOCTYPE extension PUBLIC '-//QM/2.3/Extension//EN' 'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'>
-<!--
-#######################################################
-# SUMMARY OF THIS TEST
-# ...................
-# Author: rlambert
-# Purpose: Very very simple test, just check that the existing stripping streams can be instantiated. This is a minimal test of the stripping consistency.
-# Prerequisites: None
-# Common failure modes, severities and cures:
-# . SEVERE: Segfault or raised exception, stderr, nonzero return code
-# . MAJOR: Failure to instantiate a given stream, indicates there are undeclared prerequisites or completely broken python configurabloids
-# . MINOR: additional WARNING messages, it is unclear how severe these may be, you will need to hunt down the cause and either fix the problem or suppress the warning.
-#######################################################
--->
-<extension class="GaudiTest.GaudiExeTest" kind="test">
- <argument name="timeout"><integer>1200</integer></argument>
- <argument name="program">
- <text>$STRIPPINGSELECTIONSROOT/tests/test_allstreams_instantiation.py</text>
- </argument>
-</extension>
diff --git a/DaVinciTests/tests/qmtest/stripping.qms/test_express_appconfig.qmt b/DaVinciTests/tests/qmtest/stripping.qms/test_express_appconfig.qmt
deleted file mode 100755
index 30dbfb3c507cddf49275ba28562b12bcac79e740..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/qmtest/stripping.qms/test_express_appconfig.qmt
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" ?>
-<!--
- (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.
--->
-<!DOCTYPE extension PUBLIC '-//QM/2.3/Extension//EN' 'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'>
-<extension class="GaudiTest.GaudiExeTest" kind="test">
-<argument name="program"><text>gaudirun.py</text></argument>
-<argument name="timeout"><integer>1800</integer></argument>
-<argument name="args"><set>
- <text>$DAVINCITESTSROOT/tests/options/Stripping/test_express_appconfig.py</text>
- <text>$DAVINCITESTSROOT/tests/options/dimuon_testfile.py</text>
-</set>
-</argument>
-<argument name="validator"><text>
-findReferenceBlock("""
-DaVinciInitAlg SUCCESS 1000 events processed
-""", stdout, result, causes, signature_offset = 0, id = "4100")
-countErrorLines({"FATAL":0})
-bad_strings = ["WARNING rawEvent not found at location 'DAQ/RawEvent'", "WARNING L0DUFromRawAlg:: Unable to decode L0DU rawBank"]
-for bad_string in bad_strings :
- if stdout.find(bad_string) !=-1 :
- causes.append('Excluded string')
- result['GaudiTest.ExcludedString: '+bad_string] = result.Quote('ERROR: Found string '+bad_string)
-</text></argument>
-</extension>
diff --git a/DaVinciTests/tests/qmtest/stripping.qms/test_v0.qmt b/DaVinciTests/tests/qmtest/stripping.qms/test_v0.qmt
deleted file mode 100755
index 56402a71d1729ec0d2051fbf62892d8406c2faa4..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/qmtest/stripping.qms/test_v0.qmt
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" ?>
-<!--
- (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.
--->
-<!DOCTYPE extension PUBLIC '-//QM/2.3/Extension//EN' 'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'>
-<extension class="GaudiTest.GaudiExeTest" kind="test">
-<argument name="program"><text>gaudirun.py</text></argument>
-<argument name="timeout"><integer>1800</integer></argument>
-<argument name="args"><set>
- <text>../options/DVReadKs.py</text>
-</set></argument>
-<argument name="validator"><text>
-findReferenceBlock("""
-CountParticles SUCCESS Number of counters : 15
- | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- | "# Strip/Phys/StrippingK0S" | 10000 | 1499 | 0.14990 | 0.44814 | 0.0000 | 5.0000 |
- | "# Strip/Phys/StrippingK0S_noPV" | 10000 | 3067 | 0.30670 | 1.0440 | 0.0000 | 18.000 |
- | "# Strip/Phys/StrippingK0S_noPV_ws" | 10000 | 2681 | 0.26810 | 1.0140 | 0.0000 | 29.000 |
- | "# Strip/Phys/StrippingK0S_ws" | 10000 | 1105 | 0.11050 | 0.39660 | 0.0000 | 5.0000 |
- | "# Strip/Phys/StrippingKSAllGeoLineCombine" | 10000 | 18648 | 1.8648 | 2.5536 | 0.0000 | 34.000 |
- | "# Strip/Phys/StrippingLambda0" | 10000 | 3237 | 0.32370 | 0.71423 | 0.0000 | 9.0000 |
- | "# Strip/Phys/StrippingLambda0_noPV" | 10000 | 2584 | 0.25840 | 0.94975 | 0.0000 | 17.000 |
- | "# Strip/Phys/StrippingLambda0_noPV_ws" | 10000 | 2361 | 0.23610 | 0.95685 | 0.0000 | 31.000 |
- | "# Strip/Phys/StrippingLambda0_ws" | 10000 | 2679 | 0.26790 | 0.64244 | 0.0000 | 8.0000 |
- | "# Strip/Phys/StrippingLambdaAllGeoLineCombine" | 10000 | 13672 | 1.3672 | 2.0568 | 0.0000 | 21.000 |
- | "# input particles" | 10000 | 51533 | 5.1533 | 5.7808 | 1.0000 | 82.000 |
- |*"#accept" | 10000 | 10000 |( 100.0000 +- 0.000000)% |
- | "KS0" | 27000 | 27000 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
- | "Lambda0" | 12751 | 12751 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
- | "Lambda~0" | 11782 | 11782 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
-""", stdout, result, causes,
-signature_offset = 0, id = "Ks")
-</text></argument>
-</extension>
diff --git a/Phys/StrippingCache/CMakeLists.txt b/Phys/StrippingCache/CMakeLists.txt
deleted file mode 100644
index a9683567039a0c5b91773c85bb1804f9a15c13d9..0000000000000000000000000000000000000000
--- a/Phys/StrippingCache/CMakeLists.txt
+++ /dev/null
@@ -1,92 +0,0 @@
-###############################################################################
-# (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. #
-###############################################################################
-################################################################################
-# Package: StrippingCache
-################################################################################
-gaudi_subdir(StrippingCache)
-
-gaudi_depends_on_subdirs(Phys/DaVinci
- Phys/LoKiArrayFunctors
- Phys/LoKiHlt
- Phys/LoKiPhys
- Phys/LoKiAlgo
- Phys/LoKiCore
- Phys/StrippingAlgs
- Phys/StrippingNeuroBayes
- Phys/IncTopoVert
- Phys/TMVASelections
- Phys/DisplVertices
- Phys/IsolationTools
- Phys/RelatedInfoTools)
-
-set(extraopts_29r2
- ${AppConfig_DIR}/options/DaVinci/DataType-2017.py
- )
-
-
-# Do not build for the -O0 platform, as this seems to have problems.
-# To be investigated...
-if ( NOT "$ENV{CMTCONFIG}" STREQUAL "x86_64-slc6-gcc48-do0" )
-
- foreach(pack DaVinci StrippingAlgs StrippingNeuroBayes IncTopoVert TMVASelections
- DisplVertices IsolationTools RelatedInfoTools)
- # FIXME: this will be needed until GAUDI-1055 is fixed.
- if(EXISTS ${CMAKE_BINARY_DIR}/Phys/${pack}/genConf/${pack})
- gaudi_build_env(PREPEND PYTHONPATH ${CMAKE_BINARY_DIR}/Phys/${pack}/genConf/${pack})
- endif()
- # if(TARGET ${pack}Conf)
- # set(deps ${conf_deps} ${pack}Conf )
- # endif()
- # if(TARGET ${pack}ComponentsList)
- # set(deps ${conf_deps} ${pack}ComponentsList )
- # endif()
- endforeach()
-
- # Import the cache creation module
- include(LoKiFunctorsCache)
-
- # Set dependency so caches build last, after DaVinci itself.
- set ( conf_deps ${deps} MergedConfDB )
-
- # Build the cache only for the most recent stripping.
- foreach(strip )
-
- # Stripping cache name
- set ( sname S${strip}FunctorCache )
-
- # Stripping options file to use. If exists use AppConfig file, otherwise try local
- set ( optsfile ${AppConfig_DIR}//options/DaVinci/DV-Stripping${strip}-Stripping.py )
- if ( NOT EXISTS ${optsfile} )
- set ( optsfile ${CMAKE_CURRENT_SOURCE_DIR}/options/DV-Stripping${strip}-Stripping.py )
- endif()
-
- # cache build if options exist
- if ( EXISTS ${optsfile} )
-
- # Print this cache
- MESSAGE( STATUS "S" ${strip} " : " ${optsfile} )
-
- # Build !
- loki_functors_cache(${sname}
- options/SuppressLogMessages.py
- ${optsfile}
- ${extraopts_${strip}}
- options/SilenceErrors.py
- options/DisableLoKiCacheFunctors.py
- LINK_LIBRARIES LoKiArrayFunctorsLib LoKiHltLib
- DEPENDS ${conf_deps}
- SPLIT 50)
-
- endif()
-
- endforeach()
-
-endif()
diff --git a/Phys/StrippingCache/doc/release.notes b/Phys/StrippingCache/doc/release.notes
deleted file mode 100644
index 96b90247c8ede560fe9050c5af0a88b12d6e41f6..0000000000000000000000000000000000000000
--- a/Phys/StrippingCache/doc/release.notes
+++ /dev/null
@@ -1,232 +0,0 @@
-! -----------------------------------------------------------------------------
-! Package : StrippingCache
-! Responsible : Vanya Belyaev
-! Purpose : Keep C++ functors for stripping
-! Created : 2015-02-04
-! -----------------------------------------------------------------------------
-
-!======================== StrippingCache v1r10p1 2017-09-13 =====================
-
-! 2017-09-13 - Michael Alexander
- - Add cache for S29r1.
-
-!======================== StrippingCache v1r10 2017-06-13 =======================
-
-! 2017-05-30 - Michael Alexander
- - Add cache for S29.
-
-!======================== StrippingCache v1r9 2017-03-22 =======================
-
-! 2017-03-22 - Michael Alexander
- - Edit CMakeLists.txt to build the cache only for the most recent stripping.
-
-!======================== StrippingCache v1r8 2017-01-31 =======================
-
-! 2017-01-31 - Ricardo Vazquez Gomez
- - Add StrippingCache for S28
-
-!======================== StrippingCache v1r7 2016-12-19 =======================
-
-! 2016-12-19 - Ricardo Vazquez Gomez
- - Add StrippingCache for S27
-
-!======================== StrippingCache v1r6 2016-05-17 =======================
-
-! 2016-05-17 - Ricardo Vazquez Gomez
- - Add StrippingCache for S26
-
-!======================== StrippingCache v1r5 2016-03-04 =======================
-
-! 2016-02-22 - Ricardo Vazquez Gomez
- - Remove all the DV dependencies in cache for S21r0,1p1
-
-! 2016-02-19 - Ricardo Vazquez Gomez
- - Fix in Cache for S21r0,1p1
-
-! 2016-02-18 - Ricardo Vazquez Gomez
- - Added StrippingCache for S21r0p1 and S21r1p1
-
-! 2016-02-17 - Andrea Contu
- - Added StrippingCache for S25
-
-!======================== StrippingCache v1r4 2016-01-13 =======================
-
-! 2016-01-13 - Ricardo Vazquez Gomez
- - Add options to disable the cache in TrackExtrapolators
-
-! 2016-01-07 - Ricardo Vazquez Gomez
- - Correct syntax warning in CMakeLists.txt
-
-! 2016-01-02 - Andrea Contu
- - Remove cache for S20 series
-
-! 2015-12-09 - Andrea Contu
- - Fix S24 options
-
-! 2015-11-24 - Ricardo Vazquez Gomez
- -Remove upfront tracking cuts
-
-! 2015-11-24 - Ricardo Vazquez Gomez
- - Added StrippingCache for S24
-
-!======================== StrippingCache v1r3 2015-10-25 =======================
-
-! 2015-10-25 - Andrea Contu
- - Removing S20r0p3 due to bugfix in PySel Wrappers
-
-! 2015-10-15 - Andrea Contu
- - Removing S21 and S23 due to changes in RelatedInfo
-
-! 2015-09-24 - Ricardo Vazquez Gomez
- - Add the S21r1 cache
-
-!========================= StrippingCache v1r2 2015-09-09 =========================
-
-! 2015-09-10 - Andrea Contu
- - Edited CMakeList accordingly
-
-! 2015-09-10 - Andrea Contu
- - Rename Stripping23c -> Stripping23r1
-
-! 2015-09-09 - Andrea Contu
- - Added options for Stripping23c
-
-! 2015-08-26 - Chris Jones
- - Update the CMake builds to make each cache independent, so does not skip
- factors alrady cached. Increases a bit the overall size of the cached functor
- libraries, but allows the MD5 name hack to be removed, and also allows the
- builds to proceed in parrallel.
-
-!========================= StrippingCache v1r1 2015-08-24 =========================
-
-! 2015-08-23 - Chris Jones
- - Clean up CMake file a bit.
-
-! 2015-08-21 - Chris Jones
- - Replace the timestamp in the file names with a hash based on the build
- directory. Achieves the same end result, makes builds in different areas
- unique, but has the advance the repeated builds in the same user area
- use the same stamp...
- - Add the area containing the buiold component lists to the runtime
- LD_LIBRARY_PATH. Needed for so the generation of sources for each cache
- skip those already in an already built cache.
-
-! 2015-08-20 - Chris Jones
- - Add support for building multiple caches for different strippings
- + Each cache is made to depend on each other, in order, such that they are
- built sequentially. This is needed so the previous caches are then
- available when the next is built, to avoid the same functors being cached
- more than once.
- + A timestamp is appended to the name of each cache, taken from the time the
- build in initialised. This is needed ensure the same cache generated in
- the nightlies to that in a private user area are considered as seperate
- things and do not mask each other, which is required as the user cache
- will not contain functors in the release cache.
-
-!========================= StrippingCache v1r0 2015-08-18 =========================
-
-! 2015-08-18 - Chris Jones
- - Disable for now build on x86_64-slc6-gcc48-do0 as it seems to have problems.
-
-! 2015-08-17 - Stefano Perazzini
- - Configured the options for S23 in order to use StrippingArchive
-
-! 2015-08-15 - Chris Jones
- - Add some more warning message exclusions.
-
-! 2015-08-14 - Chris Jones
- - Turn off messages again for building in the nightlies.
-
-! 2015-08-13 - Chris Jones
- - Update S23 options to not use DaVinci() configurable directly.
-
-! 2015-08-12 - Chris Jones
- - Updates for S23.
- + Added options/DV-Stripping23-Stripping.py
- + Note that to get things working I have added the use of the DaVinci
- configurable to the S23 options. This means this package must be built in
- DaVinci, not the stripping. This is temporary, to try and get things working
- for the S23 DV release. To be cleanup later on (once Marco is back).
-
-! 2015-07-21 - Marco Clemencic
- - LHCBPS-1427: Suppress spurious warnings from S20/21 functors cache generation
-
-! 2015-07-21 - Marco Clemencic
- - Clean up
- - removed unneeded files
- - removed CMT configuration
-
-! 2015-07-20 - Marco Clemencic
- - Fixed compilation of the caches adding required dependencies.
-
-! 2015-07-19 - Stefano Perazzini
- - Update to cmt/requirements and CMakeList.txt
-
-! 2015-07-18 - Stefano Perazzini
- - Changed the cmt/requirements and CMakeList.txt to add dependency on
- StrippingArchive
-
-! 2015-07-17 - Stefano Perazzini
- - Introduced options to create caches for S21 and S20.
- - Added package to STRIPPING under Phys/StrippingCache.
-
-! 2015-07-03 - Marco Clemencic
- - Moved the CMake code to generate functors factories to Phys/LoKiCore.
-
-! 2015-06-25 - Marco Clemencic
- - Added (preliminary) CMake integration.
-
-! 2015-06-23 - Vanya Belyaev
- - test with new setting of hybrid base
-
-! 2015-02-22 - Vanya Belyaev
- - commit fixed version of script directory
-
-! 2015-02-11 - Vanya Belyaev
-
- - INSTRUCTIONS:
-
-1. get the package:
-
- getpack StrippingCache head
- cd StrippingCache/options
-
-
-2&3. set environment variable and run stripping:
-
- export LOKI_GENERATE_CPPCODE=20
-
- gaudirun.py <options>...
-
- I've actually used 2 step action:
-
- export LOKI_GENERATE_CPPCODE=20
-
- gaudirun.py DV-Stripping21-Stripping.py DataType.py -n -o Stripping21.pkl
-
- gaudirun.py ./Stripping21.pkl
-
-4. move generated cpp code to src directori and build the cache:
-
- mv *.cpp ../src
-
- make -j 10
-
- Thats all...
- for next run of gaudirun it will pick up functors from cache:
-
- ToolSvc.HybridFactory SUCCESS Number of counters : 2
- | Counter | # |
- | "# loaded from CACHE" | 14770 |
- | "# loaded from PYTHON" | 1 |
-ToolSvc.CoreFactory SUCCESS Number of counters : 1
- | Counter | # |
- | "# loaded from CACHE" | 1212 |
-
-
-! 2015-02-04 - Vanya Belyaev
- - the first import
-
-! -----------------------------------------------------------------------------
-! The END
-! -----------------------------------------------------------------------------
diff --git a/Phys/StrippingCache/options/DV-Stripping21r0p1-Stripping.py b/Phys/StrippingCache/options/DV-Stripping21r0p1-Stripping.py
deleted file mode 100644
index 9db96642379b79fb3704552c0b6b0c48e82b8a59..0000000000000000000000000000000000000000
--- a/Phys/StrippingCache/options/DV-Stripping21r0p1-Stripping.py
+++ /dev/null
@@ -1,150 +0,0 @@
-###############################################################################
-# (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. #
-###############################################################################
-"""
-Options for building Stripping21r0p1.
-"""
-
-stripping='stripping21r0p1'
-
-#use CommonParticlesArchive
-from CommonParticlesArchive import CommonParticlesArchiveConf
-CommonParticlesArchiveConf().redirect(stripping)
-
-
-from Gaudi.Configuration import *
-MessageSvc().Format = "% F%30W%S%7W%R%T %0W%M"
-
-# Tighten Trk Chi2 to <3
-from CommonParticles.Utils import DefaultTrackingCuts
-DefaultTrackingCuts().Cuts = { "Chi2Cut" : [ 0, 3 ],
- "CloneDistCut" : [5000, 9e+99 ] }
-
-#
-# Disable the cache in Tr/TrackExtrapolators
-#
-from Configurables import TrackStateProvider
-TrackStateProvider().CacheStatesOnDemand = False
-
-#
-# Fix for TrackEff lines
-#
-from Configurables import DecodeRawEvent
-DecodeRawEvent().setProp("OverrideInputs",4.2)
-
-#
-# Build the streams and stripping object
-#
-from StrippingConf.Configuration import StrippingConf, StrippingStream
-from StrippingSettings.Utils import strippingConfiguration
-from StrippingArchive.Utils import buildStreams
-from StrippingArchive import strippingArchive
-
-#get the configuration dictionary from the database
-config = strippingConfiguration(stripping)
-#get the line builders from the archive
-archive = strippingArchive(stripping)
-
-streams = buildStreams(stripping = config, archive = archive)
-
-leptonicMicroDSTname = 'Leptonic'
-charmMicroDSTname = 'Charm'
-pidMicroDSTname = 'PID'
-bhadronMicroDSTname = 'Bhadron'
-mdstStreams = [ leptonicMicroDSTname,charmMicroDSTname,pidMicroDSTname,bhadronMicroDSTname ]
-dstStreams = [ "BhadronCompleteEvent", "CharmCompleteEvent", "CharmToBeSwum", "Dimuon",
- "EW", "Semileptonic", "Calibration", "MiniBias", "Radiative" ]
-
-stripTESPrefix = 'Strip'
-
-from Configurables import ProcStatusCheck
-
-from PhysConf.Filters import LoKi_Filters
-flts = LoKi_Filters(VOID_Code = "( TrSource(TrSOURCE('/Event/Rec/Track/Best', TrLONG))"\
- " >> ( sum( TrPT,TrP < 1 * TeV ) > 1 * TeV ) )" ,
- VOID_Preambulo = ["from LoKiTracks.decorators import *" ,
- "from LoKiCore.functions import * ",
- "from GaudiKernel.SystemOfUnits import *"])
-filterBadEvents = GaudiSequencer("BadEventFilter",
- ModeOR = True,
- Members = [ flts.sequencer("GECFilter"),
- ProcStatusCheck() ] )
-streamFilter = { 'default' : filterBadEvents,
- 'MiniBias' : ProcStatusCheck() }
-
-# Fix for removal of default constructor for AALLSAMEBPV after DV v41r3.
-from Gaudi.Configuration import allConfigurables
-for conf in allConfigurables.values() :
- if hasattr(conf, 'CombinationCut') and 'AALLSAMEBPV' in conf.CombinationCut :
- conf.CombinationCut = conf.CombinationCut.replace('AALLSAMEBPV', 'AALLSAMEBPV(-1, -1, -1)')
-
-sc = StrippingConf( Streams = streams,
- MaxCandidates = 2000,
- AcceptBadEvents = False,
- BadEventSelection = ProcStatusCheck(),
- TESPrefix = stripTESPrefix,
- ActiveMDSTStream = True,
- Verbose = True,
- DSTStreams = dstStreams,
- MicroDSTStreams = mdstStreams )
-
-from Configurables import ApplicationMgr, AuditorSvc, SequencerTimerTool
-
-# Initial IOV time
-# http://www.onlineconversion.com/unix_time.htm
-# values in ns (so multiply values from above link by 1e9)
-#from Configurables import EventClockSvc
-#EventClockSvc().EventTimeDecoder = "OdinTimeDecoder"
-
-appMgr = ApplicationMgr()
-appMgr.OutputLevel = 6
-appMgr.ExtSvc += [ 'ToolSvc', 'AuditorSvc' ]
-
-appMgr.HistogramPersistency = "ROOT"
-ntSvc = NTupleSvc()
-appMgr.ExtSvc += [ ntSvc ]
-
-from Configurables import ( LHCbApp, PhysConf, AnalysisConf,
- DstConf, LumiAlgsConf, DDDBConf )
-
-#LHCbApp().DDDBtag = "dddb-20150724"
-#LHCbApp().CondDBtag = "cond-20150805"
-
-# Can be enabled for next full stack release
-PhysConf().OutputLevel = appMgr.OutputLevel
-#AnalysisConf().OutputLevel = appMgr.OutputLevel
-
-datatype = "2012"
-PhysConf().DataType = datatype
-AnalysisConf().DataType = datatype
-LumiAlgsConf().DataType = datatype
-DDDBConf().DataType = datatype
-
-inputType = "DST"
-LumiAlgsConf().InputType = inputType
-PhysConf().InputType = inputType
-
-unPack = ["Reconstruction"]
-PhysConf().EnableUnpack = unPack
-DstConf().EnableUnpack = unPack
-
-lumiSeq = GaudiSequencer("LumiSeq")
-LumiAlgsConf().LumiSequencer = lumiSeq
-
-appMgr.TopAlg += [ PhysConf().initSequence(),
- AnalysisConf().initSequence(),
- sc.sequence(), lumiSeq ]
-
-#from Configurables import DaVinci
-#DaVinci().ProductionType = "Stripping"
-#DaVinci().DataType = datatype
-#DaVinci().DDDBtag = LHCbApp().DDDBtag
-#DaVinci().CondDBtag = LHCbApp().CondDBtag
-#DaVinci().appendToMainSequence( [ sc.sequence() ] )
diff --git a/Phys/StrippingCache/options/DV-Stripping21r1p1-Stripping.py b/Phys/StrippingCache/options/DV-Stripping21r1p1-Stripping.py
deleted file mode 100644
index 3c3d4cace0f80eaa5758d2895489838e17341367..0000000000000000000000000000000000000000
--- a/Phys/StrippingCache/options/DV-Stripping21r1p1-Stripping.py
+++ /dev/null
@@ -1,150 +0,0 @@
-###############################################################################
-# (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. #
-###############################################################################
-"""
-Options for building Stripping21r1p1.
-"""
-
-stripping='stripping21r1p1'
-
-#use CommonParticlesArchive
-from CommonParticlesArchive import CommonParticlesArchiveConf
-CommonParticlesArchiveConf().redirect(stripping)
-
-
-from Gaudi.Configuration import *
-MessageSvc().Format = "% F%30W%S%7W%R%T %0W%M"
-
-# Tighten Trk Chi2 to <3
-from CommonParticles.Utils import DefaultTrackingCuts
-DefaultTrackingCuts().Cuts = { "Chi2Cut" : [ 0, 3 ],
- "CloneDistCut" : [5000, 9e+99 ] }
-
-#
-# Disable the cache in Tr/TrackExtrapolators
-#
-from Configurables import TrackStateProvider
-TrackStateProvider().CacheStatesOnDemand = False
-
-#
-# Fix for TrackEff lines
-#
-from Configurables import DecodeRawEvent
-DecodeRawEvent().setProp("OverrideInputs",4.2)
-
-#
-# Build the streams and stripping object
-#
-from StrippingConf.Configuration import StrippingConf, StrippingStream
-from StrippingSettings.Utils import strippingConfiguration
-from StrippingArchive.Utils import buildStreams
-from StrippingArchive import strippingArchive
-
-#get the configuration dictionary from the database
-config = strippingConfiguration(stripping)
-#get the line builders from the archive
-archive = strippingArchive(stripping)
-
-streams = buildStreams(stripping = config, archive = archive)
-
-leptonicMicroDSTname = 'Leptonic'
-charmMicroDSTname = 'Charm'
-pidMicroDSTname = 'PID'
-bhadronMicroDSTname = 'Bhadron'
-mdstStreams = [ leptonicMicroDSTname,charmMicroDSTname,pidMicroDSTname,bhadronMicroDSTname ]
-dstStreams = [ "BhadronCompleteEvent", "CharmCompleteEvent", "CharmToBeSwum", "Dimuon",
- "EW", "Semileptonic", "Calibration", "MiniBias", "Radiative" ]
-
-stripTESPrefix = 'Strip'
-
-from Configurables import ProcStatusCheck
-
-from PhysConf.Filters import LoKi_Filters
-flts = LoKi_Filters(VOID_Code = "( TrSource(TrSOURCE('/Event/Rec/Track/Best', TrLONG))"\
- " >> ( sum( TrPT,TrP < 1 * TeV ) > 1 * TeV ) )" ,
- VOID_Preambulo = ["from LoKiTracks.decorators import *" ,
- "from LoKiCore.functions import * ",
- "from GaudiKernel.SystemOfUnits import *"])
-filterBadEvents = GaudiSequencer("BadEventFilter",
- ModeOR = True,
- Members = [ flts.sequencer("GECFilter"),
- ProcStatusCheck() ] )
-streamFilter = { 'default' : filterBadEvents,
- 'MiniBias' : ProcStatusCheck() }
-
-# Fix for removal of default constructor for AALLSAMEBPV after DV v41r3.
-from Gaudi.Configuration import allConfigurables
-for conf in allConfigurables.values() :
- if hasattr(conf, 'CombinationCut') and 'AALLSAMEBPV' in conf.CombinationCut :
- conf.CombinationCut = conf.CombinationCut.replace('AALLSAMEBPV', 'AALLSAMEBPV(-1, -1, -1)')
-
-sc = StrippingConf( Streams = streams,
- MaxCandidates = 2000,
- AcceptBadEvents = False,
- BadEventSelection = ProcStatusCheck(),
- TESPrefix = stripTESPrefix,
- ActiveMDSTStream = True,
- Verbose = True,
- DSTStreams = dstStreams,
- MicroDSTStreams = mdstStreams )
-
-from Configurables import ApplicationMgr, AuditorSvc, SequencerTimerTool
-
-# Initial IOV time
-# http://www.onlineconversion.com/unix_time.htm
-# values in ns (so multiply values from above link by 1e9)
-#from Configurables import EventClockSvc
-#EventClockSvc().EventTimeDecoder = "OdinTimeDecoder"
-
-appMgr = ApplicationMgr()
-appMgr.OutputLevel = 6
-appMgr.ExtSvc += [ 'ToolSvc', 'AuditorSvc' ]
-
-appMgr.HistogramPersistency = "ROOT"
-ntSvc = NTupleSvc()
-appMgr.ExtSvc += [ ntSvc ]
-
-from Configurables import ( LHCbApp, PhysConf, AnalysisConf,
- DstConf, LumiAlgsConf, DDDBConf )
-
-#LHCbApp().DDDBtag = "dddb-20150724"
-#LHCbApp().CondDBtag = "cond-20150805"
-
-# Can be enabled for next full stack release
-PhysConf().OutputLevel = appMgr.OutputLevel
-#AnalysisConf().OutputLevel = appMgr.OutputLevel
-
-datatype = "2011"
-PhysConf().DataType = datatype
-AnalysisConf().DataType = datatype
-LumiAlgsConf().DataType = datatype
-DDDBConf().DataType = datatype
-
-inputType = "DST"
-LumiAlgsConf().InputType = inputType
-PhysConf().InputType = inputType
-
-unPack = ["Reconstruction"]
-PhysConf().EnableUnpack = unPack
-DstConf().EnableUnpack = unPack
-
-lumiSeq = GaudiSequencer("LumiSeq")
-LumiAlgsConf().LumiSequencer = lumiSeq
-
-appMgr.TopAlg += [ PhysConf().initSequence(),
- AnalysisConf().initSequence(),
- sc.sequence(), lumiSeq ]
-
-#from Configurables import DaVinci
-#DaVinci().ProductionType = "Stripping"
-#DaVinci().DataType = datatype
-#DaVinci().DDDBtag = LHCbApp().DDDBtag
-#DaVinci().CondDBtag = LHCbApp().CondDBtag
-#DaVinci().appendToMainSequence( [ sc.sequence() ] )
diff --git a/Phys/StrippingCache/options/DV-Stripping22-Stripping.py b/Phys/StrippingCache/options/DV-Stripping22-Stripping.py
deleted file mode 100644
index 9c7034971febe01d707d34390ba02696a8ce14df..0000000000000000000000000000000000000000
--- a/Phys/StrippingCache/options/DV-Stripping22-Stripping.py
+++ /dev/null
@@ -1,114 +0,0 @@
-###############################################################################
-# (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. #
-###############################################################################
-"""
-Options for building Stripping22.
-"""
-
-stripping='stripping22'
-
-#use CommonParticlesArchive
-from CommonParticlesArchive import CommonParticlesArchiveConf
-CommonParticlesArchiveConf().redirect(stripping)
-
-
-from Gaudi.Configuration import *
-MessageSvc().Format = "% F%30W%S%7W%R%T %0W%M"
-
-# Tighten Trk Chi2 to <3
-from CommonParticles.Utils import DefaultTrackingCuts
-DefaultTrackingCuts().Cuts = { "Chi2Cut" : [ 0, 3 ],
- "CloneDistCut" : [5000, 9e+99 ] }
-
-#
-#Fix for TrackEff lines
-#
-from Configurables import DecodeRawEvent
-DecodeRawEvent().setProp("OverrideInputs",4.1)
-
-#
-# Build the streams and stripping object
-#
-from StrippingConf.Configuration import StrippingConf, StrippingStream
-from StrippingSettings.Utils import strippingConfiguration
-from StrippingArchive.Utils import buildStream
-from StrippingArchive import strippingArchive
-
-#get the configuration dictionary from the database
-config = strippingConfiguration(stripping)
-#get the line builders from the archive
-archive = strippingArchive(stripping)
-
-stream = buildStream(stripping = config, streamName='ALL', archive = archive)
-
-stream.lines=[l for l in stream.lines if (("TrackEffDown" not in l.name()))] #fix for Z02mumu bug
-
-for l in stream.lines:
- if l.RequiredRawEvents and l._prescale==0:
- l.RequiredRawEvents=None
-
-from Configurables import ProcStatusCheck
-filterBadEvents = ProcStatusCheck()
-
-sc = StrippingConf( Streams = [stream],
- MaxCandidates = 2000,
- AcceptBadEvents = False,
- BadEventSelection = filterBadEvents,
- TESPrefix = 'Strip' )
-
-## Configure PV refitter
-from Configurables import LoKi__PVReFitter
-LoKi__PVReFitter("ToolSvc.LoKi::PVReFitter").CheckTracksByLHCbIDs = True
-
-appMgr = ApplicationMgr()
-appMgr.OutputLevel = 6
-appMgr.ExtSvc += [ 'ToolSvc', 'AuditorSvc' ]
-
-appMgr.HistogramPersistency = "ROOT"
-ntSvc = NTupleSvc()
-appMgr.ExtSvc += [ ntSvc ]
-
-from Configurables import ( LHCbApp, PhysConf, AnalysisConf,
- DstConf, LumiAlgsConf, DDDBConf )
-
-#LHCbApp().DDDBtag = "dddb-20150724"
-#LHCbApp().CondDBtag = "cond-20150805"
-
-# Can be enabled for next full stack release
-PhysConf().OutputLevel = appMgr.OutputLevel
-#AnalysisConf().OutputLevel = appMgr.OutputLevel
-
-datatype = "2015"
-PhysConf().DataType = datatype
-AnalysisConf().DataType = datatype
-LumiAlgsConf().DataType = datatype
-DDDBConf().DataType = datatype
-
-inputType = "DST"
-LumiAlgsConf().InputType = inputType
-PhysConf().InputType = inputType
-
-unPack = ["Reconstruction"]
-PhysConf().EnableUnpack = unPack
-DstConf().EnableUnpack = unPack
-
-lumiSeq = GaudiSequencer("LumiSeq")
-LumiAlgsConf().LumiSequencer = lumiSeq
-
-appMgr.TopAlg += [ PhysConf().initSequence(),
- AnalysisConf().initSequence(),
- sc.sequence(), lumiSeq ]
-
-#from Configurables import DaVinci
-#DaVinci().ProductionType = "Stripping"
-#DaVinci().DataType = datatype
-#DaVinci().DDDBtag = LHCbApp().DDDBtag
-#DaVinci().CondDBtag = LHCbApp().CondDBtag
-#DaVinci().appendToMainSequence( [ sc.sequence() ] )
diff --git a/Phys/StrippingCache/options/DV-Stripping24-Stripping.py b/Phys/StrippingCache/options/DV-Stripping24-Stripping.py
deleted file mode 100644
index 3032c616e67c8c5207a1cc10c70e67a468228942..0000000000000000000000000000000000000000
--- a/Phys/StrippingCache/options/DV-Stripping24-Stripping.py
+++ /dev/null
@@ -1,132 +0,0 @@
-###############################################################################
-# (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. #
-###############################################################################
-"""
-Options for building Stripping24.
-"""
-
-stripping='stripping24'
-
-#use CommonParticlesArchive
-from CommonParticlesArchive import CommonParticlesArchiveConf
-CommonParticlesArchiveConf().redirect(stripping)
-
-
-from Gaudi.Configuration import *
-MessageSvc().Format = "% F%30W%S%7W%R%T %0W%M"
-
-#
-# Disable the cache in Tr/TrackExtrapolators
-#
-from Configurables import TrackStateProvider
-TrackStateProvider().CacheStatesOnDemand = False
-
-#
-# Fix for TrackEff lines
-#
-from Configurables import DecodeRawEvent
-DecodeRawEvent().setProp("OverrideInputs",4.2)
-
-#
-# Build the streams and stripping object
-#
-from StrippingConf.Configuration import StrippingConf, StrippingStream
-from StrippingSettings.Utils import strippingConfiguration
-from StrippingArchive.Utils import buildStreams
-from StrippingArchive import strippingArchive
-
-#get the configuration dictionary from the database
-config = strippingConfiguration(stripping)
-#get the line builders from the archive
-archive = strippingArchive(stripping)
-
-streams = buildStreams(stripping = config, archive = archive)
-
-leptonicMicroDSTname = 'Leptonic'
-charmMicroDSTname = 'Charm'
-pidMicroDSTname = 'PID'
-bhadronMicroDSTname = 'Bhadron'
-mdstStreams = [ leptonicMicroDSTname,charmMicroDSTname,pidMicroDSTname,bhadronMicroDSTname ]
-dstStreams = [ "BhadronCompleteEvent", "CharmCompleteEvent", "Dimuon",
- "EW", "Semileptonic", "Calibration", "MiniBias", "Radiative" ]
-
-stripTESPrefix = 'Strip'
-
-from Configurables import ProcStatusCheck
-
-# Fix for removal of default constructor for AALLSAMEBPV after DV v41r3.
-from Gaudi.Configuration import allConfigurables
-for conf in allConfigurables.values() :
- if hasattr(conf, 'CombinationCut') and 'AALLSAMEBPV' in conf.CombinationCut :
- conf.CombinationCut = conf.CombinationCut.replace('AALLSAMEBPV', 'AALLSAMEBPV(-1, -1, -1)')
-
-sc = StrippingConf( Streams = streams,
- MaxCandidates = 2000,
- AcceptBadEvents = False,
- BadEventSelection = ProcStatusCheck(),
- TESPrefix = stripTESPrefix,
- ActiveMDSTStream = True,
- Verbose = True,
- DSTStreams = dstStreams,
- MicroDSTStreams = mdstStreams )
-
-from Configurables import ApplicationMgr, AuditorSvc, SequencerTimerTool
-
-# Initial IOV time
-# http://www.onlineconversion.com/unix_time.htm
-# values in ns (so multiply values from above link by 1e9)
-#from Configurables import EventClockSvc
-#EventClockSvc().EventTimeDecoder = "OdinTimeDecoder"
-
-appMgr = ApplicationMgr()
-appMgr.OutputLevel = 6
-appMgr.ExtSvc += [ 'ToolSvc', 'AuditorSvc' ]
-
-appMgr.HistogramPersistency = "ROOT"
-ntSvc = NTupleSvc()
-appMgr.ExtSvc += [ ntSvc ]
-
-from Configurables import ( LHCbApp, PhysConf, AnalysisConf,
- DstConf, LumiAlgsConf, DDDBConf )
-
-#LHCbApp().DDDBtag = "dddb-20150724"
-#LHCbApp().CondDBtag = "cond-20150805"
-
-# Can be enabled for next full stack release
-PhysConf().OutputLevel = appMgr.OutputLevel
-#AnalysisConf().OutputLevel = appMgr.OutputLevel
-
-datatype = "2015"
-PhysConf().DataType = datatype
-AnalysisConf().DataType = datatype
-LumiAlgsConf().DataType = datatype
-DDDBConf().DataType = datatype
-
-inputType = "RDST"
-LumiAlgsConf().InputType = inputType
-PhysConf().InputType = inputType
-
-unPack = ["Reconstruction"]
-PhysConf().EnableUnpack = unPack
-DstConf().EnableUnpack = unPack
-
-lumiSeq = GaudiSequencer("LumiSeq")
-LumiAlgsConf().LumiSequencer = lumiSeq
-
-appMgr.TopAlg += [ PhysConf().initSequence(),
- AnalysisConf().initSequence(),
- sc.sequence(), lumiSeq ]
-
-#from Configurables import DaVinci
-#DaVinci().ProductionType = "Stripping"
-#DaVinci().DataType = datatype
-#DaVinci().DDDBtag = LHCbApp().DDDBtag
-#DaVinci().CondDBtag = LHCbApp().CondDBtag
-#DaVinci().appendToMainSequence( [ sc.sequence() ] )
diff --git a/Phys/StrippingCache/options/DV-Stripping25-Stripping.py b/Phys/StrippingCache/options/DV-Stripping25-Stripping.py
deleted file mode 100644
index 10eb9fd10cb43451e07b8e31f2218d5434bb0e66..0000000000000000000000000000000000000000
--- a/Phys/StrippingCache/options/DV-Stripping25-Stripping.py
+++ /dev/null
@@ -1,98 +0,0 @@
-###############################################################################
-# (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. #
-###############################################################################
-"""
-Options for building Stripping25.
-"""
-
-stripping='stripping25'
-
-#use CommonParticlesArchive
-from CommonParticlesArchive import CommonParticlesArchiveConf
-CommonParticlesArchiveConf().redirect(stripping)
-
-
-from Gaudi.Configuration import *
-MessageSvc().Format = "% F%30W%S%7W%R%T %0W%M"
-
-#
-#Fix for TrackEff lines
-#
-from Configurables import DecodeRawEvent
-DecodeRawEvent().setProp("OverrideInputs",4.2)
-
-#
-# Build the streams and stripping object
-#
-from StrippingConf.Configuration import StrippingConf, StrippingStream
-from StrippingSettings.Utils import strippingConfiguration
-from StrippingArchive.Utils import buildStreams
-from StrippingArchive import strippingArchive
-
-#get the configuration dictionary from the database
-config = strippingConfiguration(stripping)
-#get the line builders from the archive
-archive = strippingArchive(stripping)
-
-streams = buildStreams(stripping = config, archive = archive)
-
-from Configurables import ProcStatusCheck
-filterBadEvents = ProcStatusCheck()
-
-sc = StrippingConf( Streams = streams,
- MaxCandidates = 2000,
- AcceptBadEvents = False,
- BadEventSelection = filterBadEvents,
- TESPrefix = 'Strip' )
-appMgr = ApplicationMgr()
-appMgr.OutputLevel = 6
-appMgr.ExtSvc += [ 'ToolSvc', 'AuditorSvc' ]
-
-appMgr.HistogramPersistency = "ROOT"
-ntSvc = NTupleSvc()
-appMgr.ExtSvc += [ ntSvc ]
-
-from Configurables import ( LHCbApp, PhysConf, AnalysisConf,
- DstConf, LumiAlgsConf, DDDBConf )
-
-#LHCbApp().DDDBtag = "dddb-20150724"
-#LHCbApp().CondDBtag = "cond-20150805"
-
-# Can be enabled for next full stack release
-PhysConf().OutputLevel = appMgr.OutputLevel
-#AnalysisConf().OutputLevel = appMgr.OutputLevel
-
-datatype = "2015"
-PhysConf().DataType = datatype
-AnalysisConf().DataType = datatype
-LumiAlgsConf().DataType = datatype
-DDDBConf().DataType = datatype
-
-inputType = "RDST"
-LumiAlgsConf().InputType = inputType
-PhysConf().InputType = inputType
-
-unPack = ["Reconstruction"]
-PhysConf().EnableUnpack = unPack
-DstConf().EnableUnpack = unPack
-
-lumiSeq = GaudiSequencer("LumiSeq")
-LumiAlgsConf().LumiSequencer = lumiSeq
-
-appMgr.TopAlg += [ PhysConf().initSequence(),
- AnalysisConf().initSequence(),
- sc.sequence(), lumiSeq ]
-
-#from Configurables import DaVinci
-#DaVinci().ProductionType = "Stripping"
-#DaVinci().DataType = datatype
-#DaVinci().DDDBtag = LHCbApp().DDDBtag
-#DaVinci().CondDBtag = LHCbApp().CondDBtag
-#DaVinci().appendToMainSequence( [ sc.sequence() ] )
diff --git a/Phys/StrippingCache/options/DV-Stripping26-Stripping.py b/Phys/StrippingCache/options/DV-Stripping26-Stripping.py
deleted file mode 100644
index c67d3c92ee0eec87a5435a5d4bd7abc0d7f1dc4f..0000000000000000000000000000000000000000
--- a/Phys/StrippingCache/options/DV-Stripping26-Stripping.py
+++ /dev/null
@@ -1,132 +0,0 @@
-###############################################################################
-# (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. #
-###############################################################################
-"""
-Options for building Stripping26.
-"""
-
-stripping='stripping26'
-
-#use CommonParticlesArchive
-from CommonParticlesArchive import CommonParticlesArchiveConf
-CommonParticlesArchiveConf().redirect(stripping)
-
-
-from Gaudi.Configuration import *
-MessageSvc().Format = "% F%30W%S%7W%R%T %0W%M"
-
-#
-# Disable the cache in Tr/TrackExtrapolators
-#
-from Configurables import TrackStateProvider
-TrackStateProvider().CacheStatesOnDemand = False
-
-#
-# Fix for TrackEff lines
-#
-from Configurables import DecodeRawEvent
-DecodeRawEvent().setProp("OverrideInputs",4.2)
-
-#
-# Build the streams and stripping object
-#
-from StrippingConf.Configuration import StrippingConf, StrippingStream
-from StrippingSettings.Utils import strippingConfiguration
-from StrippingArchive.Utils import buildStreams
-from StrippingArchive import strippingArchive
-
-#get the configuration dictionary from the database
-config = strippingConfiguration(stripping)
-#get the line builders from the archive
-archive = strippingArchive(stripping)
-
-streams = buildStreams(stripping = config, archive = archive)
-
-leptonicMicroDSTname = 'Leptonic'
-charmMicroDSTname = 'Charm'
-pidMicroDSTname = 'PID'
-bhadronMicroDSTname = 'Bhadron'
-mdstStreams = [ leptonicMicroDSTname,charmMicroDSTname,pidMicroDSTname,bhadronMicroDSTname ]
-dstStreams = [ "BhadronCompleteEvent", "CharmCompleteEvent", "Dimuon",
- "EW", "Semileptonic", "Calibration", "MiniBias", "Radiative" ]
-
-stripTESPrefix = 'Strip'
-
-from Configurables import ProcStatusCheck
-
-# Fix for removal of default constructor for AALLSAMEBPV after DV v41r3.
-from Gaudi.Configuration import allConfigurables
-for conf in allConfigurables.values() :
- if hasattr(conf, 'CombinationCut') and 'AALLSAMEBPV' in conf.CombinationCut :
- conf.CombinationCut = conf.CombinationCut.replace('AALLSAMEBPV', 'AALLSAMEBPV(-1, -1, -1)')
-
-sc = StrippingConf( Streams = streams,
- MaxCandidates = 2000,
- AcceptBadEvents = False,
- BadEventSelection = ProcStatusCheck(),
- TESPrefix = stripTESPrefix,
- ActiveMDSTStream = True,
- Verbose = True,
- DSTStreams = dstStreams,
- MicroDSTStreams = mdstStreams )
-
-from Configurables import ApplicationMgr, AuditorSvc, SequencerTimerTool
-
-# Initial IOV time
-# http://www.onlineconversion.com/unix_time.htm
-# values in ns (so multiply values from above link by 1e9)
-#from Configurables import EventClockSvc
-#EventClockSvc().EventTimeDecoder = "OdinTimeDecoder"
-
-appMgr = ApplicationMgr()
-appMgr.OutputLevel = 6
-appMgr.ExtSvc += [ 'ToolSvc', 'AuditorSvc' ]
-
-appMgr.HistogramPersistency = "ROOT"
-ntSvc = NTupleSvc()
-appMgr.ExtSvc += [ ntSvc ]
-
-from Configurables import ( LHCbApp, PhysConf, AnalysisConf,
- DstConf, LumiAlgsConf, DDDBConf )
-
-#LHCbApp().DDDBtag = "dddb-20150724"
-#LHCbApp().CondDBtag = "cond-20150805"
-
-# Can be enabled for next full stack release
-PhysConf().OutputLevel = appMgr.OutputLevel
-#AnalysisConf().OutputLevel = appMgr.OutputLevel
-
-datatype = "2015"
-PhysConf().DataType = datatype
-AnalysisConf().DataType = datatype
-LumiAlgsConf().DataType = datatype
-DDDBConf().DataType = datatype
-
-inputType = "RDST"
-LumiAlgsConf().InputType = inputType
-PhysConf().InputType = inputType
-
-unPack = ["Reconstruction"]
-PhysConf().EnableUnpack = unPack
-DstConf().EnableUnpack = unPack
-
-lumiSeq = GaudiSequencer("LumiSeq")
-LumiAlgsConf().LumiSequencer = lumiSeq
-
-appMgr.TopAlg += [ PhysConf().initSequence(),
- AnalysisConf().initSequence(),
- sc.sequence(), lumiSeq ]
-
-#from Configurables import DaVinci
-#DaVinci().ProductionType = "Stripping"
-#DaVinci().DataType = datatype
-#DaVinci().DDDBtag = LHCbApp().DDDBtag
-#DaVinci().CondDBtag = LHCbApp().CondDBtag
-#DaVinci().appendToMainSequence( [ sc.sequence() ] )
diff --git a/Phys/StrippingCache/options/DV-Stripping27-Stripping.py b/Phys/StrippingCache/options/DV-Stripping27-Stripping.py
deleted file mode 100644
index 83ecf9879c6f8a829a1f0c9e11c87435e1840545..0000000000000000000000000000000000000000
--- a/Phys/StrippingCache/options/DV-Stripping27-Stripping.py
+++ /dev/null
@@ -1,136 +0,0 @@
-###############################################################################
-# (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. #
-###############################################################################
-"""
-Options for building Stripping27.
-"""
-
-stripping='stripping27'
-
-#use CommonParticlesArchive
-from CommonParticlesArchive import CommonParticlesArchiveConf
-CommonParticlesArchiveConf().redirect(stripping)
-
-
-from Gaudi.Configuration import *
-MessageSvc().Format = "% F%30W%S%7W%R%T %0W%M"
-
-## remove GECs for pA
-from Configurables import TrackSys
-TrackSys().GlobalCuts = { 'Velo':20000, 'IT':999999, 'OT':999999 }
-
-#
-# Disable the cache in Tr/TrackExtrapolators
-#
-from Configurables import TrackStateProvider
-TrackStateProvider().CacheStatesOnDemand = False
-
-#
-# Fix for TrackEff lines
-#
-from Configurables import DecodeRawEvent
-DecodeRawEvent().setProp("OverrideInputs",4.2)
-
-#
-# Build the streams and stripping object
-#
-from StrippingConf.Configuration import StrippingConf, StrippingStream
-from StrippingSettings.Utils import strippingConfiguration
-from StrippingArchive.Utils import buildStreams
-from StrippingArchive import strippingArchive
-
-#get the configuration dictionary from the database
-config = strippingConfiguration(stripping)
-#get the line builders from the archive
-archive = strippingArchive(stripping)
-
-streams = buildStreams(stripping = config, archive = archive)
-
-leptonicMicroDSTname = 'Leptonic'
-charmMicroDSTname = 'Charm'
-pidMicroDSTname = 'PID'
-bhadronMicroDSTname = 'Bhadron'
-mdstStreams = [ leptonicMicroDSTname,charmMicroDSTname,pidMicroDSTname,bhadronMicroDSTname ]
-dstStreams = [ "BhadronCompleteEvent", "CharmCompleteEvent", "Dimuon",
- "EW", "Semileptonic", "Calibration", "MiniBias", "Radiative" ]
-
-stripTESPrefix = 'Strip'
-
-from Configurables import ProcStatusCheck
-
-# Fix for removal of default constructor for AALLSAMEBPV after DV v41r3.
-from Gaudi.Configuration import allConfigurables
-for conf in allConfigurables.values() :
- if hasattr(conf, 'CombinationCut') and 'AALLSAMEBPV' in conf.CombinationCut :
- conf.CombinationCut = conf.CombinationCut.replace('AALLSAMEBPV', 'AALLSAMEBPV(-1, -1, -1)')
-
-sc = StrippingConf( Streams = streams,
- MaxCandidates = 2000,
- AcceptBadEvents = False,
- BadEventSelection = ProcStatusCheck(),
- TESPrefix = stripTESPrefix,
- ActiveMDSTStream = True,
- Verbose = True,
- DSTStreams = dstStreams,
- MicroDSTStreams = mdstStreams )
-
-from Configurables import ApplicationMgr, AuditorSvc, SequencerTimerTool
-
-# Initial IOV time
-# http://www.onlineconversion.com/unix_time.htm
-# values in ns (so multiply values from above link by 1e9)
-#from Configurables import EventClockSvc
-#EventClockSvc().EventTimeDecoder = "OdinTimeDecoder"
-
-appMgr = ApplicationMgr()
-appMgr.OutputLevel = 6
-appMgr.ExtSvc += [ 'ToolSvc', 'AuditorSvc' ]
-
-appMgr.HistogramPersistency = "ROOT"
-ntSvc = NTupleSvc()
-appMgr.ExtSvc += [ ntSvc ]
-
-from Configurables import ( LHCbApp, PhysConf, AnalysisConf,
- DstConf, LumiAlgsConf, DDDBConf )
-
-#LHCbApp().DDDBtag = "dddb-20150724"
-#LHCbApp().CondDBtag = "cond-20150805"
-
-# Can be enabled for next full stack release
-PhysConf().OutputLevel = appMgr.OutputLevel
-#AnalysisConf().OutputLevel = appMgr.OutputLevel
-
-datatype = "2016"
-PhysConf().DataType = datatype
-AnalysisConf().DataType = datatype
-LumiAlgsConf().DataType = datatype
-DDDBConf().DataType = datatype
-
-inputType = "RDST"
-LumiAlgsConf().InputType = inputType
-PhysConf().InputType = inputType
-
-unPack = ["Reconstruction"]
-PhysConf().EnableUnpack = unPack
-DstConf().EnableUnpack = unPack
-
-lumiSeq = GaudiSequencer("LumiSeq")
-LumiAlgsConf().LumiSequencer = lumiSeq
-
-appMgr.TopAlg += [ PhysConf().initSequence(),
- AnalysisConf().initSequence(),
- sc.sequence(), lumiSeq ]
-
-#from Configurables import DaVinci
-#DaVinci().ProductionType = "Stripping"
-#DaVinci().DataType = datatype
-#DaVinci().DDDBtag = LHCbApp().DDDBtag
-#DaVinci().CondDBtag = LHCbApp().CondDBtag
-#DaVinci().appendToMainSequence( [ sc.sequence() ] )
diff --git a/Phys/StrippingCache/options/DV-Stripping28-Stripping.py b/Phys/StrippingCache/options/DV-Stripping28-Stripping.py
deleted file mode 100644
index 43ba19f92088f351212827c48499b2c3f8df65d8..0000000000000000000000000000000000000000
--- a/Phys/StrippingCache/options/DV-Stripping28-Stripping.py
+++ /dev/null
@@ -1,133 +0,0 @@
-###############################################################################
-# (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. #
-###############################################################################
-"""
-Options for building Stripping28.
-"""
-
-stripping='stripping28'
-
-#use CommonParticlesArchive
-from CommonParticlesArchive import CommonParticlesArchiveConf
-CommonParticlesArchiveConf().redirect(stripping)
-
-
-from Gaudi.Configuration import *
-MessageSvc().Format = "% F%30W%S%7W%R%T %0W%M"
-
-#
-# Disable the cache in Tr/TrackExtrapolators
-#
-from Configurables import TrackStateProvider
-TrackStateProvider().CacheStatesOnDemand = False
-
-#
-# Fix for TrackEff lines
-#
-from Configurables import DecodeRawEvent
-DecodeRawEvent().setProp("OverrideInputs",4.2)
-
-#
-# Build the streams and stripping object
-#
-from StrippingConf.Configuration import StrippingConf, StrippingStream
-from StrippingSettings.Utils import strippingConfiguration
-from StrippingArchive.Utils import buildStreams
-from StrippingArchive import strippingArchive
-
-#get the configuration dictionary from the database
-config = strippingConfiguration(stripping)
-#get the line builders from the archive
-archive = strippingArchive(stripping)
-
-streams = buildStreams(stripping = config, archive = archive)
-
-leptonicMicroDSTname = 'Leptonic'
-charmMicroDSTname = 'Charm'
-pidMicroDSTname = 'PID'
-bhadronMicroDSTname = 'Bhadron'
-mdstStreams = [ leptonicMicroDSTname,charmMicroDSTname,pidMicroDSTname,bhadronMicroDSTname ]
-dstStreams = [ "BhadronCompleteEvent", "CharmCompleteEvent", "Dimuon",
- "EW", "Semileptonic", "Calibration", "MiniBias", "Radiative" ]
-
-stripTESPrefix = 'Strip'
-
-from Configurables import ProcStatusCheck
-
-# Fix for removal of default constructor for AALLSAMEBPV after DV v41r3.
-# Thi has been fixed from S28 onwards.
-#from Gaudi.Configuration import allConfigurables
-#for conf in allConfigurables.values() :
-# if hasattr(conf, 'CombinationCut') and 'AALLSAMEBPV' in conf.CombinationCut :
-# conf.CombinationCut = conf.CombinationCut.replace('AALLSAMEBPV', 'AALLSAMEBPV(-1, -1, -1)')
-
-sc = StrippingConf( Streams = streams,
- MaxCandidates = 2000,
- AcceptBadEvents = False,
- BadEventSelection = ProcStatusCheck(),
- TESPrefix = stripTESPrefix,
- ActiveMDSTStream = True,
- Verbose = True,
- DSTStreams = dstStreams,
- MicroDSTStreams = mdstStreams )
-
-from Configurables import ApplicationMgr, AuditorSvc, SequencerTimerTool
-
-# Initial IOV time
-# http://www.onlineconversion.com/unix_time.htm
-# values in ns (so multiply values from above link by 1e9)
-#from Configurables import EventClockSvc
-#EventClockSvc().EventTimeDecoder = "OdinTimeDecoder"
-
-appMgr = ApplicationMgr()
-appMgr.OutputLevel = 6
-appMgr.ExtSvc += [ 'ToolSvc', 'AuditorSvc' ]
-
-appMgr.HistogramPersistency = "ROOT"
-ntSvc = NTupleSvc()
-appMgr.ExtSvc += [ ntSvc ]
-
-from Configurables import ( LHCbApp, PhysConf, AnalysisConf,
- DstConf, LumiAlgsConf, DDDBConf )
-
-#LHCbApp().DDDBtag = "dddb-20150724"
-#LHCbApp().CondDBtag = "cond-20150805"
-
-# Can be enabled for next full stack release
-PhysConf().OutputLevel = appMgr.OutputLevel
-#AnalysisConf().OutputLevel = appMgr.OutputLevel
-
-datatype = "2016"
-PhysConf().DataType = datatype
-AnalysisConf().DataType = datatype
-LumiAlgsConf().DataType = datatype
-DDDBConf().DataType = datatype
-
-inputType = "RDST"
-LumiAlgsConf().InputType = inputType
-PhysConf().InputType = inputType
-
-unPack = ["Reconstruction"]
-PhysConf().EnableUnpack = unPack
-DstConf().EnableUnpack = unPack
-
-lumiSeq = GaudiSequencer("LumiSeq")
-LumiAlgsConf().LumiSequencer = lumiSeq
-
-appMgr.TopAlg += [ PhysConf().initSequence(),
- AnalysisConf().initSequence(),
- sc.sequence(), lumiSeq ]
-
-#from Configurables import DaVinci
-#DaVinci().ProductionType = "Stripping"
-#DaVinci().DataType = datatype
-#DaVinci().DDDBtag = LHCbApp().DDDBtag
-#DaVinci().CondDBtag = LHCbApp().CondDBtag
-#DaVinci().appendToMainSequence( [ sc.sequence() ] )
diff --git a/Phys/StrippingCache/options/DV-Stripping29-Stripping.py b/Phys/StrippingCache/options/DV-Stripping29-Stripping.py
deleted file mode 100644
index f00f4949fd05c87d6721b667ac1f5c9cde0acac5..0000000000000000000000000000000000000000
--- a/Phys/StrippingCache/options/DV-Stripping29-Stripping.py
+++ /dev/null
@@ -1,133 +0,0 @@
-###############################################################################
-# (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. #
-###############################################################################
-"""
-Options for building Stripping28.
-"""
-
-stripping='stripping29'
-
-#use CommonParticlesArchive
-from CommonParticlesArchive import CommonParticlesArchiveConf
-CommonParticlesArchiveConf().redirect(stripping)
-
-
-from Gaudi.Configuration import *
-MessageSvc().Format = "% F%30W%S%7W%R%T %0W%M"
-
-#
-# Disable the cache in Tr/TrackExtrapolators
-#
-from Configurables import TrackStateProvider
-TrackStateProvider().CacheStatesOnDemand = False
-
-#
-# Fix for TrackEff lines
-#
-from Configurables import DecodeRawEvent
-DecodeRawEvent().setProp("OverrideInputs",4.2)
-
-#
-# Build the streams and stripping object
-#
-from StrippingConf.Configuration import StrippingConf, StrippingStream
-from StrippingSettings.Utils import strippingConfiguration
-from StrippingArchive.Utils import buildStreams
-from StrippingArchive import strippingArchive
-
-#get the configuration dictionary from the database
-config = strippingConfiguration(stripping)
-#get the line builders from the archive
-archive = strippingArchive(stripping)
-
-streams = buildStreams(stripping = config, archive = archive)
-
-leptonicMicroDSTname = 'Leptonic'
-charmMicroDSTname = 'Charm'
-pidMicroDSTname = 'PID'
-bhadronMicroDSTname = 'Bhadron'
-mdstStreams = [ leptonicMicroDSTname,charmMicroDSTname,pidMicroDSTname,bhadronMicroDSTname ]
-dstStreams = [ "BhadronCompleteEvent", "CharmCompleteEvent", "Dimuon",
- "EW", "Semileptonic", "Calibration", "MiniBias", "Radiative" ]
-
-stripTESPrefix = 'Strip'
-
-from Configurables import ProcStatusCheck
-
-# Fix for removal of default constructor for AALLSAMEBPV after DV v41r3.
-# Thi has been fixed from S28 onwards.
-#from Gaudi.Configuration import allConfigurables
-#for conf in allConfigurables.values() :
-# if hasattr(conf, 'CombinationCut') and 'AALLSAMEBPV' in conf.CombinationCut :
-# conf.CombinationCut = conf.CombinationCut.replace('AALLSAMEBPV', 'AALLSAMEBPV(-1, -1, -1)')
-
-sc = StrippingConf( Streams = streams,
- MaxCandidates = 2000,
- AcceptBadEvents = False,
- BadEventSelection = ProcStatusCheck(),
- TESPrefix = stripTESPrefix,
- ActiveMDSTStream = True,
- Verbose = True,
- DSTStreams = dstStreams,
- MicroDSTStreams = mdstStreams )
-
-from Configurables import ApplicationMgr, AuditorSvc, SequencerTimerTool
-
-# Initial IOV time
-# http://www.onlineconversion.com/unix_time.htm
-# values in ns (so multiply values from above link by 1e9)
-#from Configurables import EventClockSvc
-#EventClockSvc().EventTimeDecoder = "OdinTimeDecoder"
-
-appMgr = ApplicationMgr()
-appMgr.OutputLevel = 6
-appMgr.ExtSvc += [ 'ToolSvc', 'AuditorSvc' ]
-
-appMgr.HistogramPersistency = "ROOT"
-ntSvc = NTupleSvc()
-appMgr.ExtSvc += [ ntSvc ]
-
-from Configurables import ( LHCbApp, PhysConf, AnalysisConf,
- DstConf, LumiAlgsConf, DDDBConf )
-
-LHCbApp().DDDBtag = "dddb-20150724"
-LHCbApp().CondDBtag = "cond-20170510"
-
-# Can be enabled for next full stack release
-PhysConf().OutputLevel = appMgr.OutputLevel
-#AnalysisConf().OutputLevel = appMgr.OutputLevel
-
-datatype = "2017"
-PhysConf().DataType = datatype
-AnalysisConf().DataType = datatype
-LumiAlgsConf().DataType = datatype
-DDDBConf().DataType = datatype
-
-inputType = "RDST"
-LumiAlgsConf().InputType = inputType
-PhysConf().InputType = inputType
-
-unPack = ["Reconstruction"]
-PhysConf().EnableUnpack = unPack
-DstConf().EnableUnpack = unPack
-
-lumiSeq = GaudiSequencer("LumiSeq")
-LumiAlgsConf().LumiSequencer = lumiSeq
-
-appMgr.TopAlg += [ PhysConf().initSequence(),
- AnalysisConf().initSequence(),
- sc.sequence(), lumiSeq ]
-
-#from Configurables import DaVinci
-#DaVinci().ProductionType = "Stripping"
-#DaVinci().DataType = datatype
-#DaVinci().DDDBtag = LHCbApp().DDDBtag
-#DaVinci().CondDBtag = LHCbApp().CondDBtag
-#DaVinci().appendToMainSequence( [ sc.sequence() ] )
diff --git a/Phys/StrippingCache/options/DV-Stripping29r1-Stripping.py b/Phys/StrippingCache/options/DV-Stripping29r1-Stripping.py
deleted file mode 100644
index ce4850d109c0a0773e46e7b45fa3bb2ec2513927..0000000000000000000000000000000000000000
--- a/Phys/StrippingCache/options/DV-Stripping29r1-Stripping.py
+++ /dev/null
@@ -1,134 +0,0 @@
-###############################################################################
-# (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. #
-###############################################################################
-"""
-Options for building Stripping29r1.
-"""
-
-stripping='stripping29r1'
-
-#use CommonParticlesArchive
-from CommonParticlesArchive import CommonParticlesArchiveConf
-CommonParticlesArchiveConf().redirect(stripping)
-
-
-from Gaudi.Configuration import *
-MessageSvc().Format = "% F%30W%S%7W%R%T %0W%M"
-
-#
-# Disable the cache in Tr/TrackExtrapolators
-#
-from Configurables import TrackStateProvider
-TrackStateProvider().CacheStatesOnDemand = False
-
-#
-# Fix for TrackEff lines
-#
-from Configurables import DecodeRawEvent
-DecodeRawEvent().setProp("OverrideInputs",4.2)
-
-#
-# Build the streams and stripping object
-#
-from StrippingConf.Configuration import StrippingConf, StrippingStream
-from StrippingSettings.Utils import strippingConfiguration
-from StrippingArchive.Utils import buildStreams
-from StrippingArchive import strippingArchive
-
-#get the configuration dictionary from the database
-config = strippingConfiguration(stripping)
-#get the line builders from the archive
-archive = strippingArchive(stripping)
-
-streams = buildStreams(stripping = config, archive = archive)
-
-leptonicMicroDSTname = 'Leptonic'
-charmMicroDSTname = 'Charm'
-pidMicroDSTname = 'PID'
-bhadronMicroDSTname = 'Bhadron'
-mdstStreams = [ leptonicMicroDSTname,charmMicroDSTname,pidMicroDSTname,bhadronMicroDSTname ]
-dstStreams = [ "BhadronCompleteEvent", "CharmCompleteEvent", "Dimuon",
- "EW", "Semileptonic", "Calibration", "MiniBias", "Radiative" ]
-
-stripTESPrefix = 'Strip'
-
-from Configurables import ProcStatusCheck
-
-# Fix for removal of default constructor for AALLSAMEBPV after DV v41r3.
-# Thi has been fixed from S28 onwards.
-#from Gaudi.Configuration import allConfigurables
-#for conf in allConfigurables.values() :
-# if hasattr(conf, 'CombinationCut') and 'AALLSAMEBPV' in conf.CombinationCut :
-# conf.CombinationCut = conf.CombinationCut.replace('AALLSAMEBPV', 'AALLSAMEBPV(-1, -1, -1)')
-
-sc = StrippingConf( Streams = streams,
- MaxCandidates = 2000,
- MaxCombinations = 10000000,
- AcceptBadEvents = False,
- BadEventSelection = ProcStatusCheck(),
- TESPrefix = stripTESPrefix,
- ActiveMDSTStream = True,
- Verbose = True,
- DSTStreams = dstStreams,
- MicroDSTStreams = mdstStreams )
-
-from Configurables import ApplicationMgr, AuditorSvc, SequencerTimerTool
-
-# Initial IOV time
-# http://www.onlineconversion.com/unix_time.htm
-# values in ns (so multiply values from above link by 1e9)
-#from Configurables import EventClockSvc
-#EventClockSvc().EventTimeDecoder = "OdinTimeDecoder"
-
-appMgr = ApplicationMgr()
-appMgr.OutputLevel = 6
-appMgr.ExtSvc += [ 'ToolSvc', 'AuditorSvc' ]
-
-appMgr.HistogramPersistency = "ROOT"
-ntSvc = NTupleSvc()
-appMgr.ExtSvc += [ ntSvc ]
-
-from Configurables import ( LHCbApp, PhysConf, AnalysisConf,
- DstConf, LumiAlgsConf, DDDBConf )
-
-LHCbApp().DDDBtag = "dddb-20150724"
-LHCbApp().CondDBtag = "cond-20170510"
-
-# Can be enabled for next full stack release
-PhysConf().OutputLevel = appMgr.OutputLevel
-#AnalysisConf().OutputLevel = appMgr.OutputLevel
-
-datatype = "2017"
-PhysConf().DataType = datatype
-AnalysisConf().DataType = datatype
-LumiAlgsConf().DataType = datatype
-DDDBConf().DataType = datatype
-
-inputType = "RDST"
-LumiAlgsConf().InputType = inputType
-PhysConf().InputType = inputType
-
-unPack = ["Reconstruction"]
-PhysConf().EnableUnpack = unPack
-DstConf().EnableUnpack = unPack
-
-lumiSeq = GaudiSequencer("LumiSeq")
-LumiAlgsConf().LumiSequencer = lumiSeq
-
-appMgr.TopAlg += [ PhysConf().initSequence(),
- AnalysisConf().initSequence(),
- sc.sequence(), lumiSeq ]
-
-#from Configurables import DaVinci
-#DaVinci().ProductionType = "Stripping"
-#DaVinci().DataType = datatype
-#DaVinci().DDDBtag = LHCbApp().DDDBtag
-#DaVinci().CondDBtag = LHCbApp().CondDBtag
-#DaVinci().appendToMainSequence( [ sc.sequence() ] )
diff --git a/Phys/StrippingCache/options/DataType-2012.py b/Phys/StrippingCache/options/DataType-2012.py
deleted file mode 100644
index 1171e6349992e4ba3d5a29ff428ed16200ce0dbe..0000000000000000000000000000000000000000
--- a/Phys/StrippingCache/options/DataType-2012.py
+++ /dev/null
@@ -1,34 +0,0 @@
-###############################################################################
-# (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. #
-###############################################################################
-# $Id: DataType.py 184170 2015-02-22 11:45:31Z ibelyaev $
-# Test your line(s) of the stripping
-#
-# NOTE: Please make a copy of this file for your testing, and do NOT change this one!
-#
-
-from Configurables import DaVinci
-
-
-DaVinci().HistogramFile = 'DV_stripping_histos.root'
-DaVinci().EvtMax = 10000
-DaVinci().PrintFreq = 2000
-DaVinci().DataType = "2012"
-DaVinci().InputType = "DST"
-
-# database
-DaVinci().DDDBtag = "dddb-20120831"
-DaVinci().CondDBtag = "cond-20121008"
-
-# input file
-from Gaudi.Configuration import importOptions
-importOptions("$STRIPPINGSELECTIONSROOT/tests/data/Reco14_Run125113.py")
-
-DaVinci().EvtMax = 100
diff --git a/Phys/StrippingCache/options/DisableLoKiCacheFunctors.py b/Phys/StrippingCache/options/DisableLoKiCacheFunctors.py
deleted file mode 100644
index 29dfb9324efe7669c0500155761a439af42dde3d..0000000000000000000000000000000000000000
--- a/Phys/StrippingCache/options/DisableLoKiCacheFunctors.py
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# (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. #
-###############################################################################
-
-from Configurables import ApplicationMgr
-ApplicationMgr().Environment['LOKI_DISABLE_CACHE'] = '1'
diff --git a/Phys/StrippingCache/options/SilenceErrors.py b/Phys/StrippingCache/options/SilenceErrors.py
deleted file mode 100644
index 5ddada99e302adf32bad885519332696eeb808f3..0000000000000000000000000000000000000000
--- a/Phys/StrippingCache/options/SilenceErrors.py
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# (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. #
-###############################################################################
-# -*- coding: utf-8 -*-
-from Gaudi.Configuration import MessageSvc, FATAL
-MessageSvc(OutputLevel=FATAL)
diff --git a/Phys/StrippingCache/options/SuppressLogMessages.py b/Phys/StrippingCache/options/SuppressLogMessages.py
deleted file mode 100644
index 0d16351ef1a0bea60f884fa0023dd046ff9bb320..0000000000000000000000000000000000000000
--- a/Phys/StrippingCache/options/SuppressLogMessages.py
+++ /dev/null
@@ -1,53 +0,0 @@
-###############################################################################
-# (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. #
-###############################################################################
-# -*- coding: utf-8 -*-
-from Gaudi.Configuration import log
-import logging
-import re
-
-IGNORED_MESSAGES = map(re.compile,
- (
- # errors
- r'The default_config of .* (is not a dictionary|has incorrect keys)',
- r'The key .* is not allowed',
- r'Allowed keys are:',
- # warnings
- r'Line .* is declared but not appended to any stream',
- r'uses plain Gaudi configurable',
- r'has non-default configuration',
- r' .*\(default =',
- r'The usage of unique HLT is deprecated',
- r'Requests Flavor Tagging but is not assigned',
- r'has prescale <= 0',
- r'share the same output location',
- r'how to add new bank',
- r'Using default tag.*for partition',
- r'The lines going to MDST.DST are',
- r'No explicit tuning for DataType',
- r'something else configured a decoder already',
- r'REMOVE UT decoding from DataOnDemand',
- r'Applied corrections configured via options for',
- r'requesting factory via old name'
- ))
-
-_orig_log_filter = log.filter
-def old_stripping_filter(record):
- '''
- Hide known warnings and errors in old Stripping configurations.
- '''
- if record.levelno >= logging.WARNING:
- if any(exp.search(record.msg) for exp in IGNORED_MESSAGES):
- return False
- if not record.msg.strip():
- return False # why should anyone want to print an empty warning?
- return _orig_log_filter(record)
-
-log.filter = old_stripping_filter