diff --git a/Phys/DaVinci/options/2009-RealData-Reco07.py b/Phys/DaVinci/options/2009-RealData-Reco07.py
deleted file mode 100644
index fba88ab97f30ece862aecff02b5c7a010cecbe8a..0000000000000000000000000000000000000000
--- a/Phys/DaVinci/options/2009-RealData-Reco07.py
+++ /dev/null
@@ -1,75 +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 Tue Feb 9 15:43:05 2010
-#-- Contains event types :
-#-- 90000000 - 57 files - 381107 events - 11.26 GBytes
-
-from Gaudi.Configuration import *
-
-EventSelector().Input = [
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000008_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000015_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000022_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000024_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000025_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000030_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000037_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000044_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000049_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000050_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000051_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000135_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000137_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000138_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000139_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000140_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000141_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000142_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000146_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000148_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000149_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000151_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000152_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000153_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000154_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000156_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000158_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000159_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000160_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000161_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000162_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000163_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000164_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000165_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000167_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000168_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000170_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000171_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000172_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000173_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000174_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000175_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000176_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000178_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000180_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000181_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000182_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000183_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000185_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000188_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000190_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000191_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000193_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000194_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000195_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000196_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005842/0000/00005842_00000197_1.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'"]
-FileCatalog().Catalogs = [ 'xmlcatalog_file:2009-RealData-Reco07.xml' ]
diff --git a/Phys/DaVinci/options/2009-RealData-Reco07V0.py b/Phys/DaVinci/options/2009-RealData-Reco07V0.py
deleted file mode 100644
index 7c29e18d0c74de3b9256b15b78a8091c917869de..0000000000000000000000000000000000000000
--- a/Phys/DaVinci/options/2009-RealData-Reco07V0.py
+++ /dev/null
@@ -1,24 +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 Tue Feb 9 15:43:54 2010
-#-- Contains event types :
-#-- 90000000 - 6 files - 381107 events - 8.04 GBytes
-
-from Gaudi.Configuration import *
-
-EventSelector().Input = [
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005848/0000/00005848_00000001_1.V0.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005848/0000/00005848_00000002_1.V0.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005848/0000/00005848_00000003_1.V0.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005848/0000/00005848_00000004_1.V0.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005848/0000/00005848_00000005_1.V0.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002//castor/cern.ch/grid/lhcb/data/2009/DST/00005848/0000/00005848_00000006_1.V0.dst?svcClass=lhcbmdst&castorVersion=2' TYP='POOL_ROOTTREE' OPT='READ'"]
-FileCatalog().Catalogs = [ 'xmlcatalog_file:2009-RealData-Reco07V0.xml' ]
diff --git a/Phys/DaVinci/options/DC06_stripped_bbincl_lumi2.py b/Phys/DaVinci/options/DC06_stripped_bbincl_lumi2.py
deleted file mode 100755
index 29348b58f12c33a13eaad30d897cb9e6f215d037..0000000000000000000000000000000000000000
--- a/Phys/DaVinci/options/DC06_stripped_bbincl_lumi2.py
+++ /dev/null
@@ -1,27 +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 Wed Oct 7 14:32:43 2009
-#-- Contains event types :
-#-- 10000000 - 523 files - 938306 events - 585.68 GBytes
-
-from Configurables import DaVinci
-DaVinci().DataType = "DC06"
-DaVinci().Input = [
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/production/DC06/v1r0/00002000/DST/0000/00002000_00000004_2.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/production/DC06/v1r0/00002000/DST/0000/00002000_00000005_2.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/production/DC06/v1r0/00002000/DST/0000/00002000_00000012_2.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/production/DC06/v1r0/00002000/DST/0000/00002000_00000014_2.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/production/DC06/v1r0/00002000/DST/0000/00002000_00000015_2.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/production/DC06/v1r0/00002000/DST/0000/00002000_00000020_2.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/production/DC06/v1r0/00002000/DST/0000/00002000_00000021_2.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/production/DC06/v1r0/00002000/DST/0000/00002000_00000576_2.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/production/DC06/v1r0/00002000/DST/0000/00002000_00000577_2.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/production/DC06/v1r0/00002000/DST/0000/00002000_00000578_2.dst' TYP='POOL_ROOTTREE' OPT='READ'" ]
diff --git a/Phys/DaVinci/options/DaVinci-ANNPID-Recalib.py b/Phys/DaVinci/options/DaVinci-ANNPID-Recalib.py
deleted file mode 100755
index 88cc3755468848aa339f756e8585ca602a13f3e4..0000000000000000000000000000000000000000
--- a/Phys/DaVinci/options/DaVinci-ANNPID-Recalib.py
+++ /dev/null
@@ -1,84 +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 *
-from Configurables import GaudiSequencer
-from Configurables import DaVinci, PhysConf
-########################################################################
-
-DaVinci().EvtMax = 10000
-DaVinci().PrintFreq = 1000
-DaVinci().SkipEvents = 0
-
-from Configurables import DataObjectVersionFilter
-DaVinci().UserAlgorithms += [
- DataObjectVersionFilter( "CheckRecSummary",
- DataObjectLocation = "/Event/Rec/Summary",
- MaxVersion = 999 ),
- DataObjectVersionFilter( "CheckProtos",
- DataObjectLocation = "/Event/Rec/ProtoP/Charged",
- MaxVersion = 999 ),
- DataObjectVersionFilter( "CheckTracks",
- DataObjectLocation = "/Event/Rec/Track/Best",
- MaxVersion = 999 ),
- DataObjectVersionFilter( "CheckRPIDs",
- DataObjectLocation = "/Event/Rec/Rich/PIDs",
- MaxVersion = 999 ),
- DataObjectVersionFilter( "CheckMPIDs",
- DataObjectLocation = "/Event/Rec/Muon/MuonPID",
- MaxVersion = 999 ),
- DataObjectVersionFilter( "CheckuDSTProtos",
- DataObjectLocation = "/Event/Bhadron/Rec/ProtoP/Charged",
- MaxVersion = 999 ),
- ]
-
-#from Configurables import PhysConf
-#PhysConf().AllowPIDRecalib = False
-
-from Configurables import ChargedProtoANNPIDConf
-
-#seq = GaudiSequencer("ANNPID")
-#seq.RootInTES = "/Event/Bhadron"
-#ChargedProtoANNPIDConf().DataType = DaVinci().DataType
-#ChargedProtoANNPIDConf().NetworkVersions["2012"] = "MC12TuneV2"
-#ChargedProtoANNPIDConf().RecoSequencer = seq
-#ChargedProtoANNPIDConf().OutputLevel = 1
-
-#ChargedProtoANNPIDConf().TrackTypes = ["Long"]
-#ChargedProtoANNPIDConf().PIDTypes = ["Ghost"]
-#ChargedProtoANNPIDConf().PIDTypes = ["Electron","Muon","Pion","Kaon","Proton","Ghost"]
-
-#DaVinci().UserAlgorithms += [seq]
-
-#from Configurables import ( ANNGlobalPID__ChargedProtoANNPIDTrainingTuple,
-# ANNGlobalPID__ChargedProtoANNPIDTupleTool )
-#pidtuple = ANNGlobalPID__ChargedProtoANNPIDTrainingTuple("ANNPIDTuple")
-#pidtuple.addTool( ANNGlobalPID__ChargedProtoANNPIDTupleTool, name = "Tuple" )
-#pidtuple.Tuple.NTupleLUN = "ANNPIDTUPLE"
-#DaVinci().UserAlgorithms += [ pidtuple ]
-#NTupleSvc().Output += ["ANNPIDTUPLE DATAFILE='ProtoPIDANN.tuples.root' TYP='ROOT' OPT='NEW'"]
-
-
-from GaudiConf import IOHelper
-
-#DaVinci().DataType = "2012"
-#IOHelper().inputFiles(['PFN:/r02/lhcb/jonesc/data/Collision12/LHCb/mDST/Reco14/Stripping20/BHADRON/MagDown/00020198_00001201_1.bhadron.mdst'])
-#IOHelper().inputFiles(['PFN:/r02/lhcb/jonesc/data/Collision12/LHCb/DST/Reco14/Stripping20/BHADRONCOMPLETEEVENT/MagDown/00020738_00002980_1.bhadroncompleteevent.dst'])
-
-DaVinci().DataType = "2015"
-#IOHelper().inputFiles(['PFN:/r02/lhcb/jonesc/data/Collision15/LHCb/mDST/Reco15a/Stripping24/BHADRON/MagDown/00049592_00058961_1.bhadron.mdst'])
-IOHelper().inputFiles(['PFN:/var/pcjm/r02/lhcb/jonesc/data/Collision15/LHCb/DST/Reco15a/Stripping24/BHADRONCOMPLETEEVENT/MagDown/00049592_00059087_1.bhadroncompleteevent.dst'])
-
-ApplicationMgr().ExtSvc += [ 'AuditorSvc' ]
-from Configurables import AuditorSvc, FPEAuditor
-AuditorSvc().Auditors += [ "FPEAuditor" ]
-#AuditorSvc().Auditors += [ 'MemoryAuditor' ]
diff --git a/Phys/DaVinci/options/DaVinci-Default.py b/Phys/DaVinci/options/DaVinci-Default.py
old mode 100755
new mode 100644
index 3edfa1f557ce0c62b89b46a7be7bab2f355991ef..df0cbceb7820584e3f90cab9863abc29e9542e41
--- a/Phys/DaVinci/options/DaVinci-Default.py
+++ b/Phys/DaVinci/options/DaVinci-Default.py
@@ -19,3 +19,4 @@
from Configurables import DaVinci
##############################################################################
d = DaVinci()
+d.DataType = "Upgrade"
diff --git a/Phys/DaVinci/options/DaVinci-Event-Display.py b/Phys/DaVinci/options/DaVinci-Event-Display.py
deleted file mode 100755
index 8b5ebb0b55d7f09133047be6ae2daefaff775edf..0000000000000000000000000000000000000000
--- a/Phys/DaVinci/options/DaVinci-Event-Display.py
+++ /dev/null
@@ -1,59 +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 *
-from Configurables import DaVinci, PhysConf, GaudiSequencer
-########################################################################
-
-DaVinci().EvtMax = 1000
-DaVinci().PrintFreq = 1
-#DaVinci().SkipEvents = 0
-
-from Configurables import JsonConverter
-
-json = JsonConverter("JsonConvert")
-#json.OutputLevel = 1
-
-# Use the following to only fill the json files for the given particles.
-#json.EventDisplayParticles = "/Event/Phys/StdAllNoPIDsPions/Particles"
-
-json.EventDisplayParticles = "/Event/Phys/StdTightMuons/Particles"
-json.OutputDirectory = "jonesc-events-muons"
-
-#json.EventDisplayParticles = "/Event/Phys/StdTightElectrons/Particles"
-#json.OutputDirectory = "jonesc-events-electrons"
-
-from Configurables import DecodeRawEvent
-DecodeRawEvent().setProp("OverrideInputs",4.2)
-
-DaVinci().UserAlgorithms += [ json ]
-
-from GaudiConf import IOHelper
-
-#DaVinci().DataType = "2012"
-#IOHelper().inputFiles(['PFN:/r02/lhcb/jonesc/data/Collision12/LHCb/mDST/Reco14/Stripping20/BHADRON/MagDown/00020198_00001201_1.bhadron.mdst'])
-#IOHelper().inputFiles(['PFN:/r02/lhcb/jonesc/data/Collision12/LHCb/DST/Reco14/Stripping20/BHADRONCOMPLETEEVENT/MagDown/00020738_00002980_1.bhadroncompleteevent.dst'])
-
-#DaVinci().DataType = "2015"
-#IOHelper().inputFiles(['PFN:/r02/lhcb/jonesc/data/Collision15/LHCb/mDST/Reco15a/Stripping24/BHADRON/MagDown/00049592_00058961_1.bhadron.mdst'])
-#IOHelper().inputFiles(['PFN:/var/pcjm/r02/lhcb/jonesc/data/Collision15/LHCb/DST/Reco15a/Stripping24/BHADRONCOMPLETEEVENT/MagDown/00049592_00059087_1.bhadroncompleteevent.dst'])
-
-#importOptions("$STRIPPINGSELECTIONSROOT/tests/data/Reco15a_Run164668.py")
-
-DaVinci().DDDBtag = "dddb-20140729"
-DaVinci().CondDBtag = "sim-20140730-vc-md100"
-
-DaVinci().DataType = "2015"
-DaVinci().Simulation = True
-IOHelper('ROOT').inputFiles(['PFN:/var/nwork/pclc/jonesc/data/RunII/XDST/Brunel-1000ev.xdst'], clear=True)
-
-FileCatalog().Catalogs = [ 'xmlcatalog_file:out.xml' ]
diff --git a/Phys/DaVinci/options/DaVinci-Example.py b/Phys/DaVinci/options/DaVinci-Example.py
new file mode 100644
index 0000000000000000000000000000000000000000..115f74bb9ace61688b6d64ab915414d9821f58a0
--- /dev/null
+++ b/Phys/DaVinci/options/DaVinci-Example.py
@@ -0,0 +1,139 @@
+###############################################################################
+# (c) Copyright 2000-2020 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. #
+# #
+###############################################################################
+###############################################################################
+ #
+ # Test
+ #
+ # syntax
+ # ./run gaudirun.py DaVinci-Example.py options/DaVinciTestData.py
+ #
+ # @author Unclear
+ #
+##
+from Gaudi.Configuration import *
+from Configurables import DaVinci, FilterDesktop, CombineParticles, OfflineVertexFitter
+from PhysSelPython.Wrappers import AutomaticData, Selection, SelectionSequence, DataOnDemand
+from Configurables import FilterDesktop
+from Configurables import LoKiSvc
+from StandardParticles import StdLooseMuons
+from Configurables import DecayTreeTuple, LoKi__Hybrid__TupleTool, TupleToolTrigger, TupleToolDecay, TupleToolTISTOS, MCDecayTreeTuple, TupleToolMCTruth, TupleToolEventInfo, MCTupleToolHierarchy
+
+from Configurables import TimingAuditor, SequencerTimerTool
+TimingAuditor().addTool(SequencerTimerTool,name="TIMER")
+TimingAuditor().TIMER.NameSize = 60
+
+MessageSvc().Format = "% F%60W%S%7W%R%T %0W%M"
+
+from Configurables import L0Conf
+L0Conf().EnsureKnownTCK=False
+
+from Configurables import CondDB
+CondDB().Upgrade = True
+DaVinci().CondDBtag = "sim-20171127-vc-md100"
+DaVinci().DDDBtag = "dddb-20171126"
+DaVinci().EvtMax=-1
+DaVinci().DataType='Upgrade'
+DaVinci().InputType = 'LDST'
+DaVinci().Simulation = True
+DaVinci().Lumi = False
+DaVinci().TupleFile = 'DVNtuple.root'
+#DaVinci().HistogramFile = 'DVHistos.root'
+
+
+from DecayTreeTuple.Configuration import *
+name="TwoBody"
+
+TwoBodyComb = CombineParticles("TwoBodyComb",
+ #Preambulo=["from LoKiPhysMC.decorators import *","from LoKiPhysMC.functions import mcMatch"],
+ DecayDescriptors = ['J/psi(1S) -> mu+ mu-','[J/psi(1S) -> mu+ mu+]cc'],
+ CombinationCut = "(ADOCACHI2CUT(30, ''))",
+ MotherCut = "(BPVVDCHI2() > 30) & (VFASPF(VCHI2/VDOF) < 10)",
+ DaughtersCuts = {
+ #'mu+': '(MIPCHI2DV(PRIMARY)>9) & (PROBNNmu>0.2) & (PT > 0*GeV) & (TRGHOSTPROB<0.25)',
+ #'mu-': '(MIPCHI2DV(PRIMARY)>9) & (PROBNNmu>0.2) & (PT > 0*GeV) & (TRGHOSTPROB<0.25)'}
+ 'mu+': '(MIPCHI2DV(PRIMARY)>9) & (PT > 0*GeV) & (TRGHOSTPROB<0.25)',
+ 'mu-': '(MIPCHI2DV(PRIMARY)>9) & (PT > 0*GeV) & (TRGHOSTPROB<0.25)'}
+ )
+TwoBodySel = Selection ("TwoBodySel",
+ Algorithm = TwoBodyComb,
+ RequiredSelections = [StdLooseMuons])
+
+TwoBodySeq = SelectionSequence("Seq"+name,
+ TopSelection = TwoBodySel)
+
+
+tuple1 = DecayTreeTuple("TwoBody")
+tuple1.TupleName="TwoBody"
+tuple1.NTupleDir=""
+
+ToolList=[
+'TupleToolMCTruth',
+'TupleToolEventInfo'
+]
+
+tuple1.ToolList = ToolList
+
+tuple1.addBranches({
+ "TwoBody" : "J/psi(1S)",
+ "Track1" : "J/psi(1S) -> ^[mu+]CC [mu-]CC",
+ "Track2" : "J/psi(1S) -> [mu+]CC ^[mu-]CC",
+})
+
+tuple1.TwoBody.addTool(TupleToolEventInfo)
+
+tuple1.addTool(TupleToolMCTruth)
+tuple1.TupleToolMCTruth.OutputLevel = INFO
+tuple1.TupleToolMCTruth.ToolList = [ "MCTupleToolHierarchy" ]
+tuple1.TupleToolMCTruth.addTool(MCTupleToolHierarchy)
+tuple1.TupleToolMCTruth.MCTupleToolHierarchy.OutputLevel = INFO
+tuple1.addTool(TupleToolMCTruth)
+
+LoKi_TwoBody=tuple1.TwoBody.addTupleTool("LoKi::Hybrid::TupleTool/LoKi_TwoBody")
+LoKi_TwoBody.Preambulo.append("from LoKiPhysMC.decorators import *")
+LoKi_TwoBody.Preambulo.append("from LoKiPhysMC.functions import mcMatch")
+
+LoKi_TwoBody.Variables = {
+ 'Mcorr' : "BPVCORRM()",
+ 'M' : "M",
+ 'P' : "P",
+ 'PT' : "PT",
+ 'ETA' : "ETA",
+ 'MINIPCHI2' : "MIPCHI2DV(PRIMARY)",
+ 'DIRA_OWNPV' : "BPVDIRA()",
+ 'FDCHI2_OWNPV' : "BPVVDCHI2()",
+ 'ENDVERTEX_CHI2' : "VFASPF(VCHI2/VDOF)",
+ 'DOCAMAX' : "PFUNA(ADOCAMAX(''))",
+ 'FromSameB' : "switch( mcMatch('([ (Beauty) --> [X+]CC [X-]CC ... ]CC) ') , 1 , 0)",
+}
+
+LoKi_one=tuple1.Track1.addTupleTool("LoKi::Hybrid::TupleTool/LoKi_one")
+LoKi_one.Preambulo.append("from LoKiPhysMC.decorators import *")
+LoKi_one.Preambulo.append("from LoKiPhysMC.functions import mcMatch")
+LoKi_one.Variables = {
+ 'ID' : "ID",
+ 'P' : "P",
+ 'PT' : "PT",
+ 'ETA' : "ETA",
+ 'MINIPCHI2' : "MIPCHI2DV(PRIMARY)",
+ 'TRCHI2DOF' : "TRCHI2DOF",
+ 'TRGHOSTPROB' : "TRGHOSTPROB",
+ 'FromB' : "switch( mcMatch('([ (Beauty) --> X+ ... ]CC) ') , 1 , 0)",
+ }
+
+LoKi_two=tuple1.Track2.addTupleTool("LoKi::Hybrid::TupleTool/LoKi_two")
+LoKi_two.Preambulo=LoKi_one.Preambulo
+LoKi_two.Variables = LoKi_one.Variables
+
+tuple1.Decay = "J/psi(1S) -> ^[mu+]CC ^[mu-]CC"
+tuple1.Inputs = [TwoBodySeq.outputLocation()]
+DaVinci().appendToMainSequence( [TwoBodySeq,tuple1] )
+
diff --git a/Phys/DaVinci/options/DaVinci-Moni-Test.py b/Phys/DaVinci/options/DaVinci-Moni-Test.py
deleted file mode 100755
index 318110f1d7710d7c3c88d931fbe69d1eb4ddd9fe..0000000000000000000000000000000000000000
--- a/Phys/DaVinci/options/DaVinci-Moni-Test.py
+++ /dev/null
@@ -1,32 +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 DaVinci, LHCbApp
-from Gaudi.Configuration import *
-##############################################################################
-
-importOptions("$APPCONFIGOPTS/DaVinci/DVMonitor-RealData.py")
-
-#importOptions("$APPCONFIGOPTS/DaVinci/DataType-2010.py")
-
-importOptions("$APPCONFIGOPTS/DaVinci/DataType-2011.py")
-
-DaVinci().EvtMax = 1000
-
-DaVinci().InputType = 'DST'
-
-DaVinci().PrintFreq = 100
-
-MessageSvc().Format = "% F%30W%S%7W%R%T %0W%M"
-
-LHCbApp().DDDBtag = "head-20110722"
-LHCbApp().CondDBtag = "head-20110722"
diff --git a/Phys/DaVinci/options/DaVinci-PID-Test.py b/Phys/DaVinci/options/DaVinci-PID-Test.py
deleted file mode 100755
index 8e73a0f2dfcaf109241ad3d3d73ad3b914dade18..0000000000000000000000000000000000000000
--- a/Phys/DaVinci/options/DaVinci-PID-Test.py
+++ /dev/null
@@ -1,153 +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: DaVinci.py,v 1.45 2010-03-17 17:18:28 pkoppenb Exp $
-#
-# Options for a typical DaVinci job
-#
-# @author Patrick Koppenburg
-# @date 2008-08-06
-#
-########################################################################
-from Gaudi.Configuration import *
-from Configurables import GaudiSequencer
-from Configurables import DaVinci, PhysConf
-########################################################################
-
-################################################################
-#
-# Standard configuration
-#
-DaVinci().EvtMax = 100000 # Number of events
-DaVinci().PrintFreq = 1000
-DaVinci().SkipEvents = 0 # Events to skip
-DaVinci().DataType = "2012" # Must be given
-DaVinci().Simulation = True
-DaVinci().HistogramFile = "DVHistos.root" # Histogram file
-#DaVinci().HistogramFile = "pid/test12-pid.root" # Histogram file
-DaVinci().TupleFile = "DVNtuples.root" # Ntuple
-#DaVinci().MoniSequence = [ exampleSeq ] # Monitoring
-# DaVinci().MainOptions = "" # None
-########################################################################
-# HLT
-# DaVinci().ReplaceL0BanksWithEmulated = True ## enable if you want to rerun L0
-# DaVinci().Hlt2Requires = 'L0+Hlt1' ## change if you want Hlt2 irrespective of Hlt1
-# DaVinci().Hlt = True ##
-########################################################################
-MessageSvc().Format = "% F%20W%S%7W%R%T %0W%M"
-########################################################################
-#
-# To run : gaudirun.py options/DaVinci.py options/DaVinciTestData.py
-#
-########################################################################
-
-#from Configurables import ChargedProtoANNPIDConf
-#nnpidseq = GaudiSequencer("ANNGPIDSeq")
-#annconf = ChargedProtoANNPIDConf( DataType = DaVinci().DataType )
-#annconf.TrackTypes = ["Long"]
-#annconf.PIDTypes = ["Kaon","Proton"]
-#annconf.RecoSequencer = nnpidseq
-#DaVinci().UserAlgorithms += [nnpidseq]
-
-#from Configurables import GlobalRecoChecks
-#moniSeq = GaudiSequencer("ProtoMoniSeq")
-#GlobalRecoChecks().Sequencer = moniSeq
-#DaVinci().UserAlgorithms += [moniSeq]
-
-from Configurables import ParticleEffPurMoni
-
-from StandardParticles import ( StdLooseANNElectrons, StdLooseElectrons,
- StdTightANNElectrons, StdTightElectrons )
-le = ParticleEffPurMoni('LongElectronPerf')
-le.Inputs = [ "Phys/StdLooseANNElectrons/Particles", "Phys/StdLooseElectrons/Particles",
- "Phys/StdTightANNElectrons/Particles", "Phys/StdTightElectrons/Particles" ]
-DaVinci().UserAlgorithms += [ le ]
-
-from StandardParticles import ( StdLooseMuons,
- StdTightANNMuons, StdTightMuons )
-lmu = ParticleEffPurMoni('LongMuonPerf')
-lmu.Inputs = [ "Phys/StdLooseMuons",
- "Phys/StdTightANNMuons", "Phys/StdTightMuons" ]
-DaVinci().UserAlgorithms += [ lmu ]
-
-from StandardParticles import ( StdLooseANNPions, StdLoosePions,
- StdTightANNPions, StdTightPions )
-lpi = ParticleEffPurMoni('LongPionPerf')
-lpi.Inputs = [ "Phys/StdLooseANNPions", "Phys/StdLoosePions",
- "Phys/StdTightANNPions", "Phys/StdTightPions" ]
-DaVinci().UserAlgorithms += [ lpi ]
-
-from StandardParticles import ( StdLooseANNKaons, StdLooseKaons,
- StdTightANNKaons, StdTightKaons )
-lk = ParticleEffPurMoni('LongKaonPerf')
-lk.Inputs = [ "Phys/StdLooseANNKaons", "Phys/StdLooseKaons",
- "Phys/StdTightANNKaons", "Phys/StdTightKaons" ]
-DaVinci().UserAlgorithms += [ lk ]
-
-from StandardParticles import ( StdLooseANNProtons, StdLooseProtons,
- StdTightANNProtons, StdTightProtons )
-lp = ParticleEffPurMoni('LongProtonPerf')
-lp.Inputs = [ "Phys/StdLooseANNProtons", "Phys/StdLooseProtons",
- "Phys/StdTightANNProtons", "Phys/StdTightProtons" ]
-DaVinci().UserAlgorithms += [ lp ]
-
-from StandardParticles import ( StdLooseANNDownElectrons,
- StdLooseANNDownPions,
- StdLooseANNDownKaons,
- StdLooseANNDownProtons,
- StdTightANNDownElectrons,
- StdTightANNDownMuons,
- StdTightANNDownPions,
- StdTightANNDownKaons,
- StdTightANNDownProtons )
-DaVinci().UserAlgorithms += [
- ParticleEffPurMoni( "DownElectronPerf", Inputs = ["Phys/StdLooseANNDownElectrons",
- "Phys/StdTightANNDownElectrons"] ),
- ParticleEffPurMoni( "DownMuonPerf", Inputs = ["Phys/StdTightANNDownMuons"] ),
- ParticleEffPurMoni( "DownPionPerf", Inputs = ["Phys/StdLooseANNDownPions",
- "Phys/StdTightANNDownPions"] ),
- ParticleEffPurMoni( "DownKaonPerf", Inputs = ["Phys/StdLooseANNDownKaons",
- "Phys/StdTightANNDownKaons"] ),
- ParticleEffPurMoni( "DownProtonPerf", Inputs = ["Phys/StdLooseANNDownProtons",
- "Phys/StdTightANNDownProtons"] )
- ]
-
-from StandardParticles import ( StdLooseANNUpElectrons,
- StdLooseANNUpPions,
- StdLooseANNUpKaons,
- StdLooseANNUpProtons,
- StdTightANNUpElectrons,
- StdTightANNUpMuons,
- StdTightANNUpPions,
- StdTightANNUpKaons,
- StdTightANNUpProtons )
-DaVinci().UserAlgorithms += [
- ParticleEffPurMoni( "UpElectronPerf", Inputs = ["Phys/StdLooseANNUpElectrons",
- "Phys/StdTightANNUpElectrons"] ),
- ParticleEffPurMoni( "UpMuonPerf", Inputs = ["Phys/StdTightANNUpMuons"] ),
- ParticleEffPurMoni( "UpPionPerf", Inputs = ["Phys/StdLooseANNUpPions",
- "Phys/StdTightANNUpPions"] ),
- ParticleEffPurMoni( "UpKaonPerf", Inputs = ["Phys/StdLooseANNUpKaons",
- "Phys/StdTightANNUpKaons"] ),
- ParticleEffPurMoni( "UpProtonPerf", Inputs = ["Phys/StdLooseANNUpProtons",
- "Phys/StdTightANNUpProtons"] )
- ]
-
-
-#importOptions( "$PRCONFIGOPTS/DaVinci/Stripping/Collision12-4TeV-Reco14-Stripping20-BHADRONCOMPLETEEVENT.DST.py" )
-from GaudiConf import IOHelper
-IOHelper().inputFiles( [
- 'PFN:/usera/jonesc/NFS/data/MC/MC12/DST/10000000/00024859_00000040_1.allstreams.dst',
- 'PFN:/usera/jonesc/NFS/data/MC/MC12/DST/10000000/00024859_00000041_1.allstreams.dst',
- 'PFN:/usera/jonesc/NFS/data/MC/MC12/DST/10000000/00024859_00000042_1.allstreams.dst',
- 'PFN:/usera/jonesc/NFS/data/MC/MC12/DST/10000000/00024859_00000043_1.allstreams.dst'
- ] )
diff --git a/Phys/DaVinci/options/DaVinci-Packing-Test.py b/Phys/DaVinci/options/DaVinci-Packing-Test.py
deleted file mode 100755
index ff269b32133dc0a369e257c1882d0edf3e161dbd..0000000000000000000000000000000000000000
--- a/Phys/DaVinci/options/DaVinci-Packing-Test.py
+++ /dev/null
@@ -1,197 +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: DaVinci.py,v 1.45 2010-03-17 17:18:28 pkoppenb Exp $
-#
-# Options for a typical DaVinci job
-#
-# @author Patrick Koppenburg
-# @date 2008-08-06
-#
-########################################################################
-from Gaudi.Configuration import *
-from Configurables import GaudiSequencer
-from Configurables import DaVinci, PhysConf
-########################################################################
-
-################################################################
-#
-# Standard configuration
-#
-DaVinci().EvtMax = 1000 # Number of events
-DaVinci().PrintFreq = 100
-#DaVinci().SkipEvents = 200 # Events to skip
-DaVinci().DataType = "2012" # Must be given
-DaVinci().Simulation = False
-DaVinci().HistogramFile = "packing.root" # Histogram file
-DaVinci().TupleFile = "DVNtuples.root" # Ntuple
-DaVinci().InputType = "MDST"
-
-MessageSvc().Format = "% F%30W%S%7W%R%T %0W%M"
-
-########################################################################
-
-#from Configurables import ConversionDODMapper
-#mapper = ConversionDODMapper( OutputLevel = 3 )
-
-#from Configurables import ParticlesAndVerticesMapper
-#pvmapper = ParticlesAndVerticesMapper( OutputLevel = 3 )
-
-# list of (<dest path regexp>, <source>)
-#mapper.Transformations = [
- #('(.*)/pRec/Track/Best', '$1/Rec/Track/Best'), # packing
- #('(.*)/Rec/Track/Best', '$1/pRec/Track/Best') # unpacking
- #('(.*)/Phys/(.*)/Particles', '$1/pPhys/Particles'), # new Olivier's packing
-# ]
-
-# note: if you want to pack/unpack (convert) everything under /Rec/, you can use:
-#mapper.Transformations = [
- # Packing
- #('(.*)/pRec(.*)', '$1/Rec$2'),
-# ( '(.*)/Rec(.*)', '$1/pRec$2' ),
-# ( '(.*)/Phys(.*)', '$1/pPhys$2' )
- #( '(.*)/Phys/(.*)/Particles', '$1/pPhys/Particles' )
-# ]
-
-# algorithm types from source ClassIDs
-#mapper.Algorithms[1550] = "UnpackTrack"
-#mapper.Algorithms[1552] = "UnpackProtoParticle"
-#mapper.Algorithms[1551] = "UnpackCaloHypo"
-#mapper.Algorithms[1561] = "DataPacking::Unpack<LHCb::RichPIDPacker>"
-#mapper.Algorithms[1571] = "DataPacking::Unpack<LHCb::MuonPIDPacker>"
-#mapper.Algorithms[1553] = "UnpackRecVertex"
-#mapper.Algorithms[1555] = "DataPacking::Unpack<LHCb::WeightsVectorPacker>"
-#mapper.Algorithms[1581] = "UnpackParticlesAndVertices"
-#mapper.Algorithms[1559] = "UnpackDecReport"
-
-#mapper.Algorithms[000000] = "UnpackParticlesAndVertices"
-# ... what are the ClassIDs of PackedTracks and PackedPariclesAndVertices?
-
-# -- This is how we can control the OutputLevel of the algorithms we trigger
-#for a in mapper.Algorithms.values():
-# mapper.AlgorithmsOutputLevels[a] = VERBOSE
-
-## mapper.AlgorithmsOutputLevels["UnpackDecReport"] = 2
-## mapper.AlgorithmsOutputLevels["UnpackTrack"] = 2
-## mapper.AlgorithmsOutputLevels["UnpackParticlesAndVertices"] = 2
-
-# Add the tool to DOD
-#dod = DataOnDemandSvc()
-#dod.NodeMappingTools = [pvmapper,mapper]
-#dod.AlgMappingTools = [pvmapper,mapper]
-#dod.NodeMappingTools = [mapper,pvmapper]
-#dod.AlgMappingTools = [mapper,pvmapper]
-# You may need to add:
-#for path in ["Rec", "Rec/Track", "Phys", ...]:
-# dod.NodeMap[path] = "DataObject"
-
-# Force the instantiation of DOD
-#ApplicationMgr().ExtSvc += dod
-
-# Check normal DoD still works
-#from Configurables import ParticleEffPurMoni
-## from StandardParticles import ( StdLooseANNElectrons, StdLooseElectrons,
-## StdTightANNElectrons, StdTightElectrons )
-## le = ParticleEffPurMoni('ElectronPerf')
-## le.Inputs = [ #"Phys/StdLooseANNElectrons/Particles"
-## "Phys/StdLooseElectrons/Particles"
-## #,"Phys/StdTightANNElectrons/Particles"
-## #,"Phys/StdTightElectrons/Particles"
-## ]
-## DaVinci().UserAlgorithms += [ le ]
-
-from Configurables import DataObjectVersionFilter
-#from Configurables import UnpackParticlesAndVertices
-
-# Test the automatic unpacking of data
-DaVinci().UserAlgorithms += [
-## DataObjectVersionFilter( "CheckTracks",
-## DataObjectLocation = "/Event/Bhadron/Rec/Track/Best",
-## MaxVersion = 999 ),
-## DataObjectVersionFilter( "CheckDecReports",
-## DataObjectLocation = "/Event/Strip/Phys/DecReports",
-## MaxVersion = 999,
-## OutputLevel = 3 ),
-## DataObjectVersionFilter( "CheckVeloClusters",
-## DataObjectLocation = "/Event/Bhadron/Raw/Velo/Clusters",
-## MaxVersion = 999,
-## OutputLevel = 3 ),
- ## DataObjectVersionFilter( "CheckCaloElectrons",
- ## DataObjectLocation = "/Event/Bhadron/Rec/Calo/Electrons",
- ## MaxVersion = 999,
- ## OutputLevel = 3 ),
-## DataObjectVersionFilter( "CheckCaloPhotons",
-## DataObjectLocation = "/Event/Bhadron/Rec/Calo/Photons",
-## MaxVersion = 999,
-## OutputLevel = 2 ),
-## DataObjectVersionFilter( "CheckLiteTTClusters",
-## DataObjectLocation = "/Event/Bhadron/Raw/TT/LiteClusters",
-## MaxVersion = 999,
-## OutputLevel = 2 ),
-## DataObjectVersionFilter( "CheckLiteITClusters",
-## DataObjectLocation = "/Event/Bhadron/Raw/IT/LiteClusters",
-## MaxVersion = 999,
-## OutputLevel = 2 ),
-## DataObjectVersionFilter( "CheckLiteVeloClusters",
-## DataObjectLocation = "/Event/Bhadron/Raw/Velo/LiteClusters",
-## MaxVersion = 999,
-## OutputLevel = 2 ),
- #UnpackParticlesAndVertices("UnpackPsAndVs",
- #OutputLevel = 1,
- # OutputName="/Event/Bhadron/Phys/StdAllNoPIDsKaons/Particles"),
-## DataObjectVersionFilter( "CheckData1",
-## DataObjectLocation = "/Event/Bhadron/Phys/StdAllNoPIDsKaons/Particles",
-## MaxVersion = 999,
-## OutputLevel = 3 ),
-## DataObjectVersionFilter( "CheckData2",
-## DataObjectLocation = "/Event/Bhadron/Rec/Vertex/Primary",
-## MaxVersion = 999,
-## OutputLevel = 3 )
-## DataObjectVersionFilter( "CheckData3",
-## DataObjectLocation = "/Event/Bhadron/Phys/StdAllNoPIDsPions/Particles",
-## MaxVersion = 999,
-## OutputLevel = 2 )
-## DataObjectVersionFilter( "CheckProtos",
-## DataObjectLocation = "/Event/Bhadron/Rec/ProtoP/Charged",
-## MaxVersion = 999,
-## OutputLevel = 2 )
- DataObjectVersionFilter( "CheckRelInfo",
- DataObjectLocation = "/Event/Leptonic/Phys/RareStrangeKPiPiPiDownLine/P2CVPion10_1",
- MaxVersion = 999,
- OutputLevel = 2 )
- ## ParticleEffPurMoni( "CheckData4",
- ## Inputs = ["Phys/StdAllNoPIDsKaons/Particles"],
- ## #OutputLevel = 1,
- ## RootInTES = "/Event/Bhadron"
- ## )
-## DataObjectVersionFilter( "CheckMCPs",
-## DataObjectLocation = "/Event/B2D0hD2KsPiPiDalitz/MC/Particles",
-## MaxVersion = 999,
-## OutputLevel = 2 ),
-## DataObjectVersionFilter( "CheckMCVs",
-## DataObjectLocation = "/Event/B2D0hD2KsPiPiDalitz/MC/Vertices",
-## MaxVersion = 999,
-## OutputLevel = 2 )
- ]
-
-## # Select the one with only one candidate
-## from PhysConf.Filters import LoKi_Filters
-## fltrs = LoKi_Filters( STRIP_Code = "HLT_PASS('StrippingB2D0PiD2KSHHDDBeauty2CharmLineDecision')" \
-## " | HLT_PASS('StrippingB2D0KD2KSHHDDBeauty2CharmLineDecision')")
-## from Configurables import DaVinci
-## DaVinci().EventPreFilters = fltrs.filters ('Filters')
-
-from GaudiConf import IOHelper
-#IOHelper().inputFiles(['PFN:/r02/lhcb/jonesc/data/Collision12/LHCb/mDST/Reco14/Stripping20/BHADRON/MagDown/00020198_00001201_1.bhadron.mdst'])
-IOHelper().inputFiles(['PFN:/usera/jonesc/NFS/data/tmp/00048279_00041826_1.leptonic.mdst'])
-
-#IOHelper().inputFiles(['PFN:root://ccdcacli067.in2p3.fr:1094/pnfs/in2p3.fr/data/lhcb/buffer/lhcb/LHCb/Collision11/FULL.DST/00022719/0001/00022719_00014824_1.full.dst'])
diff --git a/Phys/DaVinci/options/DaVinci-ReadDst.py b/Phys/DaVinci/options/DaVinci-ReadDst.py
deleted file mode 100755
index e6c4dcea1652c0c096d074eb65eab06cabc0974e..0000000000000000000000000000000000000000
--- a/Phys/DaVinci/options/DaVinci-ReadDst.py
+++ /dev/null
@@ -1,51 +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: DaVinci-ReadDst.py,v 1.9 2010-02-19 17:03:59 pkoppenb Exp $
-#
-# Options for a typical DaVinci job creating DSTs
-#
-# @author Patrick Koppenburg
-# @date 2009-02-04
-#
-########################################################################
-from Gaudi.Configuration import *
-from Configurables import DaVinci
-##############################################################################
-#
-# Print the J/psi
-#
-from Configurables import PrintDecayTree, PrintHeader, PrintMCTree
-pJpsi = PrintDecayTree('PrintJpsi')
-pJpsi.Inputs = [ "MyJpsi" ]
-pMC = PrintMCTree()
-pMC.ParticleNames = [ 'J/psi(1S)' ]
-#
-ph = PrintHeader()
-#
-from Configurables import DecayTreeTuple
-tuple = DecayTreeTuple("Tuple")
-tuple.Inputs = [ "MyJpsi" ]
-tuple.ToolList += [ "TupleToolMCBackgroundInfo", "TupleToolMCTruth", "TupleToolKinematic" ]
-tuple.Decay = "J/psi(1S) -> ^mu+ ^mu-"
-
-##############################################################################
-#
-#
-##############################################################################
-
-DaVinci().EvtMax = -1
-DaVinci().PrintFreq = 1
-DaVinci().DataType = "2009"
-DaVinci().Input = [ "DATAFILE='PFN:Jpsi.dst' TYP='POOL_ROOTTREE' OPT='READ'" ]
-DaVinci().UserAlgorithms = [ ph, pJpsi, pMC, tuple ]
-DaVinci().TupleFile = "Tuple.root"
diff --git a/Phys/DaVinci/options/DaVinci-ReadETC.py b/Phys/DaVinci/options/DaVinci-ReadETC.py
deleted file mode 100644
index ddd31b26c007bd72bb26b20936df45f29cb2270e..0000000000000000000000000000000000000000
--- a/Phys/DaVinci/options/DaVinci-ReadETC.py
+++ /dev/null
@@ -1,37 +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: DaVinci-ReadETC.py,v 1.8 2009-06-23 13:06:35 pkoppenb Exp $
-## ============================================================================
-## CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.8 $
-## ============================================================================
-#
-# Example options to read a user-defined ETC
-#
-from Gaudi.Configuration import *
-from Configurables import DaVinci
-####################################################
-importOptions("$STRIPPINGSELECTIONSROOT/options/StrippingBs2JpsiPhi.py") # import selections, but don't run stripping
-from Configurables import StrippingAlg
-selection = StrippingAlg("StrippingBs2JpsiPhiLine")
-####################################################
-
-DaVinci().EvtMax = -1
-DaVinci().PrintFreq = 1
-DaVinci().DataType = "MC09"
-DaVinci().UserAlgorithms = [ selection ]
-
-DaVinci().Input = [
- "COLLECTION='TagCreator/EventTuple' DATAFILE='DVPresel_ETC2.root' TYP='POOL_ROOT' SEL='(StripBs2JpsiPhi>0.5)'" ]
-
-from Configurables import TagCollectionSvc
-ApplicationMgr().ExtSvc += [ TagCollectionSvc("EvtTupleSvc") ]
-
-FileCatalog().Catalogs = [ "xmlcatalog_file:$DAVINCIROOT/options/MC09-Bs2JpsiPhiDst.xml" ]
diff --git a/Phys/DaVinci/options/DaVinci-ReadStripDST.py b/Phys/DaVinci/options/DaVinci-ReadStripDST.py
deleted file mode 100644
index 818277e4b029db2e3481a1e78ee2fcb338e3543e..0000000000000000000000000000000000000000
--- a/Phys/DaVinci/options/DaVinci-ReadStripDST.py
+++ /dev/null
@@ -1,74 +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: DaVinci-ReadStripDST.py,v 1.2 2010-07-16 11:59:02 jpalac Exp $
-#
-# Example for running on a stripping DST.
-# @author Juan Palacios
-# @date 2009-10-13
-#
-#############################################################
-from Gaudi.Configuration import *
-#############################################################
-from Configurables import DaVinci
-import GaudiKernel.SystemOfUnits as Units
-#############################################################
-# import predefined sequences as options file
-importOptions("$STDOPTS/PreloadUnits.opts")
-importOptions("$STDOPTS/LHCbApplication.opts")
-#############################################################
-
-from PhysSelPython.Wrappers import AutomaticData, Selection, SelectionSequence
-
-# Need to know the address, since this is an old-style selection.
-# Treat particles already on the DST as data-on-demand
-JpsiSel = AutomaticData(Location = "/Event/Dimuon/Phys/StrippingJpsiInclusiveCombine")
-
-# Filter the J/Psi
-from Configurables import FilterDesktop
-_jpsiFilter = FilterDesktop('jpsiFilter', Code = 'ALL')
-
-# Add some histograms. See DaVinci tutorial 4.
-from Configurables import LoKi__Hybrid__PlotTool as PlotTool
-
-_jpsiFilter.HistoProduce = True
-_jpsiFilter.addTool( PlotTool("InputPlots") )
-_jpsiFilter.InputPlots.Histos = { "P/1000" : ('momentum',0,150) ,
- "PT/1000" : ('pt_%1%',0,5,750) ,
- "M" : ('mass in MeV_%1%_%2%_%3%',2.8*Units.GeV,3.2*Units.GeV) }
-_jpsiFilter.addTool( PlotTool("OutputPlots") )
-_jpsiFilter.OutputPlots.Histos = { "P/1000" : ('momentum',0,150) ,
- "PT/1000" : ('pt_%1%',0,5,750) ,
- "M" : ('mass in MeV_%1%_%2%_%3%',2.8*Units.GeV,3.2*Units.GeV) }
-#
-
-JpsiFilterSel = Selection(name = 'JpsiFilterSel',
- Algorithm = _jpsiFilter,
- RequiredSelections = [JpsiSel] )
-
-JpsiSeq = SelectionSequence('SeqJpsi',
- TopSelection = JpsiFilterSel)
-seq = JpsiSeq.sequence()
-
-dv=DaVinci()
-dv.PrintFreq = 10
-dv.HistogramFile = "DVHistos_Strip.root"
-dv.EvtMax=-1
-dv.DataType="MC09"
-dv.Simulation=True
-dv.RedoMCLinks=False
-dv.UserAlgorithms = [seq]
-dv.InputType='DST'
-# MC09
-#dv.Input = [" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000001_1.dst' TYP='POOL_ROOTTREE' OPT='READ'"]
-dv.Input = ["DATAFILE='PFN:/castor/cern.ch/user/j/jpalac/StripDST/MC09/DaVinci_v24r3p1/Sel.Jpsi.dst' TYP='POOL_ROOTTREE' OPT='READ'" ]
-
-ApplicationMgr().ExtSvc += [ "NTupleSvc" ]
-ApplicationMgr().HistogramPersistency = "ROOT"
diff --git a/Phys/DaVinci/options/DaVinci-Simplest.py b/Phys/DaVinci/options/DaVinci-Simplest.py
index 2f67464d0a5c1e9ed529e117dc52040eae547907..e37777be8677518850c4a2d3c255deb671c3577f 100644
--- a/Phys/DaVinci/options/DaVinci-Simplest.py
+++ b/Phys/DaVinci/options/DaVinci-Simplest.py
@@ -20,15 +20,8 @@
from Gaudi.Configuration import *
from Configurables import DaVinci
-#take a Reco-14 Stripping-20 file for processing. Example DiMuon stream
-DaVinci().Input = [ "PFN:root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/LHCb/Collision12/DIMUON.DST/00020241/0000/00020241_00000272_1.dimuon.dst"]
-
-
#configure differently depending on which data you use
-DaVinci().DataType="2012"
-DaVinci().DDDBtag="dddb-20120831"
-DaVinci().CondDBtag="cond-20120831"
-
+DaVinci().DataType="Upgrade"
#save an ntuple with the luminosity
DaVinci().Lumi=True
diff --git a/Phys/DaVinci/options/DaVinci-WriteETC-FSR.py b/Phys/DaVinci/options/DaVinci-WriteETC-FSR.py
deleted file mode 100644
index cf71ea6db9d222a955012603c65bfe85af9ce8a1..0000000000000000000000000000000000000000
--- a/Phys/DaVinci/options/DaVinci-WriteETC-FSR.py
+++ /dev/null
@@ -1,54 +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: DaVinci-WriteETC-FSR.py,v 1.1 2010-02-01 12:52:36 panmanj Exp $
-## ============================================================================
-## CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.1 $
-## ============================================================================
-#
-# Example options to create a user-defined ETC
-#
-# @added FSR writing: Jaap Panman
-#
-from Gaudi.Configuration import *
-######################################################
-# StripETC options
-#
-
-from Configurables import EventTuple, TupleToolSelResults
-
-tag = EventTuple("TagCreator")
-tag.EvtColsProduce = True
-tag.ToolList = [ "TupleToolEventInfo", "TupleToolRecoStats", "TupleToolSelResults" ]
-tag.addTool(TupleToolSelResults )
-tag.TupleToolSelResults.Selections = [ "StripBs2JpsiPhi" ]
-
-####################################################
-importOptions( "$STRIPPINGSELECTIONSROOT/options/STEP09/StrippingBs2JpsiPhi.py")
-from Configurables import StrippingAlg
-selection = StrippingAlg("StrippingBs2JpsiPhiLine")
-####################################################
-# main config
-from Configurables import DaVinci
-DaVinci().EvtMax = 10
-DaVinci().PrintFreq = 1
-DaVinci().DataType = "2009"
-DaVinci().UserAlgorithms = [ selection ]
-DaVinci().MoniSequence = [ tag ]
-DaVinci().ETCFile = "DVPresel_ETC_SPAN_DV_FSR.root"
-DaVinci().WriteFSR = True
-
-# input file
-EventSelector().Input = [
- #" DATAFILE='PFN:LumiData_062910_0000000001_fsr.dst' TYP='POOL_ROOTTREE' OPT='READ'"
- " DATAFILE='PFN:nolumi_span_063815_0000000001.dst' TYP='POOL_ROOTTREE' OPT='READ'"
- ]
-FileCatalog().Catalogs = [ "xmlcatalog_file:MyCatalog.xml",
- ]
diff --git a/Phys/DaVinci/options/DaVinci-WriteETC.py b/Phys/DaVinci/options/DaVinci-WriteETC.py
deleted file mode 100644
index 38aab889a712e8923e29862125ddb77efb5cdbd6..0000000000000000000000000000000000000000
--- a/Phys/DaVinci/options/DaVinci-WriteETC.py
+++ /dev/null
@@ -1,44 +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: DaVinci-WriteETC.py,v 1.6 2009-06-23 13:06:35 pkoppenb Exp $
-## ============================================================================
-## CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.6 $
-## ============================================================================
-#
-# Example options to create a user-defined ETC
-#
-from Gaudi.Configuration import *
-######################################################
-# StripETC options
-#
-
-from Configurables import EventTuple, TupleToolSelResults
-
-tag = EventTuple("TagCreator")
-tag.EvtColsProduce = True
-tag.ToolList = [ "TupleToolEventInfo", "TupleToolRecoStats", "TupleToolSelResults" ]
-tag.addTool(TupleToolSelResults )
-tag.TupleToolSelResults.Selections = [ "StripBs2JpsiPhi" ]
-####################################################
-importOptions("$STRIPPINGSELECTIONSROOT/options/StrippingBs2JpsiPhi.py") # import one selection, but don't run whole stripping
-from Configurables import StrippingAlg
-selection = StrippingAlg("StrippingBs2JpsiPhiLine")
-####################################################
-# main config
-from Configurables import DaVinci
-DaVinci().EvtMax = 1000
-DaVinci().PrintFreq = 100
-DaVinci().DataType = "MC09"
-DaVinci().UserAlgorithms = [ selection ]
-DaVinci().MoniSequence = [ tag ]
-DaVinci().ETCFile = "DVPresel_ETC2.root"
-
-importOptions( "$DAVINCIROOT/options/MC09-Bs2JpsiPhiDst.py")
diff --git a/Phys/DaVinci/options/DaVinci-WriteMicroDST.py b/Phys/DaVinci/options/DaVinci-WriteMicroDST.py
deleted file mode 100644
index 950c2d8eb65ca139d87c657e5811c3f45aea7e78..0000000000000000000000000000000000000000
--- a/Phys/DaVinci/options/DaVinci-WriteMicroDST.py
+++ /dev/null
@@ -1,50 +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 *
-from Configurables import DaVinci, MicroDSTWriter
-
-importOptions("$STDOPTS/PreloadUnits.opts")
-
-from MicroDSTExample.Selections import SeqBs2Jpsi2MuMuPhi2KK
-selSequence = SeqBs2Jpsi2MuMuPhi2KK.SeqBs2Jpsi2MuMuPhi2KK
-
-conf = MicroDSTWriter("MicroDST0")
-conf.OutputFileSuffix = "Test"
-conf.CopyProtoParticles = False
-conf.SelectionSequences = [selSequence]
-conf.CopyL0DUReport = False
-conf.CopyHltDecReports = False
-conf.CopyMCTruth = True
-conf.CopyBTags = True
-microDST0Seq = conf.sequence()
-
-#
-
-dv = DaVinci()
-dv.DataType = 'MC09'
-dv.EvtMax = 100
-dv.UserAlgorithms = [microDST0Seq]
-dv.Input = [
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000001_1.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000002_1.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000003_1.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000004_1.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000005_1.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000006_1.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000007_1.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000008_1.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000009_1.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000010_1.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000011_1.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000012_1.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000013_1.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000014_1.dst' TYP='POOL_ROOTTREE' OPT='READ'"
-]
diff --git a/Phys/DaVinci/options/DaVinci-WriteSelDST-FSR.py b/Phys/DaVinci/options/DaVinci-WriteSelDST-FSR.py
deleted file mode 100755
index d64b1b91beb313ccb9168d66ba43009d357de5e1..0000000000000000000000000000000000000000
--- a/Phys/DaVinci/options/DaVinci-WriteSelDST-FSR.py
+++ /dev/null
@@ -1,80 +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 a DaVinci job creating DSTs
-#
-# It looks for a J/psi and then saves the events in a DST
-#
-# For a more complicated example with several DSTs
-# corresponding to various mass ranges look in
-# DaVinciSys/tests/options
-#
-# @author Patrick Koppenburg
-# @date 2009-02-03
-#
-# @added FSR writing: Jaap Panman
-#
-##############################################################################
-from Gaudi.Configuration import *
-from Configurables import DaVinci, SelDSTWriter, DumpFSR
-##############################################################################
-from Configurables import GaudiSequencer, FilterDesktop
-MessageSvc().Format = "% F%60W%S%7W%R%T %0W%M"
-
-#
-# Get a J/psi
-#
-jpsi = FilterDesktop('MyJpsi')
-jpsi.Code = "ALL"
-
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SelectionSequence
-
-MyLooseJpsi = DataOnDemand(Location = 'Phys/StdLooseJpsi2MuMu')
-
-SelJpsi = Selection('SelJpsi',
- Algorithm = jpsi,
- RequiredSelections = [MyLooseJpsi])
-
-SeqJpsi = SelectionSequence('SeqJpsi', TopSelection = SelJpsi)
-
-#from MicroDSTExample.Selections import SeqBs2Jpsi2MuMuPhi2KK
-#SeqBs = SeqBs2Jpsi2MuMuPhi2KK.SeqBs2Jpsi2MuMuPhi2KK
-
-#
-# This the bit that declares the sequence to the Dst writer
-# seq will be passed to DaVinci(). You do not need to pass it yourself.
-# The second line allows to save particles (not yet 100% functional)
-#
-dstWriter = SelDSTWriter("JpsiDSTWriter",
- SelectionSequences = [SeqJpsi],
- SaveCandidates = True,
- CopyMCTruth = False,
- WriteFSR = True,
- OutputFileSuffix = "Test")
-##############################################################################
-DaVinci().EvtMax = 500
-DaVinci().PrintFreq = 100
-DaVinci().UserAlgorithms = [ dstWriter.sequence(),
- DumpFSR("dump") ]
-# DaVinci().SkipEvents = 0
-DaVinci().DataType = "2009"
-DaVinci().InputType = "DST"
-DaVinci().Simulation = False
-DaVinci().WriteFSR = False ##############TODO: not yet connected
-
-DaVinci().Input = [
- #"DATAFILE='PFN:LumiData_062910_0000000001_fsr.dst' TYP='POOL_ROOTTREE' OPT='READ'",
- "DATAFILE='PFN:nolumi_span_063815_0000000001.dst' TYP='POOL_ROOTTREE' OPT='READ'",
- ]
-
-##############################################################################
diff --git a/Phys/DaVinci/options/DaVinci-WriteSelDST.py b/Phys/DaVinci/options/DaVinci-WriteSelDST.py
deleted file mode 100755
index a0fdc5b3c2fda6fc9864ad4ce2114fd4d5561829..0000000000000000000000000000000000000000
--- a/Phys/DaVinci/options/DaVinci-WriteSelDST.py
+++ /dev/null
@@ -1,89 +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: DaVinci-WriteSelDST.py,v 1.9 2010-07-16 11:59:02 jpalac Exp $
-#
-# Options for a DaVinci job creating DSTs
-#
-# It looks for a J/psi and then saves the events in a DST
-#
-# For a more complicated example with several DSTs
-# corresponding to various mass ranges look in
-# DaVinciSys/tests/options
-#
-# @author Patrick Koppenburg
-# @date 2009-02-03
-#
-##############################################################################
-from Gaudi.Configuration import *
-from Configurables import DaVinci, SelDSTWriter
-##############################################################################
-from Configurables import GaudiSequencer, FilterDesktop
-MessageSvc().Format = "% F%60W%S%7W%R%T %0W%M"
-
-#
-# Get a J/psi
-#
-jpsi = FilterDesktop('MyJpsi')
-jpsi.Code = "ALL"
-
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SelectionSequence
-
-MyLooseJpsi = DataOnDemand(Location = 'Phys/StdLooseJpsi2MuMu')
-
-SelJpsi = Selection('SelJpsi',
- Algorithm = jpsi,
- RequiredSelections = [MyLooseJpsi])
-
-SeqJpsi = SelectionSequence('SeqJpsi', TopSelection = SelJpsi)
-
-#from MicroDSTExample.Selections import SeqBs2Jpsi2MuMuPhi2KK
-#SeqBs = SeqBs2Jpsi2MuMuPhi2KK.SeqBs2Jpsi2MuMuPhi2KK
-
-#
-# This the bit that declares the sequence to the Dst writer
-# seq will bee passed to DaVinci(). You do not need to pass it yourself.
-# The second line allows to save particles (not yet 100% functional)
-#
-dstWriter = SelDSTWriter("JpsiDSTWriter",
- SelectionSequences = [SeqJpsi],
- SaveCandidates = True,
- CopyMCTruth = True,
- WriteFSR = True,
- OutputFileSuffix = "Test",
- )
-##############################################################################
-DaVinci().EvtMax = 500
-DaVinci().PrintFreq = 10
-DaVinci().UserAlgorithms = [ dstWriter.sequence() ]
-# DaVinci().SkipEvents = 0
-DaVinci().DataType = "2009"
-#DaVinci().WriteFSR = True
-
-# DaVinci().Simulation = False
-
-# input file
-DaVinci().Input = [
- " DATAFILE='PFN:LumiData_062910_0000000001_fsr.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-#"DATAFILE='PFN:castor:/castor/cern.ch/grid/lhcb/production/DC06/phys-v4-lumi2/00002146/DST/0000/00002146_00000001_5.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-## "DATAFILE='PFN:castor:/castor/cern.ch/grid/lhcb/production/DC06/phys-v4-lumi2/00002146/DST/0000/00002146_00000002_5.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-## "DATAFILE='PFN:castor:/castor/cern.ch/grid/lhcb/production/DC06/phys-v4-lumi2/00002146/DST/0000/00002146_00000003_5.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-## "DATAFILE='PFN:castor:/castor/cern.ch/grid/lhcb/production/DC06/phys-v4-lumi2/00002146/DST/0000/00002146_00000004_5.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-## "DATAFILE='PFN:castor:/castor/cern.ch/grid/lhcb/production/DC06/phys-v4-lumi2/00002146/DST/0000/00002146_00000005_5.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-## "DATAFILE='PFN:castor:/castor/cern.ch/grid/lhcb/production/DC06/phys-v4-lumi2/00002146/DST/0000/00002146_00000006_5.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-## "DATAFILE='PFN:castor:/castor/cern.ch/grid/lhcb/production/DC06/phys-v4-lumi2/00002146/DST/0000/00002146_00000007_5.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-## "DATAFILE='PFN:castor:/castor/cern.ch/grid/lhcb/production/DC06/phys-v4-lumi2/00002146/DST/0000/00002146_00000009_5.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-## "DATAFILE='PFN:castor:/castor/cern.ch/grid/lhcb/production/DC06/phys-v4-lumi2/00002146/DST/0000/00002146_00000011_5.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-## "DATAFILE='PFN:castor:/castor/cern.ch/grid/lhcb/production/DC06/phys-v4-lumi2/00002146/DST/0000/00002146_00000013_5.dst' TYP='POOL_ROOTTREE' OPT='READ'"
-]
-
-##############################################################################
diff --git a/Phys/DaVinci/options/DaVinci-WriteSingleSelDST.py b/Phys/DaVinci/options/DaVinci-WriteSingleSelDST.py
deleted file mode 100644
index b7a0b245752feb6ffc6e8814bf420a412be3fae3..0000000000000000000000000000000000000000
--- a/Phys/DaVinci/options/DaVinci-WriteSingleSelDST.py
+++ /dev/null
@@ -1,59 +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 *
-from Configurables import DaVinci, MicroDSTWriter
-
-importOptions("$STDOPTS/PreloadUnits.opts")
-
-from MicroDSTExample.Selections import SeqBs2Jpsi2MuMuPhi2KK
-selSequence = SeqBs2Jpsi2MuMuPhi2KK.SeqBs2Jpsi2MuMuPhi2KK
-
-from DSTWriters.dstwriters import (DSTWriterSelectionSequence,
- selDSTWriterConf)
-
-from DSTWriters.microdstelements import ( _copyParticleTrees,
- _copyPVRelations,
- MicroDSTExtras )
-
-_tesBranch = 'Sel'
-selDSTElements = [_copyParticleTrees(_tesBranch, copyProtoParticles = False),
- _copyPVRelations(_tesBranch, {"Particle2VertexRelations":False})]
-
-dstExtras = MicroDSTExtras(branch = _tesBranch, callables = selDSTElements)
-
-dstWriter = DSTWriterSelectionSequence(selSequence = selSequence,
- outputStreamConfiguration = selDSTWriterConf,
- extras = dstExtras)
-
-selDST0Seq = dstWriter.sequence()
-
-#
-
-dv = DaVinci()
-dv.DataType = 'MC09'
-dv.EvtMax = 100
-dv.UserAlgorithms = [selDST0Seq]
-dv.Input = [
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000001_1.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000002_1.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000003_1.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000004_1.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000005_1.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000006_1.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000007_1.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000008_1.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000009_1.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000010_1.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000011_1.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000012_1.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000013_1.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000014_1.dst' TYP='POOL_ROOTTREE' OPT='READ'"
-]
diff --git a/Phys/DaVinci/options/DaVinciTestData.py b/Phys/DaVinci/options/DaVinciTestData.py
index 46801e38abb128769d35e30398a7d35636b6deac..8006ac3369f8732ab197de76ad8cb68c5f8676a1 100644
--- a/Phys/DaVinci/options/DaVinciTestData.py
+++ b/Phys/DaVinci/options/DaVinciTestData.py
@@ -1,5 +1,5 @@
###############################################################################
-# (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration #
+# (c) Copyright 2000-2020 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". #
@@ -8,11 +8,10 @@
# granted to it by virtue of its status as an Intergovernmental Organization #
# or submit itself to any jurisdiction. #
###############################################################################
-## $Id: DaVinciTestData.py,v 1.3 2009-06-23 13:06:35 pkoppenb Exp $
#
# This will always contain some data
#
- # syntax gaudirun.py options/DaVinci-2008.py options/DaVinciTestData.py
+ # syntax gaudirun.py <Some options> options/DaVinciTestData.py
#
# @author P. Koppenburg
#
@@ -20,16 +19,6 @@
from Gaudi.Configuration import *
from Configurables import DaVinci
-dataType = DaVinci().getProp("DataType")
+from GaudiConf import IOHelper
+IOHelper().inputFiles([ 'PFN:/eos/lhcb/user/p/pkoppenb/DPA/00076720_00000004_1.ldst' ])
-if ( dataType == "DC06" ):
- importOptions("$DAVINCIROOT/options/DC06_stripped_bbincl_lumi2.py")
-
-elif ( dataType == "MC09" ):
- importOptions("$DAVINCIROOT/options/MC09-Bs2JpsiPhiDst.py")
-
-else :
- print "#**********************************************************************"
- print "# Unknown data type "+dataType
- print "#**********************************************************************"
-
diff --git a/Phys/DaVinci/options/MC09-Bs2JpsiPhiDst.py b/Phys/DaVinci/options/MC09-Bs2JpsiPhiDst.py
deleted file mode 100644
index e5f020bcdaae5ad43424b48190c1bbea57b60436..0000000000000000000000000000000000000000
--- a/Phys/DaVinci/options/MC09-Bs2JpsiPhiDst.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. #
-###############################################################################
-#-- GAUDI jobOptions generated on Tue Jun 23 13:49:33 2009
-#-- Contains event types :
-#-- 13144005 - 14 files - 212463 events - 61.11 GBytes
-
-from Gaudi.Configuration import *
-from Configurables import DaVinci
-DaVinci().DataType = "MC09"
-DaVinci().Simulation = True
-EventSelector().Input = [
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000001_1.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000002_1.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000003_1.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000004_1.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000005_1.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000006_1.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000007_1.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000008_1.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000009_1.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000010_1.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000011_1.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000012_1.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000013_1.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000014_1.dst' TYP='POOL_ROOTTREE' OPT='READ'"]
-# FileCatalog().Catalogs = [ 'xmlcatalog_file:MC09-Bs2JpsiPhi.xml' ]
diff --git a/Phys/DaVinci/options/MC09-Bs2JpsiPhiDst.xml b/Phys/DaVinci/options/MC09-Bs2JpsiPhiDst.xml
deleted file mode 100644
index efd1ee23fd5e7800fbb62eab8eed11a16a177eb7..0000000000000000000000000000000000000000
--- a/Phys/DaVinci/options/MC09-Bs2JpsiPhiDst.xml
+++ /dev/null
@@ -1,143 +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="B8A50EB2-2D5B-DE11-87E1-0030487CD15A">
- <physical>
- <pfn filetype="ROOT_All" name="castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000006_1.dst"/>
- </physical>
- <logical>
- <lfn name="/lhcb/MC/MC09/DST/00004879/0000/00004879_00000006_1.dst"/>
- </logical>
- </File>
-
- <File ID="7460A266-A05B-DE11-B016-0030487CAEA6">
- <physical>
- <pfn filetype="ROOT_All" name="castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000014_1.dst"/>
- </physical>
- <logical>
- <lfn name="/lhcb/MC/MC09/DST/00004879/0000/00004879_00000014_1.dst"/>
- </logical>
- </File>
-
- <File ID="2AAF9FC4-455B-DE11-9139-001A64789CE4">
- <physical>
- <pfn filetype="ROOT_All" name="castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000005_1.dst"/>
- </physical>
- <logical>
- <lfn name="/lhcb/MC/MC09/DST/00004879/0000/00004879_00000005_1.dst"/>
- </logical>
- </File>
-
- <File ID="E02CA751-415B-DE11-A382-0019B9E4B1A5">
- <physical>
- <pfn filetype="ROOT_All" name="castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000002_1.dst"/>
- </physical>
- <logical>
- <lfn name="/lhcb/MC/MC09/DST/00004879/0000/00004879_00000002_1.dst"/>
- </logical>
- </File>
-
- <File ID="A6248D6E-945B-DE11-B02D-00E08178C055">
- <physical>
- <pfn filetype="ROOT_All" name="castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000012_1.dst"/>
- </physical>
- <logical>
- <lfn name="/lhcb/MC/MC09/DST/00004879/0000/00004879_00000012_1.dst"/>
- </logical>
- </File>
-
- <File ID="224F7B43-715B-DE11-9967-0030487F16C1">
- <physical>
- <pfn filetype="ROOT_All" name="castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000011_1.dst"/>
- </physical>
- <logical>
- <lfn name="/lhcb/MC/MC09/DST/00004879/0000/00004879_00000011_1.dst"/>
- </logical>
- </File>
-
- <File ID="CAC08BD5-A05B-DE11-A517-001D0967D689">
- <physical>
- <pfn filetype="ROOT_All" name="castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000008_1.dst"/>
- </physical>
- <logical>
- <lfn name="/lhcb/MC/MC09/DST/00004879/0000/00004879_00000008_1.dst"/>
- </logical>
- </File>
-
- <File ID="7E1B97F0-A25B-DE11-9466-0030487CD994">
- <physical>
- <pfn filetype="ROOT_All" name="castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000013_1.dst"/>
- </physical>
- <logical>
- <lfn name="/lhcb/MC/MC09/DST/00004879/0000/00004879_00000013_1.dst"/>
- </logical>
- </File>
-
- <File ID="9E76347A-CF5A-DE11-B552-0030487D8581">
- <physical>
- <pfn filetype="ROOT_All" name="castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000001_1.dst"/>
- </physical>
- <logical>
- <lfn name="/lhcb/MC/MC09/DST/00004879/0000/00004879_00000001_1.dst"/>
- </logical>
- </File>
-
- <File ID="28523143-F95A-DE11-AD1F-000423D95004">
- <physical>
- <pfn filetype="ROOT_All" name="castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000003_1.dst"/>
- </physical>
- <logical>
- <lfn name="/lhcb/MC/MC09/DST/00004879/0000/00004879_00000003_1.dst"/>
- </logical>
- </File>
-
- <File ID="0A063EF0-1C5B-DE11-998B-0030487D8581">
- <physical>
- <pfn filetype="ROOT_All" name="castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000004_1.dst"/>
- </physical>
- <logical>
- <lfn name="/lhcb/MC/MC09/DST/00004879/0000/00004879_00000004_1.dst"/>
- </logical>
- </File>
-
- <File ID="E008BA5E-8B5B-DE11-82C8-001EC9D8D48B">
- <physical>
- <pfn filetype="ROOT_All" name="castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000009_1.dst"/>
- </physical>
- <logical>
- <lfn name="/lhcb/MC/MC09/DST/00004879/0000/00004879_00000009_1.dst"/>
- </logical>
- </File>
-
- <File ID="986EE264-A85B-DE11-B277-001CC443B76C">
- <physical>
- <pfn filetype="ROOT_All" name="castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000010_1.dst"/>
- </physical>
- <logical>
- <lfn name="/lhcb/MC/MC09/DST/00004879/0000/00004879_00000010_1.dst"/>
- </logical>
- </File>
-
- <File ID="DE0B8221-325B-DE11-9DC0-0030487F929F">
- <physical>
- <pfn filetype="ROOT_All" name="castor://castorlhcb.cern.ch:9002/?svcClass=lhcbdata&castorVersion=2&path=/castor/cern.ch/grid/lhcb/MC/MC09/DST/00004879/0000/00004879_00000007_1.dst"/>
- </physical>
- <logical>
- <lfn name="/lhcb/MC/MC09/DST/00004879/0000/00004879_00000007_1.dst"/>
- </logical>
- </File>
-
-</POOLFILECATALOG>
diff --git a/Phys/DaVinci/options/MC09-Stripping01_HADRON.DST.py b/Phys/DaVinci/options/MC09-Stripping01_HADRON.DST.py
deleted file mode 100644
index 6c655b657b9bbd979f71eac4235b716d2f9f186c..0000000000000000000000000000000000000000
--- a/Phys/DaVinci/options/MC09-Stripping01_HADRON.DST.py
+++ /dev/null
@@ -1,22 +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 Nov 9 11:12:48 2009
-#-- Contains event types :
-#-- 30000000 - 5 files - 12051 events - 1.19 GBytes
-
-from Gaudi.Configuration import *
-
-EventSelector().Input = [
-" DATAFILE='PFN:castor:/castor/cern.ch/grid/lhcb/MC/MC09/HADRON.DST/00005437/0000/00005437_00000002_1.hadron.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='PFN:castor:/castor/cern.ch/grid/lhcb/MC/MC09/HADRON.DST/00005437/0000/00005437_00000003_1.hadron.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='PFN:castor:/castor/cern.ch/grid/lhcb/MC/MC09/HADRON.DST/00005437/0000/00005437_00000004_1.hadron.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='PFN:castor:/castor/cern.ch/grid/lhcb/MC/MC09/HADRON.DST/00005437/0000/00005437_00000006_1.hadron.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='PFN:castor:/castor/cern.ch/grid/lhcb/MC/MC09/HADRON.DST/00005437/0000/00005437_00000007_1.hadron.dst' TYP='POOL_ROOTTREE' OPT='READ'"]
diff --git a/Phys/DaVinci/options/MC09-Stripping01_JPSI.DST.py b/Phys/DaVinci/options/MC09-Stripping01_JPSI.DST.py
deleted file mode 100644
index a0ce2ab85cd71a089a651a24982110285ddb23f8..0000000000000000000000000000000000000000
--- a/Phys/DaVinci/options/MC09-Stripping01_JPSI.DST.py
+++ /dev/null
@@ -1,21 +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 Nov 9 11:13:22 2009
-#-- Contains event types :
-#-- 30000000 - 4 files - 5256 events - 0.38 GBytes
-
-from Gaudi.Configuration import *
-
-EventSelector().Input = [
-" DATAFILE='PFN:castor:/castor/cern.ch/grid/lhcb/MC/MC09/JPSI.DST/00005438/0000/00005438_00000001_1.jpsi.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='PFN:castor:/castor/cern.ch/grid/lhcb/MC/MC09/JPSI.DST/00005438/0000/00005438_00000002_1.jpsi.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='PFN:castor:/castor/cern.ch/grid/lhcb/MC/MC09/JPSI.DST/00005438/0000/00005438_00000004_1.jpsi.dst' TYP='POOL_ROOTTREE' OPT='READ'",
-" DATAFILE='PFN:castor:/castor/cern.ch/grid/lhcb/MC/MC09/JPSI.DST/00005438/0000/00005438_00000005_1.jpsi.dst' TYP='POOL_ROOTTREE' OPT='READ'"]