Skip to content
Snippets Groups Projects
Commit cd307b3a authored by Patrick Koppenburg's avatar Patrick Koppenburg :leaves:
Browse files

Merge branch 'pkoppenb-20200527-cleanup' into 'master' 

Removed most option files and added some new

See merge request !402
parents 7be04179 63d1a361
No related branches found
No related tags found
2 merge requests!1103Draft: Add AnalysisHelpers to DaVinci Stack,!402Removed most option files and added some new
Pipeline #1719092 passed
Stage: test
    Hide whitespace changes
    Inline Side-by-side
    Phys/DaVinci/options/DaVinciTestData.py
    + 4
    − 16
    View file @ cd307b3a
    ###############################################################################
    # (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,5 @@
    from Gaudi.Configuration import *
    from Configurables import DaVinci
    dataType = DaVinci().getProp("DataType")
    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 "#**********************************************************************"
    from PRConfig import TestFileDB
    TestFileDB.test_file_db['Upgrade_Bd2KstarMuMu'].run(configurable=DaVinci())
    Phys/DaVinci/options/MC09-Bs2JpsiPhiDst.py deleted 100644 → 0
    + 0
    − 34
    View file @ 7be04179
    ###############################################################################
    # (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' ]
    Phys/DaVinci/options/MC09-Bs2JpsiPhiDst.xml deleted 100644 → 0
    + 0
    − 143
    View file @ 7be04179
    <?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&amp;castorVersion=2&amp;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&amp;castorVersion=2&amp;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&amp;castorVersion=2&amp;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&amp;castorVersion=2&amp;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&amp;castorVersion=2&amp;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&amp;castorVersion=2&amp;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&amp;castorVersion=2&amp;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&amp;castorVersion=2&amp;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&amp;castorVersion=2&amp;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&amp;castorVersion=2&amp;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&amp;castorVersion=2&amp;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&amp;castorVersion=2&amp;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&amp;castorVersion=2&amp;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&amp;castorVersion=2&amp;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>
    Phys/DaVinci/options/MC09-Stripping01_HADRON.DST.py deleted 100644 → 0
    + 0
    − 22
    View file @ 7be04179
    ###############################################################################
    # (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'"]
    Phys/DaVinci/options/MC09-Stripping01_JPSI.DST.py deleted 100644 → 0
    + 0
    − 21
    View file @ 7be04179
    ###############################################################################
    # (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'"]
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment