Updates the methods to read the DST input file

Phys/FunTuple/tests/options/flavour_tag_example.py

@@ -13,27 +13,29 @@
 Example of tupling with the FunTuple algorithm for LHCb::Particles
 """
 
-from Configurables import CondDB
-from Configurables import LHCbApp
+from PhysSelPython.Selections import AutomaticData
 from FunTuple import MakeDummyParticles
-from Gaudi.Configuration import ApplicationMgr, NTupleSvc
-from GaudiKernel.Configurable import ConfigurableGeneric as RFileCnv
 import Functors as F
 from FunTuple import FunctorCollection
 from FunTuple.NewTupleTools import Kinematics
 from FunTuple import FunTuple_Particles as Funtuple
-from DaVinci import options, run_davinci 
+from DaVinci import options, run_davinci
+from PyConf.application import make_data_with_FetchDataFromFile
+from PyConf.components import get_output
+from GaudiConf import reading
+from Configurables import (ApplicationMgr, DecayTreeTuple, LHCbApp, createODIN,
+                           HltANNSvc, HltDecReportsDecoder)
 
-options.evt_max     = 10
-options.input_type  = 'DST'
-options.input_files = ['out_Bs2JpsiPhi_FT.dst']
+options.evt_max = 10
+options.input_type = 'ROOT'
+options.input_files = ['/afs/cern.ch/work/m/mferrill/private/devFunTuple/DVft/Phys/FunTuple/tests/options/out_Bs2JpsiPhi_FT.dst']
 options.input_raw_format = 4.3
 options.ntuple_file = 'DV-example-tupling-basic-ntp.root'
 options.histo_file = 'DV-example-tupling-basic-his.root'
-options.conddb_tag = 'sim-20171127-vc-md100' 
-options.dddb_tag   = 'dddb-20171126'
+options.conddb_tag = 'sim-20171127-vc-md100'
+options.dddb_tag = 'dddb-20171126'
 options.simulation = True
-options.data_type  = 'Upgrade'
+options.data_type = 'Upgrade'
 print(options)
 
 #define the dictionary of branches, key: branch_name, value: decay_descriptor
@@ -97,6 +99,7 @@ variables['Jpsi'] = variables_jpsi
 #define list of preambles for loki
 loki_preamble = ['TRACK_MAX_PT = MAXTREE(ISBASIC, PT, -1)']
 
+
 #Configure Funtuple algorithm
 algtupledata = Funtuple(
     name="FunTuple",
@@ -105,11 +108,9 @@ algtupledata = Funtuple(
     variables=variables,
     loki_preamble=loki_preamble,
     make_custom_data=False,  #Set to when make dummy data is being used
-    inputs='/Event/HLT2/Hlt2BsToJpsiPhiLine/Particles',
-    pyconf_alg=False)
-
-algs = {
-    'FlavourTag': algtupledata
-}
+    inputs = make_data_with_FetchDataFromFile('/Event/HLT2/Hlt2BsToJpsiPhiLine/Particles'),
+    pyconf_alg=True)
 
+algs = {'FlavourTag': [algtupledata]}
 run_davinci(options, algs)
+