diff --git a/ganga/Lb2Lcmunu/DaVinci_Ganga_15_md.py b/ganga/Lb2Lcmunu/DaVinci_Ganga_15_md.py
index da1704e..6c186af 100644
--- a/ganga/Lb2Lcmunu/DaVinci_Ganga_15_md.py
+++ b/ganga/Lb2Lcmunu/DaVinci_Ganga_15_md.py
@@ -43,7 +43,7 @@
 #------------------------------------------------------------------------------
 # Make a new job object for DaVinci
 #------------------------------------------------------------------------------
-j = Job( application = DaVinci( version = 'v36r5' ) )
+j = Job( application = DaVinci( version = 'v38r1p1' ) )
 #------------------------------------------------------------------------------
 
 #------------------------------------------------------------------------------
@@ -58,7 +58,7 @@
 # Define the configuration file(s) to use
 appOpts = j.application.user_release_area + '/DaVinci_' + j.application.version + '/Phys/DaVinci/options/'
 path = '/afs/cern.ch/work/e/egraveri/Analysis/ganga/Lb2Lcmunu/'
-j.application.optsfile = [ File(path + 'Lb2Lcmunu_S24_data2015_NEWJET_moreStates.py' ),
+j.application.optsfile = [ File(path + 'Lb2Lcmunu_S24_data2015_NEWJET.py' ),
                            File(path + 'DV2015.py'),
                            File(path + 'LHCbCollision15Beam6500GeV-VeloClosed-MagDownRealDataReco15aStripping2490000000SEMILEPTONICDST.py') ]
 # Extra options
diff --git a/ganga/Lb2Lcmunu/Lb2Lcmunu_S24_data2015_NEWJET.py b/ganga/Lb2Lcmunu/Lb2Lcmunu_S24_data2015_NEWJET.py
index d292567..dfe063e 100644
--- a/ganga/Lb2Lcmunu/Lb2Lcmunu_S24_data2015_NEWJET.py
+++ b/ganga/Lb2Lcmunu/Lb2Lcmunu_S24_data2015_NEWJET.py
@@ -102,25 +102,11 @@
 
 ###########################################################################
 
-
-#from StandardParticles import StdAllLoosePions
-
-
 Lc_star = CombineParticles("Lc_star")
 Lc_star.Inputs = ["Phys/StdAllLoosePions/Particles", "Phys/Lc2pKPiforB2DMuForTauMu/Particles"]
 Lc_star.DecayDescriptors = ["[Lambda_c(2595)+ -> Lambda_c+ pi+ pi-]cc"]
 Lc_star.MotherCut = "(M<3000) & (M>2300) & (VFASPF(VCHI2/VDOF) < 7.0) "
 Lc_star.DaughtersCuts = { "pi+": "PT>0", "pi-": "PT>0", "Lambda_c+": "ADMASS('Lambda_c+') < 50.0 *MeV" }
-#############################################################################
-
-# Tau_3pi = CombineParticles("Tau_3pi")
-# Tau_3pi.Inputs = ['Phys/StdLoosePions/Particles']
-# Tau_3pi.DecayDescriptors = ['[tau+ -> pi+ pi- pi+]cc']
-# Tau_3pi.MotherCut = "(M>400.*MeV) & (M < 3500.*MeV) & (BPVDIRA>0.99) & (VFASPF(VCHI2) < 25 )"
-# Tau_3pi.DaughtersCuts = {'pi+': '(PT>150.*MeV) & (MIPCHI2DV(PRIMARY) > 4.0) & (TRCHI2DOF<4) & (TRGHOSTPROB<0.4) & (PIDK < 8)', 'pi-': '(PT>150.*MeV) & (MIPCHI2DV(PRIMARY) > 4.0) & (TRCHI2DOF<4) & (TRGHOSTPROB<0.4) & (PIDK < 8)'}
-# Tau_3pi.CombinationCut = "((AM>400.*MeV) & (AM<3500.*MeV)) & (ADOCAMAX('')<0.15*mm) & ((AM12<1670.*MeV) or (AM23<1670.*MeV)) & (ANUM(PT < 300*MeV) <= 1) & (15)))"
-
-#############################################################################
 
 Lb_SL = CombineParticles("Lb_SL")
 Lb_SL.Inputs = [ "Phys/MuforB2DMuForTauMu/Particles", "Phys/Lc_star/Particles"]
@@ -187,7 +173,8 @@
 from Configurables import TupleToolKinematic
 from Configurables import TupleToolGeometry
 from Configurables import TupleToolTrackIsolation
-
+from Configurables import Rich__Rec__DetailedTrSegMakerFromRecoTracks
+from Configurables import TupleToolRICHPid
 
 for DTT in [Lb_SL_OfflineTree, Lb_SL_WS_OfflineTree]:
     DTT.ToolList = [
@@ -205,13 +192,18 @@
         "TupleToolJets",
         'TupleToolTrigger',
         'TupleToolTISTOS',
-        'TupleToolRICHPid',
+        #'TupleToolRICHPid',
         'TupleToolDira',
         'TupleToolEventInfo',
         'TupleToolPropertime',
         'TupleToolRecoStats',
         'TupleToolTrackPosition'
     ]
+    richTool = DTT.addTool( TupleToolRICHPid, name='TupleToolRICHPid' )
+    richTool = getattr(DTT, "TupleToolRICHPid")
+    richRecTool = richTool.addTool( Rich__Rec__DetailedTrSegMakerFromRecoTracks, name="Rich__Rec__DetailedTrSegMakerFromRecoTracks" )
+    richRecTool = getattr(richTool, 'Rich__Rec__DetailedTrSegMakerFromRecoTracks')
+    richRecTool.UseRadiators = [False, True, True]
     DTT.addTool( TupleToolTrigger, name='TupleToolTrigger' )
     DTT.TupleToolTrigger.Verbose = True
     DTT.TupleToolTrigger.TriggerList = trigger_list
@@ -239,11 +231,6 @@
 
 
 ##################################################
-#DaVinci().Input = ([
-#'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/2012/ALLSTREAMS.DST/00025296/0000/00025296_00000002_1.allstreams.dst'
-#'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/2012/ALLSTREAMS.DST/00025296/0000/00025296_00000003_1.allstreams.dst',
-#'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/2012/ALLSTREAMS.DST/00025296/0000/00025296_00000004_1.allstreams.dst'
-#])
 from Configurables import DaVinci
 #DaVinci().EventPreFilters = fltrs.filters('Filters')
 DaVinci().EvtMax = -1                          # Number of events
diff --git a/ganga/Lb2Lcmunu/testfile.py b/ganga/Lb2Lcmunu/testfile.py
index 8d8743a..9584dd0 100644
--- a/ganga/Lb2Lcmunu/testfile.py
+++ b/ganga/Lb2Lcmunu/testfile.py
@@ -3,12 +3,14 @@
 # @Author: Elena Graverini
 # @Date:   2016-01-14 12:04:32
 # @Last Modified by:   Elena Graverini
-# @Last Modified time: 2016-02-01 15:36:05
+# @Last Modified time: 2016-02-01 17:22:51
 
 # Run this from Zurich!!
 from Configurables import DaVinci
 DaVinci().DataType = "2015"  # "2012"
-DaVinci().EvtMax = 1000  # -1                       # Number of events
+#from Configurables import CondDB
+#CondDB().LatestGlobalTagByDataType = "2015"
+DaVinci().EvtMax = 2000  # -1                       # Number of events
 DaVinci().Input = ([
     ###### 2012 data
     # "DATAFILE='PFN:/disk/data3/lhcb/elena/Lb2Lcmunu/ntuples/2012-mu/00020241_00000096_1.semileptonic.dst' TYP='POOL_ROOTTREE' OPT='READ'",